summaryrefslogtreecommitdiffstats
path: root/php-symfony2-ClassLoader-tests-bootstrap.patch
blob: cf7f67c3a00e443c7b2a75f9cf9930a02fe9d8f0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
--- Symfony/Component/ClassLoader/Tests/bootstrap.php	2012-09-20 03:42:06.000000000 -0400
+++ Symfony/Component/ClassLoader/Tests/bootstrap.php	2012-10-20 21:56:18.505220891 -0400
@@ -10,9 +10,18 @@
  */
 
 spl_autoload_register(function ($class) {
-    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\ClassLoader')) {
-        if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\ClassLoader')).'.php')) {
-            require_once $file;
+    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) {
+        $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php';
+        if (file_exists(__DIR__.'/../..'.$file)) {
+            // Load from source tree
+            require_once __DIR__.'/../..'.$file;
+        } else {
+            try {
+                // Try loading from incude path
+                require_once 'Symfony/Component'.$file;
+            } catch (Exception $e) {
+                // Fail silently so class not found fatal error still raised
+            }
         }
     }
 });