Merge branch '2.7' into 2.8

* 2.7:
  [Process] Fix stopping a process on Windows
  Added a test case for the Logger class.
  CS: general fixes

ApcClassLoader.php

@@ -57,16 +57,18 @@ class ApcClassLoader
     protected $decorated;
 
     /**
-     * @param string $prefix    The APC namespace prefix to use
-     * @param object $decorated A class loader object that implements the findFile() method
+     * Constructor.
+     *
+     * @param string $prefix    The APC namespace prefix to use.
+     * @param object $decorated A class loader object that implements the findFile() method.
      *
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      */
     public function __construct($prefix, $decorated)
     {
-        if (!function_exists('apcu_fetch')) {
-            throw new \RuntimeException('Unable to use ApcClassLoader as APC is not installed.');
+        if (!extension_loaded('apc')) {
+            throw new \RuntimeException('Unable to use ApcClassLoader as APC is not enabled.');
         }
 
         if (!method_exists($decorated, 'findFile')) {
@@ -120,10 +122,8 @@ class ApcClassLoader
      */
     public function findFile($class)
     {
-        $file = apcu_fetch($this->prefix.$class, $success);
-
-        if (!$success) {
-            apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null);
+        if (false === $file = apc_fetch($this->prefix.$class)) {
+            apc_store($this->prefix.$class, $file = $this->decorated->findFile($class));
         }
 
         return $file;

ApcUniversalClassLoader.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-@trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
@@ -68,13 +68,15 @@ class ApcUniversalClassLoader extends UniversalClassLoader
     private $prefix;
 
     /**
+     * Constructor.
+     *
      * @param string $prefix A prefix to create a namespace in APC
      *
      * @throws \RuntimeException
      */
     public function __construct($prefix)
     {
-        if (!function_exists('apcu_fetch')) {
+        if (!extension_loaded('apc')) {
             throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.');
         }
 
@@ -90,10 +92,8 @@ class ApcUniversalClassLoader extends UniversalClassLoader
      */
     public function findFile($class)
     {
-        $file = apcu_fetch($this->prefix.$class, $success);
-
-        if (!$success) {
-            apcu_store($this->prefix.$class, $file = parent::findFile($class) ?: null);
+        if (false === $file = apc_fetch($this->prefix.$class)) {
+            apc_store($this->prefix.$class, $file = parent::findFile($class));
         }
 
         return $file;

ClassCollectionLoader.php

@@ -43,12 +43,12 @@ class ClassCollectionLoader
 
         self::$loaded[$name] = true;
 
-        if ($adaptive) {
-            $declared = array_merge(get_declared_classes(), get_declared_interfaces());
-            if (function_exists('get_declared_traits')) {
-                $declared = array_merge($declared, get_declared_traits());
-            }
+        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+        if (function_exists('get_declared_traits')) {
+            $declared = array_merge($declared, get_declared_traits());
+        }
 
+        if ($adaptive) {
             // don't include already declared classes
             $classes = array_diff($classes, $declared);
 
@@ -58,11 +58,6 @@ class ClassCollectionLoader
 
         $classes = array_unique($classes);
 
-        // cache the core classes
-        if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-            throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
-        }
-        $cacheDir = rtrim(realpath($cacheDir) ?: $cacheDir, '/'.DIRECTORY_SEPARATOR);
         $cache = $cacheDir.'/'.$name.$extension;
 
         // auto-reload
@@ -92,29 +87,12 @@ class ClassCollectionLoader
             }
         }
 
-        if (!$reload && file_exists($cache)) {
+        if (!$reload && is_file($cache)) {
             require_once $cache;
 
             return;
         }
-        if (!$adaptive) {
-            $declared = array_merge(get_declared_classes(), get_declared_interfaces());
-            if (function_exists('get_declared_traits')) {
-                $declared = array_merge($declared, get_declared_traits());
-            }
-        }
 
-        $spacesRegex = '(?:\s*+(?:(?:\#|//)[^\n]*+\n|/\*(?:(?<!\*/).)++)?+)*+';
-        $dontInlineRegex = <<<REGEX
-            '(?:
-               ^<\?php\s.declare.\(.strict_types.=.1.\).;
-               | \b__halt_compiler.\(.\)
-               | \b__(?:DIR|FILE)__\b
-            )'isx
-REGEX;
-        $dontInlineRegex = str_replace('.', $spacesRegex, $dontInlineRegex);
-
-        $cacheDir = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $cacheDir));
         $files = array();
         $content = '';
         foreach (self::getOrderedClasses($classes) as $class) {
@@ -122,40 +100,25 @@ REGEX;
                 continue;
             }
 
-            $files[] = $file = $class->getFileName();
-            $c = file_get_contents($file);
+            $files[] = $class->getFileName();
 
-            if (preg_match($dontInlineRegex, $c)) {
-                $file = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $file));
+            $c = preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', file_get_contents($class->getFileName()));
 
-                for ($i = 0; isset($file[$i], $cacheDir[$i]); ++$i) {
-                    if ($file[$i] !== $cacheDir[$i]) {
-                        break;
-                    }
-                }
-                if (1 >= $i) {
-                    $file = var_export(implode('/', $file), true);
-                } else {
-                    $file = array_slice($file, $i);
-                    $file = str_repeat('../', count($cacheDir) - $i).implode('/', $file);
-                    $file = '__DIR__.'.var_export('/'.$file, true);
-                }
-
-                $c = "\nnamespace {require $file;}";
-            } else {
-                $c = preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', $c);
-
-                // fakes namespace declaration for global code
-                if (!$class->inNamespace()) {
-                    $c = "\nnamespace\n{\n".$c."\n}\n";
-                }
-
-                $c = self::fixNamespaceDeclarations('<?php '.$c);
-                $c = preg_replace('/^\s*<\?php/', '', $c);
+            // fakes namespace declaration for global code
+            if (!$class->inNamespace()) {
+                $c = "\nnamespace\n{\n".$c."\n}\n";
             }
 
+            $c = self::fixNamespaceDeclarations('<?php '.$c);
+            $c = preg_replace('/^\s*<\?php/', '', $c);
+
             $content .= $c;
         }
+
+        // cache the core classes
+        if (!is_dir(dirname($cache))) {
+            mkdir(dirname($cache), 0777, true);
+        }
         self::writeCacheFile($cache, '<?php '.$content);
 
         if ($autoReload) {
@@ -186,9 +149,8 @@ REGEX;
         $inNamespace = false;
         $tokens = token_get_all($source);
 
-        for ($i = 0; isset($tokens[$i]); ++$i) {
-            $token = $tokens[$i];
-            if (!isset($token[1]) || 'b"' === $token) {
+        for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
+            if (is_string($token)) {
                 $rawChunk .= $token;
             } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
                 // strip comments
@@ -200,12 +162,12 @@ REGEX;
                 $rawChunk .= $token[1];
 
                 // namespace name and whitespaces
-                while (isset($tokens[++$i][1]) && in_array($tokens[$i][0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
-                    $rawChunk .= $tokens[$i][1];
+                while (($t = next($tokens)) && is_array($t) && in_array($t[0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
+                    $rawChunk .= $t[1];
                 }
-                if ('{' === $tokens[$i]) {
+                if ('{' === $t) {
                     $inNamespace = false;
-                    --$i;
+                    prev($tokens);
                 } else {
                     $rawChunk = rtrim($rawChunk)."\n{";
                     $inNamespace = true;
@@ -213,9 +175,9 @@ REGEX;
             } elseif (T_START_HEREDOC === $token[0]) {
                 $output .= self::compressCode($rawChunk).$token[1];
                 do {
-                    $token = $tokens[++$i];
-                    $output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
-                } while (T_END_HEREDOC !== $token[0]);
+                    $token = next($tokens);
+                    $output .= is_string($token) ? $token : $token[1];
+                } while ($token[0] !== T_END_HEREDOC);
                 $output .= "\n";
                 $rawChunk = '';
             } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
@@ -230,15 +192,7 @@ REGEX;
             $rawChunk .= "}\n";
         }
 
-        $output .= self::compressCode($rawChunk);
-
-        if (\PHP_VERSION_ID >= 70000) {
-            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
-            unset($tokens, $rawChunk);
-            gc_mem_caches();
-        }
-
-        return $output;
+        return $output.self::compressCode($rawChunk);
     }
 
     /**
@@ -275,13 +229,7 @@ REGEX;
      */
     private static function writeCacheFile($file, $content)
     {
-        $dir = dirname($file);
-        if (!is_writable($dir)) {
-            throw new \RuntimeException(sprintf('Cache directory "%s" is not writable.', $dir));
-        }
-
-        $tmpFile = tempnam($dir, basename($file));
-
+        $tmpFile = tempnam(dirname($file), basename($file));
         if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
             @chmod($file, 0666 & ~umask());
 
@@ -294,6 +242,8 @@ REGEX;
     /**
      * Gets an ordered array of passed classes including all their dependencies.
      *
+     * @param array $classes
+     *
      * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed)
      *
      * @throws \InvalidArgumentException When a class can't be loaded

ClassMapGenerator.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\ClassLoader;
 
 if (!defined('SYMFONY_TRAIT')) {
-    if (\PHP_VERSION_ID >= 50400) {
+    if (PHP_VERSION_ID >= 50400) {
         define('SYMFONY_TRAIT', T_TRAIT);
     } else {
         define('SYMFONY_TRAIT', 0);
@@ -64,19 +64,14 @@ class ClassMapGenerator
                 continue;
             }
 
-            $path = $file->getRealPath() ?: $file->getPathname();
+            $path = $file->getRealPath();
 
-            if ('php' !== pathinfo($path, PATHINFO_EXTENSION)) {
+            if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
                 continue;
             }
 
             $classes = self::findClasses($path);
 
-            if (\PHP_VERSION_ID >= 70000) {
-                // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
-                gc_mem_caches();
-            }
-
             foreach ($classes as $class) {
                 $map[$class] = $path;
             }
@@ -100,10 +95,10 @@ class ClassMapGenerator
         $classes = array();
 
         $namespace = '';
-        for ($i = 0; isset($tokens[$i]); ++$i) {
+        for ($i = 0, $max = count($tokens); $i < $max; ++$i) {
             $token = $tokens[$i];
 
-            if (!isset($token[1])) {
+            if (is_string($token)) {
                 continue;
             }
 
@@ -113,9 +108,9 @@ class ClassMapGenerator
                 case T_NAMESPACE:
                     $namespace = '';
                     // If there is a namespace, extract it
-                    while (isset($tokens[++$i][1])) {
-                        if (in_array($tokens[$i][0], array(T_STRING, T_NS_SEPARATOR))) {
-                            $namespace .= $tokens[$i][1];
+                    while (($t = $tokens[++$i]) && is_array($t)) {
+                        if (in_array($t[0], array(T_STRING, T_NS_SEPARATOR))) {
+                            $namespace .= $t[1];
                         }
                     }
                     $namespace .= '\\';
@@ -126,7 +121,7 @@ class ClassMapGenerator
                     // Skip usage of ::class constant
                     $isClassConstant = false;
                     for ($j = $i - 1; $j > 0; --$j) {
-                        if (!isset($tokens[$j][1])) {
+                        if (is_string($tokens[$j])) {
                             break;
                         }
 
@@ -139,15 +134,14 @@ class ClassMapGenerator
                     }
 
                     if ($isClassConstant) {
-                        break;
+                        continue;
                     }
 
                     // Find the classname
-                    while (isset($tokens[++$i][1])) {
-                        $t = $tokens[$i];
+                    while (($t = $tokens[++$i]) && is_array($t)) {
                         if (T_STRING === $t[0]) {
                             $class .= $t[1];
-                        } elseif ('' !== $class && T_WHITESPACE === $t[0]) {
+                        } elseif ($class !== '' && T_WHITESPACE == $t[0]) {
                             break;
                         }
                     }

DebugClassLoader.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-@trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since Symfony 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * Autoloader checking if the class is really defined in the file found.
@@ -31,6 +31,8 @@ class DebugClassLoader
     private $classFinder;
 
     /**
+     * Constructor.
+     *
      * @param object $classFinder
      */
     public function __construct($classFinder)
@@ -87,7 +89,7 @@ class DebugClassLoader
      */
     public function findFile($class)
     {
-        return $this->classFinder->findFile($class) ?: null;
+        return $this->classFinder->findFile($class);
     }
 
     /**

DebugUniversalClassLoader.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-@trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since Symfony 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * Checks that the class is actually declared in the included file.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MapClassLoader.php

@@ -21,6 +21,8 @@ class MapClassLoader
     private $map = array();
 
     /**
+     * Constructor.
+     *
      * @param array $map A map where keys are classes and values the absolute file path
      */
     public function __construct(array $map)

Psr4ClassLoader.php

@@ -20,6 +20,9 @@ namespace Symfony\Component\ClassLoader;
  */
 class Psr4ClassLoader
 {
+    /**
+     * @var array
+     */
     private $prefixes = array();
 
     /**

README.md

@@ -1,14 +1,85 @@
 ClassLoader Component
 =====================
 
-The ClassLoader component provides tools to autoload your classes and cache
-their locations for performance.
+ClassLoader loads your project classes automatically if they follow some
+standard PHP conventions.
+
+The ClassLoader object is able to autoload classes that implement the PSR-0
+standard or the PEAR naming convention.
+
+First, register the autoloader:
+
+```php
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
+
+use Symfony\Component\ClassLoader\ClassLoader;
+
+$loader = new ClassLoader();
+$loader->register();
+```
+
+Then, register some namespaces with the `addPrefix()` method:
+
+```php
+$loader->addPrefix('Symfony', __DIR__.'/src');
+$loader->addPrefix('Monolog', __DIR__.'/vendor/monolog/src');
+```
+
+The `addPrefix()` method takes a namespace prefix and a path where to
+look for the classes as arguments.
+
+You can also register a sub-namespaces:
+
+```php
+$loader->addPrefix('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
+```
+
+The order of registration is significant and the first registered namespace
+takes precedence over later registered one.
+
+You can also register more than one path for a given namespace:
+
+```php
+$loader->addPrefix('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
+```
+
+Alternatively, you can use the `addPrefixes()` method to register more
+than one namespace at once:
+
+```php
+$loader->addPrefixes(array(
+    'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'),
+    'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
+    'Doctrine' => __DIR__.'/vendor/doctrine/lib',
+    'Monolog' => __DIR__.'/vendor/monolog/src',
+));
+```
+
+For better performance, you can use the APC class loader:
+
+```php
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
+
+use Symfony\Component\ClassLoader\ClassLoader;
+use Symfony\Component\ClassLoader\ApcClassLoader;
+
+$loader = new ClassLoader();
+$loader->addPrefix('Symfony', __DIR__.'/src');
+
+$loader = new ApcClassLoader('apc.prefix.', $loader);
+$loader->register();
+```
+
+Furthermore, the component provides tools to aggregate classes into a single
+file, which is especially useful to improve performance on servers that do not
+provide byte caches.
 
 Resources
 ---------
 
-  * [Documentation](https://symfony.com/doc/current/components/class_loader/index.html)
-  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
-  * [Report issues](https://github.com/symfony/symfony/issues) and
-    [send Pull Requests](https://github.com/symfony/symfony/pulls)
-    in the [main Symfony repository](https://github.com/symfony/symfony)
+You can run the unit tests with the following command:
+
+    $ cd path/to/Symfony/Component/ClassLoader/
+    $ composer install
+    $ phpunit

Tests/ApcClassLoaderTest.php

@@ -11,25 +11,27 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ApcClassLoader;
 use Symfony\Component\ClassLoader\ClassLoader;
 
-class ApcClassLoaderTest extends TestCase
+/**
+ * @requires extension apc
+ */
+class ApcClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {
-            $this->markTestSkipped('The apc extension is not enabled.');
+        if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
+            apc_clear_cache('user');
         } else {
-            apcu_clear_cache();
+            $this->markTestSkipped('APC is not enabled.');
         }
     }
 
     protected function tearDown()
     {
         if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
-            apcu_clear_cache();
+            apc_clear_cache('user');
         }
     }
 
@@ -40,7 +42,7 @@ class ApcClassLoaderTest extends TestCase
 
         $loader = new ApcClassLoader('test.prefix.', $loader);
 
-        $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apcu_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
+        $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apc_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
     }
 
     /**

Tests/ClassCollectionLoaderTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassCollectionLoader;
 
 require_once __DIR__.'/Fixtures/ClassesWithParents/GInterface.php';
@@ -19,7 +18,7 @@ require_once __DIR__.'/Fixtures/ClassesWithParents/CInterface.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/B.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';
 
-class ClassCollectionLoaderTest extends TestCase
+class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @requires PHP 5.4
@@ -32,14 +31,14 @@ class ClassCollectionLoaderTest extends TestCase
         $m = $r->getMethod('getOrderedClasses');
         $m->setAccessible(true);
 
-        $ordered = $m->invoke(null, array('CTFoo'));
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', array('CTFoo'));
 
         $this->assertEquals(
             array('TD', 'TC', 'TB', 'TA', 'TZ', 'CTFoo'),
             array_map(function ($class) { return $class->getName(); }, $ordered)
         );
 
-        $ordered = $m->invoke(null, array('CTBar'));
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', array('CTBar'));
 
         $this->assertEquals(
             array('TD', 'TZ', 'TC', 'TB', 'TA', 'CTBar'),
@@ -63,7 +62,7 @@ class ClassCollectionLoaderTest extends TestCase
         $m = $r->getMethod('getOrderedClasses');
         $m->setAccessible(true);
 
-        $ordered = $m->invoke(null, $classes);
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
 
         $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
     }
@@ -121,7 +120,7 @@ class ClassCollectionLoaderTest extends TestCase
         $m = $r->getMethod('getOrderedClasses');
         $m->setAccessible(true);
 
-        $ordered = $m->invoke(null, $classes);
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
 
         $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
     }
@@ -163,7 +162,7 @@ class ClassCollectionLoaderTest extends TestCase
         $m = $r->getMethod('getOrderedClasses');
         $m->setAccessible(true);
 
-        $ordered = $m->invoke(null, $classes);
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
 
         $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
     }
@@ -224,46 +223,44 @@ class ClassCollectionLoaderTest extends TestCase
 
     public function testCommentStripping()
     {
-        if (is_file($file = __DIR__.'/bar.php')) {
+        if (is_file($file = sys_get_temp_dir().'/bar.php')) {
             unlink($file);
         }
         spl_autoload_register($r = function ($class) {
             if (0 === strpos($class, 'Namespaced') || 0 === strpos($class, 'Pearlike_')) {
-                @require_once __DIR__.'/Fixtures/'.str_replace(array('\\', '_'), '/', $class).'.php';
+                require_once __DIR__.'/Fixtures/'.str_replace(array('\\', '_'), '/', $class).'.php';
             }
         });
 
-        $strictTypes = defined('HHVM_VERSION') ? '' : "\nnamespace {require __DIR__.'/Fixtures/Namespaced/WithStrictTypes.php';}";
-
         ClassCollectionLoader::load(
-            array('Namespaced\\WithComments', 'Pearlike_WithComments', 'Namespaced\\WithDirMagic', 'Namespaced\\WithFileMagic', 'Namespaced\\WithHaltCompiler', $strictTypes ? 'Namespaced\\WithStrictTypes' : 'Namespaced\\WithComments'),
-            __DIR__,
+            array('Namespaced\\WithComments', 'Pearlike_WithComments'),
+            sys_get_temp_dir(),
             'bar',
             false
         );
 
         spl_autoload_unregister($r);
 
-        $this->assertEquals(<<<'EOF'
+        $this->assertEquals(<<<EOF
 namespace Namespaced
 {
 class WithComments
 {
-public static $loaded = true;
+public static \$loaded = true;
 }
-$string ='string should not be   modified {$string}';
-$heredoc = (<<<HD
+\$string ='string should not be   modified {\$string}';
+\$heredoc = (<<<HD
 
 
-Heredoc should not be   modified {$string}
+Heredoc should not be   modified {\$string}
 
 
 HD
 );
-$nowdoc =<<<'ND'
+\$nowdoc =<<<'ND'
 
 
-Nowdoc should not be   modified {$string}
+Nowdoc should not be   modified {\$string}
 
 
 ND
@@ -273,16 +270,11 @@ namespace
 {
 class Pearlike_WithComments
 {
-public static $loaded = true;
+public static \$loaded = true;
 }
 }
-namespace {require __DIR__.'/Fixtures/Namespaced/WithDirMagic.php';}
-namespace {require __DIR__.'/Fixtures/Namespaced/WithFileMagic.php';}
-namespace {require __DIR__.'/Fixtures/Namespaced/WithHaltCompiler.php';}
 EOF
-            .$strictTypes,
-            str_replace(array("<?php \n", '\\\\'), array('', '/'), file_get_contents($file))
-        );
+        , str_replace("<?php \n", '', file_get_contents($file)));
 
         unlink($file);
     }

Tests/ClassLoaderTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassLoader;
 
-class ClassLoaderTest extends TestCase
+class ClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetPrefixes()
     {

Tests/ClassMapGeneratorTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 
-class ClassMapGeneratorTest extends TestCase
+class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var string|null
@@ -23,7 +22,7 @@ class ClassMapGeneratorTest extends TestCase
 
     public function prepare_workspace()
     {
-        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
+        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
     }
@@ -77,11 +76,8 @@ class ClassMapGeneratorTest extends TestCase
                 'Namespaced\\Foo' => realpath(__DIR__).'/Fixtures/Namespaced/Foo.php',
                 'Namespaced\\Baz' => realpath(__DIR__).'/Fixtures/Namespaced/Baz.php',
                 'Namespaced\\WithComments' => realpath(__DIR__).'/Fixtures/Namespaced/WithComments.php',
-                'Namespaced\\WithStrictTypes' => realpath(__DIR__).'/Fixtures/Namespaced/WithStrictTypes.php',
-                'Namespaced\\WithHaltCompiler' => realpath(__DIR__).'/Fixtures/Namespaced/WithHaltCompiler.php',
-                'Namespaced\\WithDirMagic' => realpath(__DIR__).'/Fixtures/Namespaced/WithDirMagic.php',
-                'Namespaced\\WithFileMagic' => realpath(__DIR__).'/Fixtures/Namespaced/WithFileMagic.php',
-            )),
+                ),
+            ),
             array(__DIR__.'/Fixtures/beta/NamespaceCollision', array(
                 'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
                 'NamespaceCollision\\A\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Foo.php',
@@ -108,7 +104,7 @@ class ClassMapGeneratorTest extends TestCase
             )),
         );
 
-        if (\PHP_VERSION_ID >= 50400) {
+        if (PHP_VERSION_ID >= 50400) {
             $data[] = array(__DIR__.'/Fixtures/php5.4', array(
                 'TFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
                 'CFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
@@ -119,7 +115,7 @@ class ClassMapGeneratorTest extends TestCase
             ));
         }
 
-        if (\PHP_VERSION_ID >= 50500) {
+        if (PHP_VERSION_ID >= 50500) {
             $data[] = array(__DIR__.'/Fixtures/php5.5', array(
                 'ClassCons\\Foo' => __DIR__.'/Fixtures/php5.5/class_cons.php',
             ));

Tests/Fixtures/Namespaced/WithDirMagic.php

@@ -1,15 +0,0 @@
-<?php
-
-/*
- * foo
- */
-
-namespace Namespaced;
-
-class WithDirMagic
-{
-    public function getDir()
-    {
-        return __DIR__;
-    }
-}

Tests/Fixtures/Namespaced/WithFileMagic.php

@@ -1,15 +0,0 @@
-<?php
-
-/*
- * foo
- */
-
-namespace Namespaced;
-
-class WithFileMagic
-{
-    public function getFile()
-    {
-        return __FILE__;
-    }
-}

Tests/Fixtures/Namespaced/WithHaltCompiler.php

@@ -1,18 +0,0 @@
-<?php
-
-/*
- * foo
- */
-
-namespace Namespaced;
-
-class WithHaltCompiler
-{
-}
-
-// the end of the script execution
-__halt_compiler(); data
-data
-data
-data
-...

Tests/Fixtures/Namespaced/WithStrictTypes.php

@@ -1,13 +0,0 @@
-<?php
-
-/*
- * foo
- */
-
-declare(strict_types=1);
-
-namespace Namespaced;
-
-class WithStrictTypes
-{
-}

Tests/LegacyApcUniversalClassLoaderTest.php

@@ -11,18 +11,18 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
 /**
  * @group legacy
+ * @requires extension apc
  */
-class LegacyApcUniversalClassLoaderTest extends TestCase
+class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
         if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
-            apcu_clear_cache();
+            apc_clear_cache('user');
         } else {
             $this->markTestSkipped('APC is not enabled.');
         }
@@ -31,7 +31,7 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
     protected function tearDown()
     {
         if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
-            apcu_clear_cache();
+            apc_clear_cache('user');
         }
     }
 
@@ -40,20 +40,20 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
         $loader = new ApcUniversalClassLoader('test.prefix.');
         $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
 
-        $this->assertEquals($loader->findFile('\LegacyApc\Namespaced\FooBar'), apcu_fetch('test.prefix.\LegacyApc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
+        $this->assertEquals($loader->findFile('\LegacyApc\Namespaced\FooBar'), apc_fetch('test.prefix.\LegacyApc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
     }
 
-    /**
-     * @dataProvider getLoadClassTests
-     */
-    public function testLoadClass($className, $testClassName, $message)
-    {
-        $loader = new ApcUniversalClassLoader('test.prefix.');
-        $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
-        $loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
-        $loader->loadClass($testClassName);
-        $this->assertTrue(class_exists($className), $message);
-    }
+   /**
+    * @dataProvider getLoadClassTests
+    */
+   public function testLoadClass($className, $testClassName, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.');
+       $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->loadClass($testClassName);
+       $this->assertTrue(class_exists($className), $message);
+   }
 
     public function getLoadClassTests()
     {
@@ -63,19 +63,19 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
        );
     }
 
-    /**
-     * @dataProvider getLoadClassFromFallbackTests
-     */
-    public function testLoadClassFromFallback($className, $testClassName, $message)
-    {
-        $loader = new ApcUniversalClassLoader('test.prefix.fallback');
-        $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
-        $loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
-        $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback'));
-        $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback'));
-        $loader->loadClass($testClassName);
-        $this->assertTrue(class_exists($className), $message);
-    }
+   /**
+    * @dataProvider getLoadClassFromFallbackTests
+    */
+   public function testLoadClassFromFallback($className, $testClassName, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.fallback');
+       $loader->registerNamespace('LegacyApc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->registerPrefix('LegacyApc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback'));
+       $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/LegacyApc/fallback'));
+       $loader->loadClass($testClassName);
+       $this->assertTrue(class_exists($className), $message);
+   }
 
     public function getLoadClassFromFallbackTests()
     {
@@ -87,18 +87,18 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
        );
     }
 
-    /**
-     * @dataProvider getLoadClassNamespaceCollisionTests
-     */
-    public function testLoadClassNamespaceCollision($namespaces, $className, $message)
-    {
-        $loader = new ApcUniversalClassLoader('test.prefix.collision.');
-        $loader->registerNamespaces($namespaces);
+   /**
+    * @dataProvider getLoadClassNamespaceCollisionTests
+    */
+   public function testLoadClassNamespaceCollision($namespaces, $className, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.collision.');
+       $loader->registerNamespaces($namespaces);
 
-        $loader->loadClass($className);
+       $loader->loadClass($className);
 
-        $this->assertTrue(class_exists($className), $message);
-    }
+       $this->assertTrue(class_exists($className), $message);
+   }
 
     public function getLoadClassNamespaceCollisionTests()
     {
@@ -138,17 +138,17 @@ class LegacyApcUniversalClassLoaderTest extends TestCase
        );
     }
 
-    /**
-     * @dataProvider getLoadClassPrefixCollisionTests
-     */
-    public function testLoadClassPrefixCollision($prefixes, $className, $message)
-    {
-        $loader = new ApcUniversalClassLoader('test.prefix.collision.');
-        $loader->registerPrefixes($prefixes);
+   /**
+    * @dataProvider getLoadClassPrefixCollisionTests
+    */
+   public function testLoadClassPrefixCollision($prefixes, $className, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.collision.');
+       $loader->registerPrefixes($prefixes);
 
-        $loader->loadClass($className);
-        $this->assertTrue(class_exists($className), $message);
-    }
+       $loader->loadClass($className);
+       $this->assertTrue(class_exists($className), $message);
+   }
 
     public function getLoadClassPrefixCollisionTests()
     {

Tests/LegacyUniversalClassLoaderTest.php

@@ -11,13 +11,12 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\UniversalClassLoader;
 
 /**
  * @group legacy
  */
-class LegacyUniversalClassLoaderTest extends TestCase
+class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider getLoadClassTests

Tests/Psr4ClassLoaderTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Component\ClassLoader\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\Psr4ClassLoader;
 
-class Psr4ClassLoaderTest extends TestCase
+class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @param string $className

UniversalClassLoader.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-@trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since Symfony 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * UniversalClassLoader implements a "universal" autoloader for PHP 5.3.

WinCacheClassLoader.php

@@ -58,8 +58,10 @@ class WinCacheClassLoader
     protected $decorated;
 
     /**
-     * @param string $prefix    The WinCache namespace prefix to use
-     * @param object $decorated A class loader object that implements the findFile() method
+     * Constructor.
+     *
+     * @param string $prefix    The WinCache namespace prefix to use.
+     * @param object $decorated A class loader object that implements the findFile() method.
      *
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
@@ -121,10 +123,8 @@ class WinCacheClassLoader
      */
     public function findFile($class)
     {
-        $file = wincache_ucache_get($this->prefix.$class, $success);
-
-        if (!$success) {
-            wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null, 0);
+        if (false === $file = wincache_ucache_get($this->prefix.$class)) {
+            wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class), 0);
         }
 
         return $file;

XcacheClassLoader.php

@@ -49,11 +49,19 @@ namespace Symfony\Component\ClassLoader;
 class XcacheClassLoader
 {
     private $prefix;
+
+    /**
+     * A class loader object that implements the findFile() method.
+     *
+     * @var object
+     */
     private $decorated;
 
     /**
-     * @param string $prefix    The XCache namespace prefix to use
-     * @param object $decorated A class loader object that implements the findFile() method
+     * Constructor.
+     *
+     * @param string $prefix    The XCache namespace prefix to use.
+     * @param object $decorated A class loader object that implements the findFile() method.
      *
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
@@ -118,7 +126,7 @@ class XcacheClassLoader
         if (xcache_isset($this->prefix.$class)) {
             $file = xcache_get($this->prefix.$class);
         } else {
-            $file = $this->decorated->findFile($class) ?: null;
+            $file = $this->decorated->findFile($class);
             xcache_set($this->prefix.$class, $file);
         }
 

composer.json

@@ -17,11 +17,10 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.9",
-        "symfony/polyfill-apcu": "~1.1"
+        "php": ">=5.3.9"
     },
     "require-dev": {
-        "symfony/finder": "^2.0.5"
+        "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ClassLoader\\": "" },
@@ -31,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }

phpunit.xml.dist

@@ -5,8 +5,6 @@
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
-         failOnRisky="true"
-         failOnWarning="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />