Merge branch 'hotfix/395'

Close #395

CHANGELOG.md

@@ -22,7 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#382](https://github.com/zendframework/zend-db/pull/382) fixes `Zend\Db\Sql\Expression` to allow `0` value for parameter
+- [#382](https://github.com/zendframework/zend-db/pull/382) fixes `Zend\Db\Sql\Expression` to allow `0` value for parameter.
+
+- [#395](https://github.com/zendframework/zend-db/pull/395) fixes PHP 7.4 compatibility.
 
 ## 2.10.0 - 2019-02-25
 

src/RowGateway/AbstractRowGateway.php

@@ -204,7 +204,9 @@ public function delete()
         $where = [];
         // primary key is always an array even if its a single column
         foreach ($this->primaryKeyColumn as $pkColumn) {
-            $where[$pkColumn] = $this->primaryKeyData[$pkColumn];
+            $where[$pkColumn] = isset($this->primaryKeyData[$pkColumn])
+                ? $this->primaryKeyData[$pkColumn]
+                : null;
         }
 
         // @todo determine if we need to do a select to ensure 1 row will be affected

src/TableGateway/AbstractTableGateway.php

@@ -216,7 +216,8 @@ public function selectWith(Select $select)
     protected function executeSelect(Select $select)
     {
         $selectState = $select->getRawState();
-        if ($selectState['table'] != $this->table
+        if (isset($selectState['table'])
+            && $selectState['table'] != $this->table
             && (is_array($selectState['table'])
                 && end($selectState['table']) != $this->table)
         ) {
@@ -225,7 +226,8 @@ protected function executeSelect(Select $select)
             );
         }
 
-        if ($selectState['columns'] == [Select::SQL_STAR]
+        if (isset($selectState['columns'])
+            && $selectState['columns'] == [Select::SQL_STAR]
             && $this->columns !== []) {
             $select->columns($this->columns);
         }