Doctrine

Timestamp:

01/22/08 22:08:08 (18 months ago)

Author:

jwage

Message:

Fixed compiler task and made Compiler return the path compiled file was written to.

Location:

trunk/lib/Doctrine

Files:

• Compiler.php (modified) (2 diffs)
• Task/Compile.php (modified) (1 diff)

trunk/lib/Doctrine/Compiler.php

@@ -40 +40 @@
      *
      * @throws Doctrine_Compiler_Exception      if something went wrong during the compile operation
-     * @return void
+     * @return $target Path the compiled file was written to
      */
     public static function compile($target = null, $includedDrivers = array())
@@ -134 +134 @@
         fwrite($fp, $stripped);
         fclose($fp);
+
+        return $target;
     }
 }

trunk/lib/Doctrine/Task/Compile.php

@@ -40 +40 @@
     public function execute()
     {
-        Doctrine::compile($this->getArgument('compiled_path'), $this->getArgument('drivers', array()));
-        
-        $this->notify('Compiled Doctrine successfully to: ' . $this->getArgument('compiled_path'));
+        $compiledPath = Doctrine_Compiler::compile($this->getArgument('compiled_path'), $this->getArgument('drivers', array()));
+
+        $this->notify('Compiled Doctrine successfully to: ' . $compiledPath);
     }
 }