From ae534f69ffee64c844e3e2470e08acfa82ee75d5 Mon Sep 17 00:00:00 2001
From: pookey <pookey@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 3 Sep 2006 21:32:56 +0000
Subject: [PATCH] minor changes to Doctrine::compile(), adding extra error
 handling and improving docs

---
 Doctrine.php                                | 32 ++++++++++++---------
 manual/docs/Getting started - Compiling.php |  8 ++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Doctrine.php b/Doctrine.php
index 75ed25811..61e77bf69 100644
--- a/Doctrine.php
+++ b/Doctrine.php
@@ -386,7 +386,6 @@ final class Doctrine {
     }
     /**
      * method for making a single file of most used doctrine runtime components
-     *
      * including the compiled file instead of multiple files (in worst
      * cases dozens of files) can improve performance by an order of magnitude
      *
@@ -449,28 +448,35 @@ final class Doctrine {
             $end   = $refl -> getEndLine();
 
             $ret = array_merge($ret,
-			         array_slice($lines,
-						$start,
-						($end - $start)));
-
+                               array_slice($lines,
+                               $start,
+                              ($end - $start)));
 
         }
 
         $file = self::$path.DIRECTORY_SEPARATOR.'Doctrine.compiled.php';
+        if (!is_writable($file))
+            throw new Doctrine_Exception("Couldn't write compiled data. $file is not writable");
 
-        $fp = fopen($file, 'w+');
-        fwrite($fp, "<?php
-".implode('', $ret)."
-class InvalidKeyException extends Exception { }
-class DQLException extends Exception { }
-?>");
+        // first write the 'compiled' data to a text file, so
+        // that we can use php_strip_whitespace (which only works on files)
+        $fp = fopen($file, 'w');
+        if ($fp === false)
+            throw new Doctrine_Exception("Couldn't write compiled data. Failed to open $file");
+        fwrite($fp, "<?php ".implode('', $ret).
+                    "\nclass InvalidKeyException extends Exception { }".
+                    "\nclass DQLException extends Exception { }"
+              );
         fclose($fp);
-        $stripped = php_strip_whitespace( $file );
 
-        $fp = fopen($file, 'w+');
+        $stripped = php_strip_whitespace( $file );
+        $fp = fopen($file, 'w');
+        if ($fp === false)
+            throw new Doctrine_Exception("Couldn't write compiled data. Failed to open $file");
         fwrite($fp, $stripped);
         fclose($fp);
     }
+
     /**
      * simple autoload function
      * returns true if the class was loaded, otherwise false
diff --git a/manual/docs/Getting started - Compiling.php b/manual/docs/Getting started - Compiling.php
index e69de29bb..6eb50663a 100644
--- a/manual/docs/Getting started - Compiling.php	
+++ b/manual/docs/Getting started - Compiling.php	
@@ -0,0 +1,8 @@
+<p>
+  Compiling is a method for making a single file of most used doctrine runtime components
+  including the compiled file instead of multiple files (in worst cases dozens of files)
+  can improve performance by an order of magnitude.
+</p>
+<p>
+  In cases where this might fail, a Doctrine_Exception is throw detailing the error.
+</p>