From fb2a3bfde9415f80fab1ee07b553c4b42b935c78 Mon Sep 17 00:00:00 2001
From: pookey <pookey@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 3 Sep 2006 22:37:54 +0000
Subject: [PATCH] when using Doctrine::compile(), having the require_once()'s
 in the source files will break things. This is because the file hasn't been
 included, but the class has been defined in the compiled file.  This means
 you have to rely on autoload to allow compile to function (or strip out all
 require_once's from the code on compile, but atleast one needs to be
 maintained). IMPORTANT: you MUST now use autoload.

---
 Doctrine.php             | 7 ++++---
 Doctrine/Association.php | 1 -
 Doctrine/Connection.php  | 3 +--
 Doctrine/ForeignKey.php  | 1 -
 Doctrine/LocalKey.php    | 2 --
 Doctrine/Manager.php     | 3 +--
 Doctrine/Query.php       | 2 +-
 Doctrine/RawSql.php      | 2 +-
 Doctrine/Record.php      | 2 --
 Doctrine/Session.php     | 3 +--
 Doctrine/Statement.php   | 1 -
 Doctrine/Table.php       | 5 +----
 12 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/Doctrine.php b/Doctrine.php
index 61e77bf69..76d6d70f5 100644
--- a/Doctrine.php
+++ b/Doctrine.php
@@ -463,9 +463,10 @@ final class Doctrine {
         $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 { }"
+        fwrite($fp, "<?php".
+                    " class InvalidKeyException extends Exception { }".
+                    " class DQLException extends Exception { }".
+                    implode('', $ret)
               );
         fclose($fp);
 
diff --git a/Doctrine/Association.php b/Doctrine/Association.php
index 16581da70..70dcccf9e 100644
--- a/Doctrine/Association.php
+++ b/Doctrine/Association.php
@@ -1,5 +1,4 @@
 <?php
-require_once("Relation.php");
 /**
  * Doctrine_Association    this class takes care of association mapping
  *                         (= many-to-many relationships, where the relationship is handled with an additional relational table
diff --git a/Doctrine/Connection.php b/Doctrine/Connection.php
index 51d32b53a..a4f4dc3f5 100644
--- a/Doctrine/Connection.php
+++ b/Doctrine/Connection.php
@@ -18,8 +18,7 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
-require_once("Configurable.php");
-require_once("Record.php");
+
 /**
  * Doctrine_Connection
  *
diff --git a/Doctrine/ForeignKey.php b/Doctrine/ForeignKey.php
index 701d93885..45da235ae 100644
--- a/Doctrine/ForeignKey.php
+++ b/Doctrine/ForeignKey.php
@@ -1,5 +1,4 @@
 <?php
-require_once("Relation.php");
 /**
  * Foreign Key
  */
diff --git a/Doctrine/LocalKey.php b/Doctrine/LocalKey.php
index dc43566a8..6ddc0b15e 100644
--- a/Doctrine/LocalKey.php
+++ b/Doctrine/LocalKey.php
@@ -1,7 +1,5 @@
 <?php
-require_once("Relation.php");
 /**
  * Local Key
  */
 class Doctrine_LocalKey extends Doctrine_Relation { }
-?>
diff --git a/Doctrine/Manager.php b/Doctrine/Manager.php
index 535c08a96..73903fe98 100644
--- a/Doctrine/Manager.php
+++ b/Doctrine/Manager.php
@@ -18,8 +18,7 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
-require_once("Configurable.php");
-require_once("EventListener.php");
+
 /**
  * @package     Doctrine ORM
  * @url         www.phpdoctrine.com
diff --git a/Doctrine/Query.php b/Doctrine/Query.php
index c4e13514c..51650046c 100644
--- a/Doctrine/Query.php
+++ b/Doctrine/Query.php
@@ -18,7 +18,7 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
-require_once("Hydrate.php");
+
 /**
  * Doctrine_Query
  *
diff --git a/Doctrine/RawSql.php b/Doctrine/RawSql.php
index b3b6f414c..2eef471e3 100644
--- a/Doctrine/RawSql.php
+++ b/Doctrine/RawSql.php
@@ -18,7 +18,7 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
-require_once("Hydrate.php");
+
 /**
  * Doctrine_RawSql
  *
diff --git a/Doctrine/Record.php b/Doctrine/Record.php
index 5df4a8c25..f166a9120 100644
--- a/Doctrine/Record.php
+++ b/Doctrine/Record.php
@@ -19,8 +19,6 @@
  * <http://www.phpdoctrine.com>.
  */
 
-require_once("Access.php");
-
 /**
  * Doctrine_Record
  * All record classes should inherit this super class
diff --git a/Doctrine/Session.php b/Doctrine/Session.php
index 7062552d4..ebcc4b821 100644
--- a/Doctrine/Session.php
+++ b/Doctrine/Session.php
@@ -18,8 +18,7 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
-require_once("Configurable.php");
-require_once("Record.php");
+
 /**
  * Doctrine_Session
  *
diff --git a/Doctrine/Statement.php b/Doctrine/Statement.php
index 9e9379356..2a87a5a08 100644
--- a/Doctrine/Statement.php
+++ b/Doctrine/Statement.php
@@ -1,5 +1,4 @@
 <?php
-require_once("Access.php");
 /**
  * Doctrine_Statement
  *
diff --git a/Doctrine/Table.php b/Doctrine/Table.php
index 4a1f71af4..94cd5c03e 100644
--- a/Doctrine/Table.php
+++ b/Doctrine/Table.php
@@ -18,10 +18,7 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
-require_once("Exception/Find.class.php");
-require_once("Exception/Mapping.class.php");
-require_once("Exception/PrimaryKey.class.php");
-require_once("Configurable.php");
+
 /**
  * Doctrine_Table   represents a database table
  *                  each Doctrine_Table holds the information of foreignKeys and associations