improve bugfix

Author: nyamsprod

src/Parser/QueryString.php

@@ -38,6 +38,7 @@
 use function rawurlencode;
 use function sprintf;
 use function str_replace;
+use function str_split;
 use function strpos;
 use function substr;
 use const PHP_QUERY_RFC1738;
@@ -96,21 +97,17 @@ private function __construct()
      */
     public static function parse($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array
     {
-        $query = self::prepareQuery($query, $separator, $enc_type);
+        $query = self::prepareQuery($query, $enc_type);
         if (null === $query) {
             return [];
         }
 
-        if (is_bool($query)) {
-            return [[$query ? '1' : '0', null]];
-        }
-
         if ('' === $query) {
             return [['', null]];
         }
 
         $retval = [];
-        foreach ((array) explode($separator, $query) as $pair) {
+        foreach (self::getPairs($query, $separator) as $pair) {
             $retval[] = self::parsePair((string) $pair, self::DECODE_PAIR_VALUE);
         }
 
@@ -122,22 +119,24 @@ public static function parse($query, string $separator = '&', int $enc_type = PH
      *
      * @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
-     *
-     * @return null|string|bool
      */
-    private static function prepareQuery($query, string $separator, int $enc_type)
+    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 || is_bool($query)) {
+        if (null === $query) {
             return $query;
         }
 
+        if (is_bool($query)) {
+            return true === $query ? '1' : '0';
+        }
+
         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)));
         }
@@ -158,6 +157,19 @@ private static function prepareQuery($query, string $separator, int $enc_type)
         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) explode($separator, $query);
+    }
+
     /**
      * Returns the key/value pair from a query string pair.
      */
@@ -313,17 +325,13 @@ private static function encodeMatches(array $matches): string
      */
     public static function extract($query, string $separator = '&', int $enc_type = PHP_QUERY_RFC3986): array
     {
-        $query = self::prepareQuery($query, $separator, $enc_type);
+        $query = self::prepareQuery($query, $enc_type);
         if (null === $query || '' === $query) {
             return [];
         }
 
-        if (is_bool($query)) {
-            return [$query ? '1' : '0' => ''];
-        }
-
         $retval = [];
-        foreach ((array) explode($separator, $query) as $pair) {
+        foreach (self::getPairs($query, $separator) as $pair) {
             $retval[] = self::parsePair((string) $pair, self::PRESERVE_PAIR_VALUE);
         }
 

tests/QueryStringTest.php

@@ -161,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()