Doctrine

Timestamp:

03/08/08 05:33:22 (16 months ago)

Author:

jwage

Message:

fixes #814

Files:

• branches/0.10/lib/Doctrine/Cli.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Cli.php

@@ -287 +287 @@
         $tasks = array();
         
-        foreach ((array) $directory as $dir) {
-            $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
-                                                    RecursiveIteratorIterator::LEAVES_ONLY);
-
-            foreach ($it as $file) {
-                $e = explode('.', $file->getFileName());
-                if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
+        if (is_dir($directory)) {
+            foreach ((array) $directory as $dir) {
+                $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
+                                                        RecursiveIteratorIterator::LEAVES_ONLY);
+
+                foreach ($it as $file) {
+                    $e = explode('.', $file->getFileName());
+                    if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
                     
-                    $className = 'Doctrine_Task_' . $e[0];
+                        $className = 'Doctrine_Task_' . $e[0];
                     
-                    if ( ! class_exists($className)) {
-                        require_once($file->getPathName());
+                        if ( ! class_exists($className)) {
+                            require_once($file->getPathName());
                     
-                        $class = new ReflectionClass($className);
+                            $class = new ReflectionClass($className);
                     
-                        if ($class->isSubClassOf($parent)) {
-                            $tasks[$e[0]] = $e[0];
+                            if ($class->isSubClassOf($parent)) {
+                                $tasks[$e[0]] = $e[0];
+                            }
                         }
                     }
@@ -309 +311 @@
             }
         }
-        
+
+        $classes = get_declared_classes();
+        foreach ($classes as $className) {
+            $class = new Reflectionclass($className);
+            if ($class->isSubClassOf($parent)) {
+                $task = str_replace('Doctrine_Task_', '', $className);
+                $tasks[$task] = $task;
+            }
+        }
+
         $this->_tasks = array_merge($this->_tasks, $tasks);