Close #196

Author: neomerx

src/Http/Query/BaseQueryParser.php

@@ -133,7 +133,7 @@ public function getSorts(): iterable
      */
     protected function splitString(string $paramName, $shouldBeString, string $separator): iterable
     {
-        if (is_string($shouldBeString) === false || empty($trimmed = trim($shouldBeString)) === true) {
+        if (is_string($shouldBeString) === false || ($trimmed = trim($shouldBeString)) === '') {
             throw new JsonApiException($this->createParameterError($paramName));
         }
 
@@ -153,7 +153,7 @@ protected function splitStringAndCheckNoEmpties(string $paramName, $shouldBeStri
     {
         foreach ($this->splitString($paramName, $shouldBeString, $separator) as $value) {
             $trimmedValue = trim($value);
-            if (empty($trimmedValue) === true) {
+            if (($trimmedValue) === '') {
                 throw new JsonApiException($this->createParameterError($paramName));
             }
 

tests/Http/Query/BaseQueryParserTest.php

@@ -55,6 +55,39 @@ public function testIncludes(): void
         ], $this->iterableToArray($parser->getIncludes()));
     }
 
+    /**
+     * That's a special case to test possible issues with `empty` function which thinks "0" is an empty string.
+     */
+    public function testIncludesForStringWithZeroes1(): void
+    {
+        $queryParameters = [
+            BaseQueryParser::PARAM_INCLUDE => '0',
+        ];
+
+        $parser = $this->createParser($queryParameters);
+
+        $this->assertEquals([
+            '0' => ['0'],
+        ], $this->iterableToArray($parser->getIncludes()));
+    }
+
+    /**
+     * That's a special case to test possible issues with `empty` function which thinks "0" is an empty string.
+     */
+    public function testIncludesForStringWithZeroes2(): void
+    {
+        $queryParameters = [
+            BaseQueryParser::PARAM_INCLUDE => '0,1',
+        ];
+
+        $parser = $this->createParser($queryParameters);
+
+        $this->assertEquals([
+            '0' => ['0'],
+            '1' => ['1'],
+        ], $this->iterableToArray($parser->getIncludes()));
+    }
+
     /**
      * Test query.
      */