Doctrine

Timestamp:

02/22/08 20:59:43 (17 months ago)

Author:

jwage

Message:

fixes #804

Location:

branches/0.10/lib

Files:

• Doctrine.php (modified) (4 diffs)
• Doctrine/Import/Builder.php (modified) (1 diff)
• Doctrine/Migration/Builder.php (modified) (2 diffs)

branches/0.10/lib/Doctrine.php

@@ -535 +535 @@
      * Recursively load all models from a directory or array of directories
      *
-     * @param string $directory    Path to directory of models or array of directory paths
-     * @return array $loadedModels
-     */
-    public static function loadModels($directory)
-    {
+     * @param  string   $directory      Path to directory of models or array of directory paths
+     * @param  integer  $forceStyle     Pass value of Doctrine::ATTR_MODEL_LOADING to force a certain style of model loading
+     *                                  Allowed Doctrine::MODEL_LOADING_AGGRESSIVE(default) or Doctrine::MODEL_LOADING_CONSERVATIVE
+     * @return array    $modelLoading   Array of the models loaded by the operation
+     */
+    public static function loadModels($directory, $modelLoading = null)
+    {
+        $manager = Doctrine_Manager::getInstance();
+
+        $modelLoading = $modelLoading === null ? $manager->getAttribute(Doctrine::ATTR_MODEL_LOADING):$modelLoading;
+
         $loadedModels = array();
 
-        if ($directory !== null) {
-            $manager = Doctrine_Manager::getInstance();
-
+        if ($directory !== null && is_dir($directory)) {
             foreach ((array) $directory as $dir) {
                 $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
@@ -552 +556 @@
                     if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
 
-                        if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) == Doctrine::MODEL_LOADING_CONSERVATIVE) {
+                        if ($modelLoading == Doctrine::MODEL_LOADING_CONSERVATIVE) {
                             self::$_loadedModelFiles[$e[0]] = $file->getPathName();
                             self::$_pathModels[$file->getPathName()][$e[0]] = $e[0];
@@ -578 +582 @@
                 }
             }
+        } else {
+          throw new Doctrine_Exception('You must pass a valid path to a directory containing Doctrine models');
         }
 
@@ -914 +920 @@
      * generateMigrationsFromModels
      *
-     * @param string $migrationsPath
-     * @param string $modelsPath
-     * @return void
-     */
-    public static function generateMigrationsFromModels($migrationsPath, $modelsPath = null)
+     * @param string  $migrationsPath Path to your Doctrine migration classes
+     * @param string  $modelsPath     Path to your Doctrine model classes
+     * @param integer $modelLoading   Style of model loading to use for loading the models in order to generate migrations
+     * @return void
+     */
+    public static function generateMigrationsFromModels($migrationsPath, $modelsPath = null, $modelLoading = null)
     {
         $builder = new Doctrine_Migration_Builder($migrationsPath);
 
-        return $builder->generateMigrationsFromModels($modelsPath);
+        return $builder->generateMigrationsFromModels($modelsPath, $modelLoading);
     }
 

branches/0.10/lib/Doctrine/Import/Builder.php

@@ -790 +790 @@
 
         if (isset($definition['generate_once']) && $definition['generate_once'] === true) {
-            if (!file_exists($writePath)) {
+            if ( ! file_exists($writePath)) {
                 $bytes = file_put_contents($writePath, $code);
             }

branches/0.10/lib/Doctrine/Migration/Builder.php

@@ -141 +141 @@
         Doctrine::generateModelsFromDb($directory);
         
-        $result = $this->generateMigrationsFromModels($directory);
+        $result = $this->generateMigrationsFromModels($directory, Doctrine::MODEL_LOADING_CONSERVATIVE);
         
         Doctrine_Lib::removeDirectories($directory);
@@ -154 +154 @@
      * @return void
      */
-    public function generateMigrationsFromModels($modelsPath = null)
+    public function generateMigrationsFromModels($modelsPath = null, $modelLoading = null)
     {
         if ($modelsPath !== null) {
-            $models = Doctrine::filterInvalidModels(Doctrine::loadModels($modelsPath));
+            $models = Doctrine::filterInvalidModels(Doctrine::loadModels($modelsPath, $modelLoading));
         } else {
             $models = Doctrine::getLoadedModels();