Merge pull request #172 from thephpleague/bugfix/issue-171

bug fix issue #171
thephpleague · Aug 12, 2020 · e3d51e7 · e3d51e7
2 parents db14710 + e386a60
commit e3d51e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ imporove `UriTemplate` implementation.
 
 - `UriTemplate` complete rewrite by reducing deep nested array usage.
 - Exception misleading message see issue [#167](https://github.com/thephpleague/uri/issues/167)
+- `Uri::withScheme` Uri validation failed to catch the empty string as an invalid scheme.
 
 ### Deprecated
 

diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": ">=7.2",
         "ext-json": "*",
         "psr/http-message": "^1.0",
         "league/uri-interfaces": "^2.1"

diff --git a/src/Uri.php b/src/Uri.php
@@ -310,7 +310,7 @@ private function __construct(
      */
     private function formatScheme(?string $scheme): ?string
     {
-        if ('' === $scheme || null === $scheme) {
+        if (null === $scheme) {
             return $scheme;
         }
 
@@ -319,7 +319,7 @@ private function formatScheme(?string $scheme): ?string
             return $formatted_scheme;
         }
 
-        throw new SyntaxError(sprintf('The scheme `%s` is invalid', $scheme));
+        throw new SyntaxError(sprintf('The scheme `%s` is invalid.', $scheme));
     }
 
     /**
@@ -438,7 +438,7 @@ private function formatRegisteredName(string $host): string
             $arr
         );
 
-        if ($arr === []) {
+        if ([] === $arr) {
             throw new SyntaxError(sprintf('Host `%s` is invalid', $host));
         }
 

diff --git a/src/UriString.php b/src/UriString.php
@@ -472,7 +472,7 @@ private static function filterRegisteredName(string $host): string
 
         $retval = idn_to_ascii($formatted_host, 0, INTL_IDNA_VARIANT_UTS46, $arr);
 
-        if ($arr === []) {
+        if ([] === $arr) {
             throw new SyntaxError(sprintf('Host `%s` is not a valid IDN host', $host));
         }
 

diff --git a/tests/UriTest.php b/tests/UriTest.php
@@ -580,4 +580,12 @@ public function testIssue167ExceptionReasonMisleadingMessage(): void
 
         Uri::createFromString('file://example.org:80/home/jsmith/foo.txt');
     }
+
+    public function testIssue171TheEmptySchemeShouldThrow(): void
+    {
+        self::expectException(SyntaxError::class);
+        self::expectExceptionMessage('The scheme `` is invalid.');
+
+        Uri::createFromString('domain.com')->withScheme('');
+    }
 }