Doctrine

Timestamp:

02/13/08 03:05:10 (17 months ago)

Author:

guilhermeblanco

Message:

Merged r3567 into 0.9 and 0.10 branches

Location:

branches

Files:

• 0.10/lib/Doctrine/Compiler.php (modified) (2 diffs)
• 0.10/lib/Doctrine/Task/Compile.php (modified) (1 diff)
• 0.9/lib/Doctrine/Compiler.php (modified) (2 diffs)
• 0.9/lib/Doctrine/Task/Compile.php (modified) (1 diff)

branches/0.10/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;
     }
 }

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

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

branches/0.9/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())
@@ -132 +132 @@
         fwrite($fp, $stripped);
         fclose($fp);
+
+        return $target;
     }
 }

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

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