summaryrefslogtreecommitdiffstats
path: root/php-symfony2-DependencyInjection-tests-bootstrap.patch
blob: 03be72e827899bf4d8935a6fe8241fb9b7cd7158 (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/DependencyInjection/Tests/bootstrap.php	2012-09-20 03:42:08.000000000 -0400
+++ Symfony/Component/DependencyInjection/Tests/bootstrap.php	2012-10-20 22:38:53.782073532 -0400
@@ -10,9 +10,18 @@
  */
 
 spl_autoload_register(function ($class) {
-    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\DependencyInjection')) {
-        if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\DependencyInjection')).'.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
+            }
         }
     }
 });