From 9825a1d93215f98877a6d0f442033dca3cbad5ab Mon Sep 17 00:00:00 2001 From: lowtower Date: Wed, 11 Apr 2018 08:02:05 +0200 Subject: [PATCH 1/4] Update AbstractTableGateway.php Change Return Type of selectWith() method --- src/TableGateway/AbstractTableGateway.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/TableGateway/AbstractTableGateway.php b/src/TableGateway/AbstractTableGateway.php index 014c08eaa2..80870a578e 100644 --- a/src/TableGateway/AbstractTableGateway.php +++ b/src/TableGateway/AbstractTableGateway.php @@ -198,8 +198,7 @@ public function select($where = null) /** * @param Select $select - * @return ResultSetInterface - * @throws \RuntimeException + * @return ResultSet */ public function selectWith(Select $select) { From 78377c7adaa3936c4ecd61ce3f4c46bca3cfdc5d Mon Sep 17 00:00:00 2001 From: lowtower Date: Wed, 11 Apr 2018 12:27:01 +0200 Subject: [PATCH 2/4] @return AbstractResultSet --- src/TableGateway/AbstractTableGateway.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TableGateway/AbstractTableGateway.php b/src/TableGateway/AbstractTableGateway.php index 80870a578e..36ba7e6a14 100644 --- a/src/TableGateway/AbstractTableGateway.php +++ b/src/TableGateway/AbstractTableGateway.php @@ -177,7 +177,7 @@ public function getSql() * Select * * @param Where|\Closure|string|array $where - * @return ResultSet + * @return AbstractResultSet */ public function select($where = null) { @@ -198,7 +198,7 @@ public function select($where = null) /** * @param Select $select - * @return ResultSet + * @return AbstractResultSet */ public function selectWith(Select $select) { @@ -210,7 +210,7 @@ public function selectWith(Select $select) /** * @param Select $select - * @return ResultSet + * @return AbstractResultSet * @throws Exception\RuntimeException */ protected function executeSelect(Select $select) From 96a86326a5c1c6825c04abcaf5cd036627b49629 Mon Sep 17 00:00:00 2001 From: lowtower Date: Wed, 11 Apr 2018 13:50:05 +0200 Subject: [PATCH 3/4] Add missing use statement --- src/TableGateway/AbstractTableGateway.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/TableGateway/AbstractTableGateway.php b/src/TableGateway/AbstractTableGateway.php index 36ba7e6a14..7de8785451 100644 --- a/src/TableGateway/AbstractTableGateway.php +++ b/src/TableGateway/AbstractTableGateway.php @@ -10,6 +10,7 @@ namespace Zend\Db\TableGateway; use Zend\Db\Adapter\AdapterInterface; +use Zend\Db\ResultSet\AbstractResultSet; use Zend\Db\ResultSet\ResultSet; use Zend\Db\ResultSet\ResultSetInterface; use Zend\Db\Sql\Delete; From fa22d52dcc991b30ecfe331cfd4f1d7da19b3f40 Mon Sep 17 00:00:00 2001 From: lowtower Date: Fri, 13 Apr 2018 16:01:38 +0200 Subject: [PATCH 4/4] Change type of $resultSetPrototype as suggested by @samsonasik --- src/TableGateway/AbstractTableGateway.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TableGateway/AbstractTableGateway.php b/src/TableGateway/AbstractTableGateway.php index 7de8785451..ec4063cea3 100644 --- a/src/TableGateway/AbstractTableGateway.php +++ b/src/TableGateway/AbstractTableGateway.php @@ -57,7 +57,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface protected $featureSet = null; /** - * @var ResultSetInterface + * @var ResultSetInterface|AbstractResultSet */ protected $resultSetPrototype = null;