Doctrine

Timestamp:

01/29/08 23:14:24 (17 months ago)

Author:

guilhermeblanco

Message:

Added changeset #3624 into 0.9 and 0.10 branches

Location:

branches

Files:

• 0.10/lib/Doctrine.php (modified) (5 diffs)
• 0.10/lib/Doctrine/Lib.php (modified) (1 diff)
• 0.10/lib/Doctrine/Task/Dql.php (modified) (1 diff)
• 0.9/lib/Doctrine.php (modified) (3 diffs)
• 0.9/lib/Doctrine/Lib.php (modified) (1 diff)
• 0.9/lib/Doctrine/Task/Dql.php (modified) (1 diff)

branches/0.10/lib/Doctrine.php

@@ -469 +469 @@
     private static $_loadedModelFiles = array();
 
+    private static $_pathModels = array();
+
     /**
      * _validators
@@ -488 +490 @@
     }
 
+    public static function getLoadedModelFiles()
+    {
+        return self::$_loadedModelFiles;
+    }
+    
+    public static function getPathModels()
+    {
+        return self::$_pathModels;
+    }
+
     /**
      * debug
@@ -529 +541 @@
     {
         $loadedModels = array();
-        
+
         if ($directory !== null) {
             $manager = Doctrine_Manager::getInstance();
-            
+
             foreach ((array) $directory as $dir) {
                 $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
@@ -539 +551 @@
                     $e = explode('.', $file->getFileName());
                     if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
-                        
+
                         if ($manager->getAttribute(Doctrine::ATTR_MODEL_LOADING) == Doctrine::MODEL_LOADING_CONSERVATIVE) {
                             self::$_loadedModelFiles[$e[0]] = $file->getPathName();
+                            self::$_pathModels[$file->getPathName()][$e[0]] = $e[0];
+
                             $loadedModels[] = $e[0];
                         } else {
                             $declaredBefore = get_declared_classes();
                             require_once($file->getPathName());
-                            
+
                             $declaredAfter = get_declared_classes();
                             // Using array_slice because array_diff is broken is some PHP versions
@@ -554 +568 @@
                                     if (self::isValidModelClass($className) && !in_array($className, $loadedModels)) {
                                         $loadedModels[] = $className;
+
+                                        self::$_pathModels[$file->getPathName()][$className] = $className;
                                     }
                                 }

branches/0.10/lib/Doctrine/Lib.php

@@ -397 +397 @@
     }
 
+    public static function copyDirectory($source, $dest)
+    {
+        // Simple copy for a file
+        if (is_file($source)) {
+            return copy($source, $dest);
+        }
+
+        // Make destination directory
+        if ( ! is_dir($dest)) {
+            mkdir($dest);
+        }
+
+        // Loop through the folder
+        $dir = dir($source);
+        while (false !== $entry = $dir->read()) {
+            // Skip pointers
+            if ($entry == '.' || $entry == '..') {
+                continue;
+            }
+
+            // Deep copy directories
+            if ($dest !== "$source/$entry") {
+                self::copyDirectory("$source/$entry", "$dest/$entry");
+            }
+        }
+
+        // Clean up
+        $dir->close();
+
+        return true;
+    }
+
     /**
      * isValidClassName

branches/0.10/lib/Doctrine/Task/Dql.php

@@ -50 +50 @@
         $results = $query->query($dql);
         
-        $this->printResults($results);
+        $this->_printResults($results);
     }
     
-    protected function printResults($data)
+    protected function _printResults($data)
     {
         $array = $data->toArray(true);

branches/0.9/lib/Doctrine.php

@@ -445 +445 @@
      */
     private static $_loadedModels = array();
-    
+
+    private static $_pathModels = array();
+
     /**
      * _validators
@@ -463 +465 @@
     {
         throw new Doctrine_Exception('Doctrine is static class. No instances can be created.');
+    }
+
+    public static function getLoadedModelFiles()
+    {
+        // [TODO] This method is just a wrapper of _loadedModels
+        // (which has named changed to _loadedModelFiles). The next task is
+        // to rename the _loadedModels to _loadedModelFiles inside Doctrine
+        return self::$_loadedModels;
+    }
+
+    public static function getPathModels()
+    {
+        return self::$_pathModels;
     }
 
@@ -516 +531 @@
                     if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
                         self::$_loadedModels[$e[0]] = $file->getPathName();
+                        self::$_pathModels[$file->getPathName()][$e[0]] = $e[0];
                     }
                 }

branches/0.9/lib/Doctrine/Lib.php

@@ -327 +327 @@
         return implode("\n",$r);
     }
+
+
+    // [TODO] Figure it out why this is necessary (was added in trunk and 0.10 branch)
+    // Please refer to Changeset #3624 where this piece of code was applied
+    public static function copyDirectory($source, $dest)
+    {
+        // Simple copy for a file
+        if (is_file($source)) {
+            return copy($source, $dest);
+        }
+
+        // Make destination directory
+        if ( ! is_dir($dest)) {
+            mkdir($dest);
+        }
+
+        // Loop through the folder
+        $dir = dir($source);
+        while (false !== $entry = $dir->read()) {
+            // Skip pointers
+            if ($entry == '.' || $entry == '..') {
+                continue;
+            }
+
+            // Deep copy directories
+            if ($dest !== "$source/$entry") {
+                self::copyDirectory("$source/$entry", "$dest/$entry");
+            }
+        }
+
+        // Clean up
+        $dir->close();
+
+        return true;
+    }
 }

branches/0.9/lib/Doctrine/Task/Dql.php

@@ -50 +50 @@
         $results = $query->query($dql);
         
-        $this->printResults($results);
+        $this->_printResults($results);
     }
     
-    protected function printResults($data)
+    protected function _printResults($data)
     {
         $array = $data->toArray(true);