* fixed missing port number in WsdlDownloader
* fixed boolean assertions
This commit is contained in:
parent
98a916957c
commit
c54b2925fe
|
@ -218,6 +218,10 @@ class WsdlDownloader
|
|||
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);
|
||||
}
|
||||
}
|
|
@ -98,21 +98,21 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
|
|||
$method = $class->getMethod('isRemoteFile');
|
||||
$method->setAccessible(true);
|
||||
|
||||
$this->assertEquals(true, $method->invoke($wd, 'http://www.php.net/'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'http://localhost/'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'http://mylocaldomain/'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'http://www.php.net/dir/test.html'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'http://localhost/dir/test.html'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'http://mylocaldomain/dir/test.html'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'https://www.php.net/'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'https://localhost/'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'https://mylocaldomain/'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'https://www.php.net/dir/test.html'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'https://localhost/dir/test.html'));
|
||||
$this->assertEquals(true, $method->invoke($wd, 'https://mylocaldomain/dir/test.html'));
|
||||
$this->assertEquals(false, $method->invoke($wd, 'c:/dir/test.html'));
|
||||
$this->assertEquals(false, $method->invoke($wd, '/dir/test.html'));
|
||||
$this->assertEquals(false, $method->invoke($wd, '../dir/test.html'));
|
||||
$this->assertTrue($method->invoke($wd, 'http://www.php.net/'));
|
||||
$this->assertTrue($method->invoke($wd, 'http://localhost/'));
|
||||
$this->assertTrue($method->invoke($wd, 'http://mylocaldomain/'));
|
||||
$this->assertTrue($method->invoke($wd, 'http://www.php.net/dir/test.html'));
|
||||
$this->assertTrue($method->invoke($wd, 'http://localhost/dir/test.html'));
|
||||
$this->assertTrue($method->invoke($wd, 'http://mylocaldomain/dir/test.html'));
|
||||
$this->assertTrue($method->invoke($wd, 'https://www.php.net/'));
|
||||
$this->assertTrue($method->invoke($wd, 'https://localhost/'));
|
||||
$this->assertTrue($method->invoke($wd, 'https://mylocaldomain/'));
|
||||
$this->assertTrue($method->invoke($wd, 'https://www.php.net/dir/test.html'));
|
||||
$this->assertTrue($method->invoke($wd, 'https://localhost/dir/test.html'));
|
||||
$this->assertTrue($method->invoke($wd, 'https://mylocaldomain/dir/test.html'));
|
||||
$this->assertFalse($method->invoke($wd, 'c:/dir/test.html'));
|
||||
$this->assertFalse($method->invoke($wd, '/dir/test.html'));
|
||||
$this->assertFalse($method->invoke($wd, '../dir/test.html'));
|
||||
}
|
||||
|
||||
public function testResolveXsdIncludes()
|
||||
|
@ -182,6 +182,9 @@ class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
|
|||
$method = $class->getMethod('resolveRelativePathInUrl');
|
||||
$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'));
|
||||
|
||||
|
|
Loading…
Reference in New Issue