Cadoles
/
BeSimpleSoap
20
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

* fixed missing port number in WsdlDownloader 

* fixed boolean assertions
This commit is contained in:
Andreas Schamberger 2011-10-16 17:35:14 +02:00
parent 98a916957c
commit c54b2925fe
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BeSimple/SoapClient/WsdlDownloader.php
View File

@ -218,6 +218,10 @@ class WsdlDownloader
unset($parts[$key]); unset($parts[$key]);
} }
} }
return $urlParts['scheme'] . '://' . $urlParts['host'] . implode('/', $parts); $hostname = $urlParts['scheme'] . '://' . $urlParts['host'];
if (isset($urlParts['port'])) {
$hostname .= ':' . $urlParts['port'];
}
return $hostname . implode('/', $parts);
} }
} }

33
tests/BeSimple/Tests/SoapClient/WsdlDownloaderTest.php
View File

@ -98,21 +98,21 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
$method = $class->getMethod('isRemoteFile'); $method = $class->getMethod('isRemoteFile');
$method->setAccessible(true); $method->setAccessible(true);
$this->assertEquals(true, $method->invoke($wd, 'http://www.php.net/')); $this->assertTrue($method->invoke($wd, 'http://www.php.net/'));
$this->assertEquals(true, $method->invoke($wd, 'http://localhost/')); $this->assertTrue($method->invoke($wd, 'http://localhost/'));
$this->assertEquals(true, $method->invoke($wd, 'http://mylocaldomain/')); $this->assertTrue($method->invoke($wd, 'http://mylocaldomain/'));
$this->assertEquals(true, $method->invoke($wd, 'http://www.php.net/dir/test.html')); $this->assertTrue($method->invoke($wd, 'http://www.php.net/dir/test.html'));
$this->assertEquals(true, $method->invoke($wd, 'http://localhost/dir/test.html')); $this->assertTrue($method->invoke($wd, 'http://localhost/dir/test.html'));
$this->assertEquals(true, $method->invoke($wd, 'http://mylocaldomain/dir/test.html')); $this->assertTrue($method->invoke($wd, 'http://mylocaldomain/dir/test.html'));
$this->assertEquals(true, $method->invoke($wd, 'https://www.php.net/')); $this->assertTrue($method->invoke($wd, 'https://www.php.net/'));
$this->assertEquals(true, $method->invoke($wd, 'https://localhost/')); $this->assertTrue($method->invoke($wd, 'https://localhost/'));
$this->assertEquals(true, $method->invoke($wd, 'https://mylocaldomain/')); $this->assertTrue($method->invoke($wd, 'https://mylocaldomain/'));
$this->assertEquals(true, $method->invoke($wd, 'https://www.php.net/dir/test.html')); $this->assertTrue($method->invoke($wd, 'https://www.php.net/dir/test.html'));
$this->assertEquals(true, $method->invoke($wd, 'https://localhost/dir/test.html')); $this->assertTrue($method->invoke($wd, 'https://localhost/dir/test.html'));
$this->assertEquals(true, $method->invoke($wd, 'https://mylocaldomain/dir/test.html')); $this->assertTrue($method->invoke($wd, 'https://mylocaldomain/dir/test.html'));
$this->assertEquals(false, $method->invoke($wd, 'c:/dir/test.html')); $this->assertFalse($method->invoke($wd, 'c:/dir/test.html'));
$this->assertEquals(false, $method->invoke($wd, '/dir/test.html')); $this->assertFalse($method->invoke($wd, '/dir/test.html'));
$this->assertEquals(false, $method->invoke($wd, '../dir/test.html')); $this->assertFalse($method->invoke($wd, '../dir/test.html'));
} }
public function testResolveXsdIncludes() public function testResolveXsdIncludes()
@ -182,6 +182,9 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
$method = $class->getMethod('resolveRelativePathInUrl'); $method = $class->getMethod('resolveRelativePathInUrl');
$method->setAccessible(true); $method->setAccessible(true);
$this->assertEquals('http://localhost:8080/test', $method->invoke($wd, 'http://localhost:8080/sub', '/test'));
$this->assertEquals('http://localhost:8080/test', $method->invoke($wd, 'http://localhost:8080/sub/', '/test'));
$this->assertEquals('http://localhost/test', $method->invoke($wd, 'http://localhost/sub', '/test')); $this->assertEquals('http://localhost/test', $method->invoke($wd, 'http://localhost/sub', '/test'));
$this->assertEquals('http://localhost/test', $method->invoke($wd, 'http://localhost/sub/', '/test')); $this->assertEquals('http://localhost/test', $method->invoke($wd, 'http://localhost/sub/', '/test'));