php-phpunit-PHPUnit: 4.2.0

1 files changed, 13 insertions, 20 deletions

diff --git a/Autoload.php.in b/Autoload.php.in
index 5077fd4..5b6b946 100644
--- a/Autoload.php.in
+++ b/Autoload.php.in
@@ -14,6 +14,19 @@ require_once 'SebastianBergmann/Exporter/autoload.php';
 require_once 'SebastianBergmann/Version/autoload.php';
 require_once 'SebastianBergmann/Comparator/autoload.php';
 
+$vendorDir = '/usr/share/php';
+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+
+$loader = new UniversalClassLoader();
+$loader->registerNamespaces(array(
+    'Symfony\\Component\\Yaml'            => $vendorDir,
+    'Symfony\\Component\\ClassLoader'     => $vendorDir,
+    'LazyMap'                             => $vendorDir,
+    'Instantiator'                        => $vendorDir,
+));
+$loader->register();
+
 spl_autoload_register(
   function ($class)
   {
@@ -36,26 +49,6 @@ spl_autoload_register(
   }
 );
 
-// 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;
-          }
-      }
-  }
-);
-
 /* Optional */
 
 if (stream_resolve_include_path('PHPUnit/Extensions/Database/Autoload.php')) {