Doctrine

Timestamp:

04/29/08 23:02:26 (14 months ago)

Author:

jwage

Message:

Fixing test case and bug with Doctrine::initializeModels()

Location:

branches/0.11

Files:

• lib/Doctrine.php (modified) (1 diff)
• tests/Data/ImportTestCase.php (modified) (1 diff)

branches/0.11/lib/Doctrine.php

@@ -636 +636 @@
         foreach ($models as $model) {
             $declaredBefore = get_declared_classes();
-
-            Doctrine::getTable($model);
-
-            $declaredAfter = get_declared_classes();
-            // Using array_slice because array_diff is broken is some PHP versions
-            $foundClasses = array_slice($declaredAfter, count($declaredBefore) - 1);
-            foreach ($foundClasses as $class) {
-                if (self::isValidModelClass($class)) {
-                    $models[] = $class;
+            if (self::isValidModelClass($model)) {
+                Doctrine::getTable($model);
+
+                $declaredAfter = get_declared_classes();
+                // Using array_slice because array_diff is broken is some PHP versions
+                $foundClasses = array_slice($declaredAfter, count($declaredBefore) - 1);
+                foreach ($foundClasses as $class) {
+                    if (self::isValidModelClass($class)) {
+                        $models[] = $class;
+                    }
                 }
             }

branches/0.11/tests/Data/ImportTestCase.php

@@ -429 +429 @@
         } catch (Exception $e) {
             $this->pass();
-            $this->assertEqual($e->getMessage(), 'Class referred to is expected to be "Group" and "User" was given');
+            $this->assertEqual($e->getMessage(), 'Class referred to in "Groupuser_1" is expected to be "User" and "Group" was given');
         }