fix some deprecations

diff --git a/src/orm/connection/unitofwork.php b/src/orm/connection/unitofwork.php
index 301b5d7c6d5f4b5a1f3a8be2dc3a5240e175e0bd..bf8985ee8bfafc37e07269f65118d44cb3d75441 100644 (file)
--- 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 df7f498c4605f4037fbd70e72dbf81eb2c86b109..0f13fa3974242388ce90e39de950b647ada28c62 100644 (file)
--- 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;