Fix Uri tests

Author: Greg Bowler

src/Uri.php

@@ -679,7 +679,7 @@ public function isSameDocumentReference(Uri $baseUri = null):bool {
 	}
 
 	protected function setDefaults():void {
-		if($this->host === "") {
+		if(strlen($this->host) === 0) {
 			if($this->scheme === "http"
 			|| $this->scheme === "https") {
 				$this->host = self::DEFAULT_HOST_HTTP;
@@ -690,6 +690,10 @@ protected function setDefaults():void {
 			if(strpos($this->path, "//") === 0) {
 				throw new \InvalidArgumentException("The path of a URI without an authority must not start with two slashes \"//\"");
 			}
+			if(strlen($this->scheme) === 0
+			&& strpos(explode('/', $this->path, 2)[0], ':')) {
+				throw new \InvalidArgumentException("A relative URI must not have a path beginning with a segment containing a colon");
+			}
 		}
 		else {
 			if(strlen($this->path) > 0

test/unit/UriTest.php

@@ -1,11 +1,9 @@
 <?php
 namespace Gt\Http\Test;
 
-use Gt\Http\PortOutOfBoundsException;
 use Gt\Http\Uri;
 use Gt\Http\UriFactory;
 use PHPUnit\Framework\TestCase;
-use Psr\Http\Message\UriInterface;
 
 class UriTest extends TestCase {
 	public function testParsesProvidedUri() {
@@ -547,11 +545,9 @@ public function testRelativePathAndAuhorityIsAutomagicallyFixed() {
 		$this->assertSame('//example.com/foo', (string)$uri);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage The path of a URI without an authority must not start with two slashes "//"
-	 */
 	public function testPathStartingWithTwoSlashesAndNoAuthorityIsInvalid() {
+		self::expectException(\InvalidArgumentException::class);
+		self::expectExceptionMessage("The path of a URI without an authority must not start with two slashes \"//\"");
 		// URI "//foo" would be interpreted as network reference and thus change the original path to the host
 		(new Uri)->withPath('//foo');
 	}
@@ -561,22 +557,20 @@ public function testPathStartingWithTwoSlashes() {
 		$this->assertSame('//path-not-host.com', $uri->getPath());
 		$uri = $uri->withScheme('');
 		$this->assertSame('//example.org//path-not-host.com', (string)$uri); // This is still valid
-		self::expectException('\InvalidArgumentException');
+		self::expectException(\InvalidArgumentException::class);
 		$uri->withHost(''); // Now it becomes invalid
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage A relative URI must not have a path beginning with a segment containing a colon
-	 */
 	public function testRelativeUriWithPathBeginngWithColonSegmentIsInvalid() {
+		self::expectException(\InvalidArgumentException::class);
+		self::expectExceptionMessage("A relative URI must not have a path beginning with a segment containing a colon");
 		(new Uri)->withPath('mailto:foo');
 	}
 
 	public function testRelativeUriWithPathHavingColonSegment() {
 		$uri = (new Uri('urn:/mailto:foo'))->withScheme('');
 		$this->assertSame('/mailto:foo', $uri->getPath());
-		self::expectException('\InvalidArgumentException');
+		self::expectException(\InvalidArgumentException::class);
 		(new Uri('urn:mailto:foo'))->withScheme('');
 	}