Changeset 3835 for trunk/lib/Doctrine.php

Timestamp:

02/19/08 00:24:32 (11 months ago)

Author:

jwage

Message:

Merged r3834 to 0.9 and trunk. Fixed conservative model loading to actually be conservative.

Files:

• trunk/lib/Doctrine.php (modified) (3 diffs)

trunk/lib/Doctrine.php

@@ -690 +690 @@
         }
 
-        return self::filterInvalidModels($loadedModels);
+        // We do not want to filter invalid models when using conservative model loading
+        // The filtering requires that the class be loaded and inflected in order to determine if it is 
+        // a valid class.
+        if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) == Doctrine::MODEL_LOADING_CONSERVATIVE) {
+            return $loadedModels;
+        } else {
+            return self::filterInvalidModels($loadedModels);
+        }
     }
 
@@ -715 +722 @@
      *
      * Filter through an array of classes and return all the classes that are valid models
+     * This will inflect the class, causing it to be loaded in to memory.
      *
      * @param classes  Array of classes to filter through, otherwise uses get_declared_classes()
@@ -736 +744 @@
      *
      * Checks if what is passed is a valid Doctrine_Record
+     * Will load class in to memory in order to inflect it and find out information about the class
      *
      * @param   mixed   $class Can be a string named after the class, an instance of the class, or an instance of the class reflected