Merge branch 'master' into raise-phpstan-level

garak · Mar 24, 2024 · aba9930 · aba9930
2 parents b7b77d7 + 51f7053
commit aba9930
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,5 +2,3 @@ parameters:
     level: 6
     paths:
         - src
-includes:
-    - phpstan-baseline.neon
diff --git a/src/Knp/Component/Pager/Event/Subscriber/Sortable/Doctrine/ORM/Query/OrderByWalker.php b/src/Knp/Component/Pager/Event/Subscriber/Sortable/Doctrine/ORM/Query/OrderByWalker.php
@@ -34,7 +34,7 @@ class OrderByWalker extends TreeWalkerAdapter
      * Walks down a SelectStatement AST node, modifying it to
      * sort the query like requested by url
      */
-    public function walkSelectStatement(SelectStatement $AST): string
+    public function walkSelectStatement(SelectStatement $AST): void
     {
         $query = $this->_getQuery();
         $fields = (array)$query->getHint(self::HINT_PAGINATOR_SORT_FIELD);
@@ -90,7 +90,5 @@ public function walkSelectStatement(SelectStatement $AST): string
                 $AST->orderByClause = new OrderByClause([$orderByItem]);
             }
         }
-
-        return '';
     }
 }