Add missing exclusions from phpunit.xml.dist

This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Enable collecting and replaying skipped tests

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16184
| License       | MIT
| Doc PR        | -

Commits
-------

4032c88 [ci] Enable collecting and replaying skipped tests

ApcClassLoader.php

@@ -44,8 +44,6 @@ namespace Symfony\Component\ClassLoader;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Kris Wallsmith <kris@symfony.com>
- *
- * @api
  */
 class ApcClassLoader
 {
@@ -66,8 +64,6 @@ class ApcClassLoader
      *
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
-     *
-     * @api
      */
     public function __construct($prefix, $decorated)
     {

ApcUniversalClassLoader.php

@@ -57,8 +57,6 @@ namespace Symfony\Component\ClassLoader;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Kris Wallsmith <kris@symfony.com>
- *
- * @api
  */
 class ApcUniversalClassLoader extends UniversalClassLoader
 {
@@ -70,8 +68,6 @@ class ApcUniversalClassLoader extends UniversalClassLoader
      * @param string $prefix A prefix to create a namespace in APC
      *
      * @throws \RuntimeException
-     *
-     * @api
      */
     public function __construct($prefix)
     {

ClassCollectionLoader.php

@@ -283,7 +283,7 @@ class ClassCollectionLoader
 
         $traits = array();
 
-        if (function_exists('get_declared_traits')) {
+        if (method_exists('ReflectionClass', 'getTraits')) {
             foreach ($classes as $c) {
                 foreach (self::resolveDependencies(self::computeTraitDeps($c), $c) as $trait) {
                     if ($trait !== $c) {

ClassLoader.php

@@ -91,12 +91,16 @@ class ClassLoader
             return;
         }
         if (isset($this->prefixes[$prefix])) {
-            $this->prefixes[$prefix] = array_merge(
-                $this->prefixes[$prefix],
-                (array) $paths
-            );
+            if (is_array($paths)) {
+                $this->prefixes[$prefix] = array_unique(array_merge(
+                    $this->prefixes[$prefix],
+                    $paths
+                ));
+            } elseif (!in_array($paths, $this->prefixes[$prefix])) {
+                 $this->prefixes[$prefix][] = $paths;
+            }
         } else {
-            $this->prefixes[$prefix] = (array) $paths;
+            $this->prefixes[$prefix] = array_unique((array) $paths);
         }
     }
 

ClassMapGenerator.php

@@ -118,6 +118,25 @@ class ClassMapGenerator
                 case T_CLASS:
                 case T_INTERFACE:
                 case SYMFONY_TRAIT:
+                    // Skip usage of ::class constant
+                    $isClassConstant = false;
+                    for ($j = $i - 1; $j > 0; --$j) {
+                        if (is_string($tokens[$j])) {
+                            break;
+                        }
+
+                        if (T_DOUBLE_COLON === $tokens[$j][0]) {
+                            $isClassConstant = true;
+                            break;
+                        } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
+                            break;
+                        }
+                    }
+
+                    if ($isClassConstant) {
+                        continue;
+                    }
+
                     // Find the classname
                     while (($t = $tokens[++$i]) && is_array($t)) {
                         if (T_STRING === $t[0]) {

DebugClassLoader.php

@@ -20,8 +20,6 @@ namespace Symfony\Component\ClassLoader;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Christophe Coevoet <stof@notk.org>
- *
- * @api
  */
 class DebugClassLoader
 {
@@ -31,8 +29,6 @@ class DebugClassLoader
      * Constructor.
      *
      * @param object $classFinder
-     *
-     * @api
      */
     public function __construct($classFinder)
     {

Tests/ApcUniversalClassLoaderTest.php

@@ -13,18 +13,17 @@ namespace Symfony\Component\ClassLoader\Tests;
 
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
+/**
+ * @requires extension apc
+ */
 class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        if (!extension_loaded('apc')) {
-            $this->markTestSkipped('The apc extension is not available.');
-        }
-
-        if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {
-            $this->markTestSkipped('The apc extension is available, but not enabled.');
-        } else {
+        if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
             apc_clear_cache('user');
+        } else {
+            $this->markTestSkipped('APC is not enabled.');
         }
     }
 

Tests/ClassCollectionLoaderTest.php

@@ -20,14 +20,11 @@ require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';
 
 class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @requires PHP 5.4
+     */
     public function testTraitDependencies()
     {
-        if (PHP_VERSION_ID < 50400) {
-            $this->markTestSkipped('Requires PHP > 5.4');
-
-            return;
-        }
-
         require_once __DIR__.'/Fixtures/deps/traits.php';
 
         $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
@@ -97,15 +94,10 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider getDifferentOrdersForTraits
+     * @requires PHP 5.4
      */
     public function testClassWithTraitsReordering(array $classes)
     {
-        if (PHP_VERSION_ID < 50400) {
-            $this->markTestSkipped('Requires PHP > 5.4');
-
-            return;
-        }
-
         require_once __DIR__.'/Fixtures/ClassesWithParents/ATrait.php';
         require_once __DIR__.'/Fixtures/ClassesWithParents/BTrait.php';
         require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
@@ -146,14 +138,11 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * @requires PHP 5.4
+     */
     public function testFixClassWithTraitsOrdering()
     {
-        if (PHP_VERSION_ID < 50400) {
-            $this->markTestSkipped('Requires PHP > 5.4');
-
-            return;
-        }
-
         require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
         require_once __DIR__.'/Fixtures/ClassesWithParents/F.php';
         require_once __DIR__.'/Fixtures/ClassesWithParents/G.php';

Tests/ClassLoaderTest.php

@@ -76,14 +76,36 @@ class ClassLoaderTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    public function testAddPrefix()
+    public function testAddPrefixSingle()
     {
         $loader = new ClassLoader();
         $loader->addPrefix('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
         $loader->addPrefix('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
         $prefixes = $loader->getPrefixes();
         $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertCount(1, $prefixes['Foo']);
+    }
+
+    public function testAddPrefixesSingle()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefixes(array('Foo' => array('foo', 'foo')));
+        $loader->addPrefixes(array('Foo' => array('foo')));
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertCount(1, $prefixes['Foo'], print_r($prefixes, true));
+    }
+
+    public function testAddPrefixMulti()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Foo', 'foo');
+        $loader->addPrefix('Foo', 'bar');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
         $this->assertCount(2, $prefixes['Foo']);
+        $this->assertContains('foo', $prefixes['Foo']);
+        $this->assertContains('bar', $prefixes['Foo']);
     }
 
     public function testUseIncludePath()

Tests/ClassMapGeneratorTest.php

@@ -47,7 +47,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider getTestCreateMapTests
      */
-    public function testDump($directory, $expected)
+    public function testDump($directory)
     {
         $this->prepare_workspace();
 
@@ -115,6 +115,12 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
             ));
         }
 
+        if (PHP_VERSION_ID >= 50500) {
+            $data[] = array(__DIR__.'/Fixtures/php5.5', array(
+                'ClassCons\\Foo' => __DIR__.'/Fixtures/php5.5/class_cons.php',
+            ));
+        }
+
         return $data;
     }
 
@@ -134,10 +140,10 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
     protected function assertEqualsNormalized($expected, $actual, $message = null)
     {
         foreach ($expected as $ns => $path) {
-            $expected[$ns] = strtr($path, '\\', '/');
+            $expected[$ns] = str_replace('\\', '/', $path);
         }
         foreach ($actual as $ns => $path) {
-            $actual[$ns] = strtr($path, '\\', '/');
+            $actual[$ns] = str_replace('\\', '/', $path);
         }
         $this->assertEquals($expected, $actual, $message);
     }

Tests/Fixtures/php5.5/class_cons.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace ClassCons;
+
+class Foo
+{
+    public function __construct()
+    {
+        \Foo\TBar/* foo */::class;
+    }
+}

UniversalClassLoader.php

@@ -55,8 +55,6 @@ namespace Symfony\Component\ClassLoader;
  * found before giving up.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class UniversalClassLoader
 {
@@ -132,8 +130,6 @@ class UniversalClassLoader
      * Registers the directory to use as a fallback for namespaces.
      *
      * @param array $dirs An array of directories
-     *
-     * @api
      */
     public function registerNamespaceFallbacks(array $dirs)
     {
@@ -154,8 +150,6 @@ class UniversalClassLoader
      * Registers directories to use as a fallback for class prefixes.
      *
      * @param array $dirs An array of directories
-     *
-     * @api
      */
     public function registerPrefixFallbacks(array $dirs)
     {
@@ -176,8 +170,6 @@ class UniversalClassLoader
      * Registers an array of namespaces.
      *
      * @param array $namespaces An array of namespaces (namespaces as keys and locations as values)
-     *
-     * @api
      */
     public function registerNamespaces(array $namespaces)
     {
@@ -191,8 +183,6 @@ class UniversalClassLoader
      *
      * @param string       $namespace The namespace
      * @param array|string $paths     The location(s) of the namespace
-     *
-     * @api
      */
     public function registerNamespace($namespace, $paths)
     {
@@ -203,8 +193,6 @@ class UniversalClassLoader
      * Registers an array of classes using the PEAR naming convention.
      *
      * @param array $classes An array of classes (prefixes as keys and locations as values)
-     *
-     * @api
      */
     public function registerPrefixes(array $classes)
     {
@@ -218,8 +206,6 @@ class UniversalClassLoader
      *
      * @param string       $prefix The classes prefix
      * @param array|string $paths  The location(s) of the classes
-     *
-     * @api
      */
     public function registerPrefix($prefix, $paths)
     {
@@ -230,8 +216,6 @@ class UniversalClassLoader
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @api
      */
     public function register($prepend = false)
     {

XcacheClassLoader.php

@@ -45,8 +45,6 @@ namespace Symfony\Component\ClassLoader;
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Kris Wallsmith <kris@symfony.com>
  * @author Kim Hemsø Rasmussen <kimhemsoe@gmail.com>
- *
- * @api
  */
 class XcacheClassLoader
 {
@@ -67,8 +65,6 @@ class XcacheClassLoader
      *
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
-     *
-     * @api
      */
     public function __construct($prefix, $decorated)
     {

composer.json

@@ -20,11 +20,13 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
         "symfony/finder": "~2.0,>=2.0.5"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\ClassLoader\\": "" }
+        "psr-0": { "Symfony\\Component\\ClassLoader\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "target-dir": "Symfony/Component/ClassLoader",
     "extra": {

phpunit.xml.dist

@@ -9,6 +9,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
     </php>
+
     <testsuites>
         <testsuite name="Symfony ClassLoader Component Test Suite">
             <directory>./Tests/</directory>