Merge pull request #1866 from antograssiot/order-filter

The OrderFilter is still triggering bad deprecation/function calls

Author: dunglas

src/Bridge/Doctrine/Orm/Filter/OrderFilter.php

@@ -81,8 +81,11 @@ public function __construct(ManagerRegistry $managerRegistry, $requestStack = nu
      */
     public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null, array $context = [])
     {
+        if (isset($context['filters']) && !isset($context['filters'][$this->orderParameterName])) {
+            return;
+        }
+
         if (!isset($context['filters'][$this->orderParameterName]) || !\is_array($context['filters'][$this->orderParameterName])) {
-            $context['filters'] = null;
             parent::apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
 
             return;

tests/Bridge/Doctrine/Orm/Filter/OrderFilterTest.php

@@ -341,6 +341,18 @@ public function provideApplyTestData(): array
                 null,
                 $orderFilterFactory,
             ],
+            'not having order should not throw a deprecation (select unchanged)' => [
+                [
+                    'id' => null,
+                    'name' => null,
+                ],
+                [
+                    'name' => 'q',
+                ],
+                sprintf('SELECT o FROM %s o', Dummy::class),
+                null,
+                $orderFilterFactory,
+            ],
         ];
     }
 }