Merge pull request #4 from thephpleague/bugfix/issue-3

bugfix issue 3

Author: nyamsprod

.travis.yml

@@ -12,6 +12,12 @@ env:
 
 matrix:
   include:
+    - php: 7.1
+      env:
+        - COLLECT_COVERAGE=true
+        - IGNORE_PLATFORMS=false
+        - RUN_PHPSTAN=true
+        - VALIDATE_CODING_STYLE=false
     - php: 7.2
       env:
         - COLLECT_COVERAGE=true

composer.json

@@ -20,7 +20,7 @@
         }
     ]   ,
     "require": {
-        "php": "^7.2"
+        "php": "^7.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.3",

src/Parser/QueryString.php

@@ -38,8 +38,8 @@
 use function rawurlencode;
 use function sprintf;
 use function str_replace;
+use function str_split;
 use function strpos;
-use function strtoupper;
 use function substr;
 use const PHP_QUERY_RFC1738;
 use const PHP_QUERY_RFC3986;
@@ -70,6 +70,9 @@ final class QueryString
         ],
     ];
 
+    private const DECODE_PAIR_VALUE = 1;
+    private const PRESERVE_PAIR_VALUE = 2;
+
     /**
      * @var string
      */
@@ -91,49 +94,86 @@ private function __construct()
      * Parses a query string into a collection of key/value pairs.
      *
      * @param null|mixed $query
+     */
+    public static function parse($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array
+    {
+        $query = self::prepareQuery($query, $enc_type);
+        if (null === $query) {
+            return [];
+        }
+
+        if ('' === $query) {
+            return [['', null]];
+        }
+
+        $retval = [];
+        foreach (self::getPairs($query, $separator) as $pair) {
+            $retval[] = self::parsePair((string) $pair, self::DECODE_PAIR_VALUE);
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Prepare and normalize query before processing.
+     *
+     * @param null|mixed $query
      *
-     * @throws TypeError             If the query is not stringable or the null value
      * @throws MalformedUriComponent If the query string is invalid
+     * @throws TypeError             If the query is not stringable or the null value
      * @throws UnknownEncoding       If the encoding type is invalid
      */
-    public static function parse($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array
+    private static function prepareQuery($query, int $enc_type): ?string
     {
         if (!isset(self::ENCODING_LIST[$enc_type])) {
             throw new UnknownEncoding(sprintf('Unknown Encoding: %s', $enc_type));
         }
 
         if (null === $query) {
-            return [];
+            return $query;
         }
 
-        if (!is_scalar($query) && !method_exists($query, '__toString')) {
-            throw new TypeError(sprintf('The query must be a scalar, a stringable object or the `null` value, `%s` given', gettype($query)));
+        if (is_bool($query)) {
+            return true === $query ? '1' : '0';
         }
 
-        if (is_bool($query)) {
-            return [[$query ? '1' : '0', null]];
+        if (!is_scalar($query) && !method_exists($query, '__toString')) {
+            throw new TypeError(sprintf('The query must be a scalar, a stringable object or the `null` value, `%s` given', gettype($query)));
         }
 
         $query = (string) $query;
         if ('' === $query) {
-            return [['', null]];
+            return $query;
         }
 
         if (1 === preg_match(self::REGEXP_INVALID_CHARS, $query)) {
             throw new MalformedUriComponent(sprintf('Invalid query string: %s', $query));
         }
 
         if (PHP_QUERY_RFC1738 === $enc_type) {
-            $query = str_replace('+', ' ', $query);
+            return str_replace('+', ' ', $query);
+        }
+
+        return $query;
+    }
+
+    private static function getPairs(string $query, string $separator): array
+    {
+        if ('' === $separator) {
+            return str_split($query);
+        }
+
+        if (false === strpos($query, $separator)) {
+            return [$query];
         }
 
-        return array_map([self::class, 'parsePair'], (array) explode($separator, $query));
+        return (array) explode($separator, $query);
     }
 
     /**
      * Returns the key/value pair from a query string pair.
      */
-    private static function parsePair(string $pair): array
+    private static function parsePair(string $pair, int $parseValue): array
     {
         [$key, $value] = explode('=', $pair, 2) + [1 => null];
         $key = (string) $key;
@@ -146,7 +186,7 @@ private static function parsePair(string $pair): array
             return [$key, $value];
         }
 
-        if (1 === preg_match(self::REGEXP_ENCODED_PATTERN, $value)) {
+        if ($parseValue === self::DECODE_PAIR_VALUE && 1 === preg_match(self::REGEXP_ENCODED_PATTERN, $value)) {
             $value = preg_replace_callback(self::REGEXP_ENCODED_PATTERN, [self::class, 'decodeMatch'], $value);
         }
 
@@ -158,10 +198,6 @@ private static function parsePair(string $pair): array
      */
     private static function decodeMatch(array $matches): string
     {
-        if (1 === preg_match(self::REGEXP_DECODED_PATTERN, $matches[0])) {
-            return strtoupper($matches[0]);
-        }
-
         return rawurldecode($matches[0]);
     }
 
@@ -289,7 +325,17 @@ private static function encodeMatches(array $matches): string
      */
     public static function extract($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array
     {
-        return self::convert(self::parse($query, $separator, $enc_type));
+        $query = self::prepareQuery($query, $enc_type);
+        if (null === $query || '' === $query) {
+            return [];
+        }
+
+        $retval = [];
+        foreach (self::getPairs($query, $separator) as $pair) {
+            $retval[] = self::parsePair((string) $pair, self::PRESERVE_PAIR_VALUE);
+        }
+
+        return self::convert($retval);
     }
 
     /**

tests/QueryStringTest.php

@@ -70,6 +70,18 @@ public function testExtractQuery($query, array $expectedData): void
     public function extractQueryProvider(): array
     {
         return [
+            [
+                'query' => null,
+                'expected' => [],
+            ],
+            [
+                'query' => false,
+                'expected' => ['0' => ''],
+            ],
+            [
+                'query' => '%25car=%25car',
+                'expected' => ['%car' => '%car'],
+            ],
             [
                 'query' => '&&',
                 'expected' => [],
@@ -149,6 +161,12 @@ public function testParse($query, string $separator, array $expected, int $encod
     public function parserProvider(): array
     {
         return [
+            'empty separator' => [
+                'foo',
+                '',
+                [['f', null], ['o', null], ['o', null]],
+                PHP_QUERY_RFC3986,
+            ],
             'stringable object' => [
                 new class() {
                     public function __toString()