Fix issue in Required filter validator with dot notation (#4221)

api-platform · Apr 16, 2021 · 8d4891a · 8d4891a
1 parent 14bd387
commit 8d4891a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 2.6.5
 
+* Filter validation: Fix issue in Required filter validator with dot notation (#4221)
 * OpenAPI: Fix notice/warning for `response` without `content` in the `openapi_context` (#4210)
 * Serializer: Convert internal error to HTTP 400 in Ramsey uuid denormalization from invalid body string (#4200)
 

diff --git a/src/Filter/Validator/Required.php b/src/Filter/Validator/Required.php
@@ -13,6 +13,8 @@
 
 namespace ApiPlatform\Core\Filter\Validator;
 
+use ApiPlatform\Core\Util\RequestParser;
+
 final class Required implements ValidatorInterface
 {
     /**
@@ -47,8 +49,7 @@ public function validate(string $name, array $filterDescription, array $queryPar
      */
     private function requestHasQueryParameter(array $queryParameters, string $name): bool
     {
-        $matches = [];
-        parse_str($name, $matches);
+        $matches = RequestParser::parseRequestParams($name);
         if (!$matches) {
             return false;
         }
@@ -76,8 +77,7 @@ private function requestHasQueryParameter(array $queryParameters, string $name):
      */
     private function requestGetQueryParameter(array $queryParameters, string $name)
     {
-        $matches = [];
-        parse_str($name, $matches);
+        $matches = RequestParser::parseRequestParams($name);
         if (empty($matches)) {
             return null;
         }

diff --git a/tests/Filter/Validator/RequiredTest.php b/tests/Filter/Validator/RequiredTest.php
@@ -101,4 +101,33 @@ public function testEmptyValueAllowed()
             $filter->validate('some_filter', $explicitFilterDefinition, $request)
         );
     }
+
+    public function testBracketNotation()
+    {
+        $filter = new Required();
+
+        $request = ['foo' => ['bar' => ['bar']]];
+
+        $requiredFilter = [
+            'required' => true,
+        ];
+
+        $this->assertEmpty(
+            $filter->validate('foo[bar]', $requiredFilter, $request)
+        );
+    }
+
+    public function testDotNotation()
+    {
+        $request = ['foo.bar' => 'bar'];
+        $filter = new Required();
+
+        $requiredFilter = [
+            'required' => true,
+        ];
+
+        $this->assertEmpty(
+            $filter->validate('foo.bar', $requiredFilter, $request)
+        );
+    }
 }