From: Andrey Kutejko <andy128k@gmail.com>
Date: Sun, 10 Mar 2019 14:52:02 +0000 (+0100)
Subject: fix some deprecations
X-Git-Tag: 0.6~2
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=17ae498298705eedef2e561de65f696e1bc897c6;p=ipf-legacy-orm.git

fix some deprecations
---

diff --git a/src/orm/connection/unitofwork.php b/src/orm/connection/unitofwork.php
index 301b5d7..bf8985e 100644
--- a/src/orm/connection/unitofwork.php
+++ b/src/orm/connection/unitofwork.php
@@ -163,7 +163,7 @@ class IPF_ORM_Connection_UnitOfWork extends IPF_ORM_Connection_Module
                 $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);
                     }
diff --git a/src/orm/hydrator/recorddriver.php b/src/orm/hydrator/recorddriver.php
index df7f498..0f13fa3 100644
--- a/src/orm/hydrator/recorddriver.php
+++ b/src/orm/hydrator/recorddriver.php
@@ -85,11 +85,10 @@ class IPF_ORM_Hydrator_RecordDriver
         foreach ($subclasses as $subclass) {
             $table = IPF_ORM::getTable($subclass);
             $inheritanceMap = $table->getOption('inheritanceMap');
-            list($key, $value) = each($inheritanceMap);
-            if ( ! isset($data[$key]) || $data[$key] != $value) {
-                continue;
-            } else {
-                return $table->getComponentName();
+            foreach ($inheritanceMap as $key => $value) {
+                if (isset($data[$key]) && $data[$key] == $value) {
+                    return $table->getComponentName();
+                }
             }
         }
         return $component;