Changeset 3456 for trunk/lib/Doctrine.php

Timestamp:

01/05/08 07:53:24 (12 months ago)

Author:

jwage

Message:

A few more fixes for autoloading and locating paths to Doctrine components.

Files:

• trunk/lib/Doctrine.php (modified) (2 diffs)

trunk/lib/Doctrine.php

@@ -1076 +1076 @@
         }
 
-        $findPattern = self::$_path . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, str_replace('Doctrine_', '', $className)) . '.php';
-
-        $matches = glob($findPattern);
-
-        if ( ! isset($matches[0])) {
-            return false;
-        }
-
-        $class = $matches[0];
+        $class = self::locate($className . '.php');
         
-        if (file_exists($class)) {
+        if ($class && file_exists($class)) {
             require $class;
 
@@ -1101 +1093 @@
 
         return false;
+    }
+    
+    public static function locate($name)
+    {
+        $findPattern = self::$_path . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, str_replace('Doctrine_', '', $name));
+
+        $matches = glob($findPattern);
+
+        if ( isset($matches[0])) {
+            return $matches[0];
+        } else {
+            return false;
+        }
     }