Remove param from ProxyQueryInterface::execute (#6827)

sonata-project · Jan 31, 2021 · fb1399b · fb1399b
1 parent 7809bc9
commit fb1399b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/src/Datagrid/ProxyQueryInterface.php b/src/Datagrid/ProxyQueryInterface.php
@@ -29,11 +29,9 @@ interface ProxyQueryInterface
     public function __call($name, $args);
 
     /**
-     * @param int|null $hydrationMode
-     *
      * @return mixed
      */
-    public function execute(array $params = [], $hydrationMode = null);
+    public function execute();
 
     /**
      * @param array $parentAssociationMappings

diff --git a/src/Datagrid/SimplePager.php b/src/Datagrid/SimplePager.php
@@ -128,6 +128,7 @@ public function getResults($hydrationMode = null)
             return $this->results;
         }
 
+        // @phpstan-ignore-next-line
         $this->results = $this->getQuery()->execute([], $hydrationMode);
         $this->thresholdCount = \count($this->results);
         if (\count($this->results) > $this->getMaxPerPage()) {

diff --git a/tests/App/Datagrid/ProxyQuery.php b/tests/App/Datagrid/ProxyQuery.php
@@ -21,7 +21,7 @@ public function __call($name, $args)
     {
     }
 
-    public function execute(array $params = [], $hydrationMode = null)
+    public function execute()
     {
         throw new \BadMethodCallException('Not implemented.');
     }

diff --git a/tests/Datagrid/SimplePagerTest.php b/tests/Datagrid/SimplePagerTest.php
@@ -39,7 +39,6 @@ public function testInitNumPages(): void
         $pager = new SimplePager(10, 2);
         $this->proxyQuery->expects($this->once())
                 ->method('execute')
-                ->with([], null)
                 ->willReturn(new ArrayCollection(range(0, 12)));
 
         $this->proxyQuery->expects($this->once())
@@ -60,7 +59,6 @@ public function testInitOffset(): void
     {
         $this->proxyQuery->expects($this->once())
             ->method('execute')
-            ->with([], null)
             ->willReturn(new ArrayCollection(range(0, 12)));
 
         $this->proxyQuery->expects($this->once())
@@ -102,7 +100,6 @@ public function testNoPagesForNoResults(): void
     {
         $this->proxyQuery->expects($this->once())
             ->method('execute')
-            ->with([], null)
             ->willReturn([]);
 
         $this->proxyQuery->expects($this->once())
@@ -131,7 +128,6 @@ public function testGetCurrentPageResultsReturnTypeArrayCollection(): void
     {
         $this->proxyQuery->expects($this->once())
             ->method('execute')
-            ->with([], null)
             ->willReturn(['foo', 'bar']);
 
         $this->pager->setQuery($this->proxyQuery);
@@ -155,7 +151,6 @@ public function testGetCurrentPageResultsReturnTypeArray(array $queryReturnValue
     {
         $this->proxyQuery->expects($this->once())
             ->method('execute')
-            ->with([], null)
             ->willReturn($queryReturnValues);
 
         $this->pager->setQuery($this->proxyQuery);