Use InputBag where able

FriendsOfSymfony · Nov 4, 2021 · e8335f1 · e8335f1
1 parent dbe2ab2
commit e8335f1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/EventListener/BodyListener.php b/EventListener/BodyListener.php
@@ -15,6 +15,7 @@
 use FOS\RestBundle\FOSRestBundle;
 use FOS\RestBundle\Normalizer\ArrayNormalizerInterface;
 use FOS\RestBundle\Normalizer\Exception\NormalizationException;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -88,7 +89,12 @@ public function onKernelRequest(RequestEvent $event): void
                 $decoder = $this->decoderProvider->getDecoder($format);
                 $data = $decoder->decode($content);
                 if (is_array($data)) {
-                    $request->request = new ParameterBag($data);
+                    if (class_exists(InputBag::class)) {
+                        $request->request = new InputBag($data);
+                    } else {
+                        $request->request = new ParameterBag($data);
+                    }
+
                     $normalizeRequest = true;
                 } else {
                     throw new BadRequestHttpException('Invalid '.$format.' message received');
@@ -105,7 +111,11 @@ public function onKernelRequest(RequestEvent $event): void
                 throw new BadRequestHttpException($e->getMessage());
             }
 
-            $request->request = new ParameterBag($data);
+            if (class_exists(InputBag::class)) {
+                $request->request = new InputBag($data);
+            } else {
+                $request->request = new ParameterBag($data);
+            }
         }
     }
 

diff --git a/Tests/Controller/Annotations/QueryParamTest.php b/Tests/Controller/Annotations/QueryParamTest.php
@@ -14,6 +14,7 @@
 use FOS\RestBundle\Controller\Annotations\AbstractScalarParam;
 use FOS\RestBundle\Controller\Annotations\QueryParam;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -45,9 +46,15 @@ public function testValueGetter()
             ->willReturn('foo');
 
         $request = $this->getMockBuilder(Request::class)->getMock();
-        $parameterBag = new ParameterBag();
-        $parameterBag->set('foo', 'foobar');
-        $request->query = $parameterBag;
+
+        if (class_exists(InputBag::class)) {
+            $bag = new InputBag();
+        } else {
+            $bag = new ParameterBag();
+        }
+
+        $bag->set('foo', 'foobar');
+        $request->query = $bag;
 
         $this->assertEquals('foobar', $this->param->getValue($request, 'bar'));
     }

diff --git a/Tests/Controller/Annotations/RequestParamTest.php b/Tests/Controller/Annotations/RequestParamTest.php
@@ -14,6 +14,7 @@
 use FOS\RestBundle\Controller\Annotations\AbstractScalarParam;
 use FOS\RestBundle\Controller\Annotations\RequestParam;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -45,9 +46,15 @@ public function testValueGetter()
             ->willReturn('foo');
 
         $request = $this->getMockBuilder(Request::class)->getMock();
-        $parameterBag = new ParameterBag();
-        $parameterBag->set('foo', 'foobar');
-        $request->request = $parameterBag;
+
+        if (class_exists(InputBag::class)) {
+            $bag = new InputBag();
+        } else {
+            $bag = new ParameterBag();
+        }
+
+        $bag->set('foo', 'foobar');
+        $request->request = $bag;
 
         $this->assertEquals('foobar', $this->param->getValue($request, 'bar'));
     }