Merge pull request doctrine#41 from nitra/master

PHP 7.2 - deprecated "each" calls
zone-eu · Mar 20, 2018 · ca85260 · ca85260
2 parents 19ed440 + 23c6c40
commit ca85260
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
   - nightly
 

diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php
@@ -237,7 +237,7 @@ private function _executeDeletions(array $deletions)
                 $params = array();
                 $columnNames = array();
                 foreach ($identifierMaps as $idMap) {
-                    while (list($fieldName, $value) = each($idMap)) {
+                    foreach($idMap as $fieldName => $value) {
                         $params[] = $value;
                         $columnNames[] = $table->getColumnName($fieldName);
                     }
@@ -957,4 +957,4 @@ protected function _assignIdentifier(Doctrine_Record $record)
             $record->assignIdentifier(true);
         }
     }
-}
+}
diff --git a/lib/Doctrine/Hydrator/Graph.php b/lib/Doctrine/Hydrator/Graph.php
@@ -256,7 +256,7 @@ public function hydrateResultSet($stmt)
                     } else if ( ! isset($prev[$parent][$relationAlias])) {
                         $element = $this->getElement($data, $componentName);
 
-						// [FIX] Tickets #1205 and #1237
+                        // [FIX] Tickets #1205 and #1237
                         $event->set('data', $element);
                         $listeners[$componentName]->postHydrate($event);
                         $instances[$componentName]->postHydrate($event);
@@ -409,20 +409,21 @@ protected function _getClassnameToReturn(array &$data, $component)
                 $needMatches = count($inheritanceMap);
                 foreach ($inheritanceMap as $key => $value) {
                     $key = $this->_tables[$component]->getFieldName($key);
-                    if ( isset($data[$key]) && $data[$key] == $value) {
+                    if (isset($data[$key]) && $data[$key] == $value) {
                         --$needMatches;
                     }
                 }
                 if ($needMatches == 0) {
                     $matchedComponents[] = $table->getComponentName();
                 }
             } else {
-                list($key, $value) = each($inheritanceMap);
-                $key = $this->_tables[$component]->getFieldName($key);
-                if ( ! isset($data[$key]) || $data[$key] != $value) {
-                    continue;
-                } else {
-                    $matchedComponents[] = $table->getComponentName();
+                foreach ($inheritanceMap as $key => $value) {
+                    $key = $this->_tables[$component]->getFieldName($key);
+                    if (!isset($data[$key]) || $data[$key] != $value) {
+                        continue;
+                    } else {
+                        $matchedComponents[] = $table->getComponentName();
+                    }
                 }
             }
         }