Merge branch '3.7'

sebastianbergmann · Mar 19, 2013 · 6df0e3d · 6df0e3d
2 parents 940a463 + a09a260
commit 6df0e3d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 38 deletions.
diff --git a/PHPUnit/Autoload.php b/PHPUnit/Autoload.php
@@ -215,28 +215,25 @@ function ($class)
   }
 );
 
-if (stream_resolve_include_path('Symfony/Component/Yaml/autoloader.php')) {
-    require_once 'Symfony/Component/Yaml/autoloader.php';
-} else {
-    spl_autoload_register(
-      function ($class) {
-          if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
-              $file = sprintf(
-                'Symfony/Component/Yaml%s.php',
+// Symfony Yaml autoloader
+spl_autoload_register(
+  function ($class) {
+      if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
+          $file = sprintf(
+            'Symfony/Component/Yaml%s.php',
 
-                substr(
-                  str_replace('\\', '/', $class),
-                  strlen('Symfony\Component\Yaml')
-                )
-              );
+            substr(
+              str_replace('\\', '/', $class),
+              strlen('Symfony\Component\Yaml')
+            )
+          );
 
-              if (stream_resolve_include_path($file)) {
-                  require_once $file;
-              }
+          if (stream_resolve_include_path($file)) {
+              require_once $file;
           }
       }
-    );
-}
+  }
+);
 
 if (stream_resolve_include_path('PHP/Invoker/Autoload.php')) {
     require_once 'PHP/Invoker/Autoload.php';

diff --git a/PHPUnit/Autoload.php.in b/PHPUnit/Autoload.php.in
@@ -92,28 +92,25 @@ spl_autoload_register(
   }
 );
 
-if (stream_resolve_include_path('Symfony/Component/Yaml/autoloader.php')) {
-    require_once 'Symfony/Component/Yaml/autoloader.php';
-} else {
-    spl_autoload_register(
-      function ($class) {
-          if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
-              $file = sprintf(
-                'Symfony/Component/Yaml%s.php',
-
-                substr(
-                  str_replace('\\', '/', $class),
-                  strlen('Symfony\Component\Yaml')
-                )
-              );
-
-              if (stream_resolve_include_path($file)) {
-                  require_once $file;
-              }
+// Symfony Yaml autoloader
+spl_autoload_register(
+  function ($class) {
+      if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
+          $file = sprintf(
+            'Symfony/Component/Yaml%s.php',
+
+            substr(
+              str_replace('\\', '/', $class),
+              strlen('Symfony\Component\Yaml')
+            )
+          );
+
+          if (stream_resolve_include_path($file)) {
+              require_once $file;
           }
       }
-    );
-}
+  }
+);
 
 if (stream_resolve_include_path('PHP/Invoker/Autoload.php')) {
     require_once 'PHP/Invoker/Autoload.php';