Fix tests

PhpGt · Jun 19, 2019 · ee79f46 · ee79f46
1 parent 97c4b79
commit ee79f46
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 35 deletions.
diff --git a/src/ServerInfo.php b/src/ServerInfo.php
@@ -47,7 +47,7 @@ public function getServerProtocolVersion():float {
 			FILTER_SANITIZE_NUMBER_FLOAT,
 			FILTER_FLAG_ALLOW_FRACTION
 		);
-		return $version;
+		return (float)$version;
 	}
 
 	/**

diff --git a/test/unit/RequestFactoryTest.php b/test/unit/RequestFactoryTest.php
@@ -18,7 +18,7 @@ public function testCreateServerRequest() {
 		/** @var MockObject|ServerInfo $serverInfo */
 		$serverInfo = self::createMock(ServerInfo::class);
 		$serverInfo->method("getServerProtocolVersion")
-			->willReturn("123");
+			->willReturn(123.000);
 		$serverInfo->method("getRequestMethod")
 			->willReturn(RequestMethod::METHOD_GET);
 		/** @var MockObject|Input $input */

diff --git a/test/unit/SteamTest.php b/test/unit/SteamTest.php
@@ -14,7 +14,7 @@ class SteamTest extends TestCase {
 	protected $tmpStream;
 	protected $tmpFileFull;
 
-	public function setUp() {
+	public function setUp():void {
 		$this->tmpDir = implode(DIRECTORY_SEPARATOR, [
 			sys_get_temp_dir(),
 			"phpgt",
@@ -27,7 +27,7 @@ public function setUp() {
 		file_put_contents($this->tmpFileFull, uniqid("data-"));
 	}
 
-	public function tearDown() {
+	public function tearDown():void {
 		/** @var SplFileInfo[] $files */
 		$files = new RecursiveIteratorIterator(
 			new RecursiveDirectoryIterator(

diff --git a/test/unit/UriTest.php b/test/unit/UriTest.php
@@ -1,9 +1,12 @@
 <?php
 namespace Gt\Http\Test;
 
+use Gt\Http\PortOutOfBoundsException;
 use Gt\Http\Uri;
 use Gt\Http\UriFactory;
+use Gt\Http\UriParseErrorException;
 use PHPUnit\Framework\TestCase;
+use TypeError;
 
 class UriTest extends TestCase {
 	public function testParsesProvidedUri() {
@@ -83,11 +86,9 @@ public function getValidUris() {
 		];
 	}
 
-	/**
-	 * @expectedException \Gt\Http\UriParseErrorException
-	 * @dataProvider getInvalidUris
-	 */
+	/** @dataProvider getInvalidUris */
 	public function testInvalidUrisThrowException($invalidUri) {
+		self::expectException(UriParseErrorException::class);
 		new Uri($invalidUri);
 	}
 
@@ -101,59 +102,43 @@ public function getInvalidUris() {
 		];
 	}
 
-	/**
-	 * @expectedException \Gt\Http\PortOutOfBoundsException
-	 */
 	public function testPortMustBeValid() {
+		self::expectException(PortOutOfBoundsException::class);
 		(new Uri())->withPort(100000);
 	}
 
-	/**
-	 * @expectedException \Gt\Http\PortOutOfBoundsException
-	 */
 	public function testWithPortCannotBeZero() {
+		self::expectException(PortOutOfBoundsException::class);
 		(new Uri())->withPort(0);
 	}
 
-	/**
-	 * @expectedException \Gt\Http\UriParseErrorException
-	 */
 	public function testParseUriPortCannotBeZero() {
+		self::expectException(UriParseErrorException::class);
 		new Uri('//example.com:0');
 	}
 
-	/**
-	 * @expectedException \TypeError
-	 */
 	public function testSchemeMustHaveCorrectType() {
+		self::expectException(TypeError::class);
 		(new Uri())->withScheme([]);
 	}
 
-	/**
-	 * @expectedException \TypeError
-	 */
 	public function testHostMustHaveCorrectType() {
+		self::expectException(TypeError::class);
 		(new Uri())->withHost([]);
 	}
 
-	/**
-	 * @expectedException \TypeError
-	 */
 	public function testPathMustHaveCorrectType() {
+		self::expectException(TypeError::class);
 		(new Uri())->withPath([]);
 	}
 
-	/**
-	 * @expectedException \TypeError
-	 */
 	public function testQueryMustHaveCorrectType() {
+		self::expectException(TypeError::class);
 		(new Uri())->withQuery([]);
 	}
 
-	/**
-	 * @expectedException \TypeError
-	 */
 	public function testFragmentMustHaveCorrectType() {
+		self::expectException(TypeError::class);
 		(new Uri())->withFragment([]);
 	}
 
@@ -379,10 +364,8 @@ public function testStandardPortIsNullIfSchemeChanges() {
 		$this->assertNull($uri->getPort());
 	}
 
-	/**
-	 * @expectedException \TypeError
-	 */
 	public function testPortPassedAsStringIsCastedToInt() {
+		self::expectException(TypeError::class);
 		$uri = (new Uri('//example.com'))->withPort('8080');
 	}