Allow Malformed URLs

.github/workflows/php.yml

@@ -8,10 +8,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
     - name: Checkout
       uses: actions/checkout@v2

.gitignore

@@ -1,5 +1,8 @@
 /coverage/
 /vendor/
 /clover.xml
+.*
 composer.lock
 phpunit.xml
+!/.github/
+!.gitattributes

composer.json

@@ -2,23 +2,6 @@
     "name": "traderinteractive/util-http",
     "description": "A collection of http classes.",
     "keywords": ["utility", "http"],
-    "authors": [
-        {
-            "name": "Chad Gray",
-            "email": "chadwickgray@gmail.com",
-            "role": "Developer"
-        },
-        {
-            "name": "Spencer Rinehart",
-            "email": "anubis@overthemonkey.com",
-            "role": "Developer"
-        },
-        {
-            "name": "Jonathan Gaillard",
-            "email": "jonathan.gaillard@dominionenterprises.com",
-            "role": "Developer"
-        }
-    ],
     "license": "MIT",
     "config": {
         "sort-packages": true

src/Util/Http.php

@@ -172,7 +172,7 @@ public static function buildQueryString(array $parameters) : string
     public static function getQueryParams(string $url, array $collapsedParams = []) : array
     {
         $queryString = parse_url($url, PHP_URL_QUERY);
-        if (!is_string($queryString)) {
+        if (!is_string($queryString) || trim($queryString) === '') {
             return [];
         }
 
@@ -187,6 +187,10 @@ public static function getQueryParams(string $url, array $collapsedParams = [])
                 list($name, $value) = $nameAndValue;
             }
 
+            if ($name === '' && $value === '') {
+                continue;
+            }
+
             $name = rawurldecode($name);
             $value = rawurldecode($value);
             $collapsed = isset($collapsedParams[$name]);
@@ -223,7 +227,7 @@ public static function getQueryParams(string $url, array $collapsedParams = [])
     public static function getQueryParamsCollapsed(string $url, array $expectedArrayParams = []) : array
     {
         $queryString = parse_url($url, PHP_URL_QUERY);
-        if (!is_string($queryString)) {
+        if (!is_string($queryString) || trim($queryString) === '') {
             return [];
         }
 
@@ -236,6 +240,10 @@ public static function getQueryParamsCollapsed(string $url, array $expectedArray
                 list($name, $value) = $nameAndValue;
             }
 
+            if ($name === '' && $value === '') {
+                continue;
+            }
+
             $name = rawurldecode($name);
             $value = rawurldecode($value);
 

tests/Util/HttpTest.php

@@ -232,6 +232,38 @@ public function getQueryParamsWithCollapsed()
         $this->assertSame(['stuff' => 'yeah', 'moreStuff' => ['mhmm']], $result);
     }
 
+    /**
+     * @test
+     * @covers ::getQueryParams
+     * @dataProvider provideInvalidGetQueryParamData
+     */
+    public function getQueryParamsWithInvalidUrls(string $url, array $expected)
+    {
+        $this->assertSame($expected, Http::getQueryParams($url));
+    }
+
+    public static function provideInvalidGetQueryParamData(): array
+    {
+        return [
+            'empty query string' => [
+                'url' => 'http://example.com/widgets/123?',
+                'expected' => [],
+            ],
+            'malformed url' => [
+                'url' => 'http:///example.com/widgets/123',
+                'expected' => [],
+            ],
+            'trailing &' => [
+                'url' => 'http://example.com/widgets?a=b&',
+                'expected' => ['a' => ['b']],
+            ],
+            'leading &' => [
+                'url' => 'http://example.com/widgets?&a=b',
+                'expected' => ['a' => ['b']],
+            ],
+        ];
+    }
+
     /**
      * @test
      * @covers ::getQueryParams
@@ -299,4 +331,36 @@ public function getQueryParamsCollapsedEmptyParameter()
         $expected = ['stuff' => 'yeah', 'moreStuff' => ['', 'jazz'], 'otherStuff' => ''];
         $this->assertSame($expected, Http::getQueryParamsCollapsed($url, ['moreStuff']));
     }
+
+    /**
+     * @test
+     * @covers ::getQueryParamsCollapsed
+     * @dataProvider provideInvalidGetQueryParamCollapsedData
+     */
+    public function getQueryParamsCollapsedWithInvalidUrls(string $url, array $expected)
+    {
+        $this->assertSame($expected, Http::getQueryParamsCollapsed($url));
+    }
+
+    public static function provideInvalidGetQueryParamCollapsedData(): array
+    {
+        return [
+            'empty query string' => [
+                'url' => 'http://example.com/widgets/123?',
+                'expected' => [],
+            ],
+            'malformed url' => [
+                'url' => 'http:///example.com/widgets/123',
+                'expected' => [],
+            ],
+            'trailing &' => [
+                'url' => 'http://example.com/widgets?a=b&',
+                'expected' => ['a' => 'b'],
+            ],
+            'leading &' => [
+                'url' => 'http://example.com/widgets?&a=b',
+                'expected' => ['a' => 'b'],
+            ],
+        ];
+    }
 }