Merge branch '2.5' into 2.6

* 2.5:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  Remove dialog usage
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
	src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Parser.php

ApcClassLoader.php

@@ -17,19 +17,11 @@ namespace Symfony\Component\ClassLoader;
  * It expects an object implementing a findFile method to find the file. This
  * allows using it as a wrapper around the other loaders of the component (the
  * ClassLoader and the UniversalClassLoader for instance) but also around any
- * other autoloaders following this convention (the Composer one for instance).
- *
- *     // with a Symfony autoloader
- *     use Symfony\Component\ClassLoader\ClassLoader;
+ * other autoloader following this convention (the Composer one for instance)
  *
  *     $loader = new ClassLoader();
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
  *
- *     // or with a Composer autoloader
- *     use Composer\Autoload\ClassLoader;
- *
- *     $loader = new ClassLoader();
+ *     // register classes with namespaces
  *     $loader->add('Symfony\Component', __DIR__.'/component');
  *     $loader->add('Symfony',           __DIR__.'/framework');
  *
@@ -52,9 +44,10 @@ class ApcClassLoader
     private $prefix;
 
     /**
-     * A class loader object that implements the findFile() method.
+     * The class loader object being decorated.
      *
      * @var object
+     *   A class loader object that implements the findFile() method.
      */
     protected $decorated;
 

ApcUniversalClassLoader.php

@@ -59,8 +59,6 @@ namespace Symfony\Component\ClassLoader;
  * @author Kris Wallsmith <kris@symfony.com>
  *
  * @api
- *
- * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ApcClassLoader class instead.
  */
 class ApcUniversalClassLoader extends UniversalClassLoader
 {

CHANGELOG.md

@@ -4,9 +4,6 @@ CHANGELOG
 2.4.0
 -----
 
- * deprecated the UniversalClassLoader in favor of the ClassLoader class instead
- * deprecated the ApcUniversalClassLoader in favor of the ApcClassLoader class instead
- * deprecated the DebugUniversalClassLoader in favor of the DebugClassLoader class from the Debug component
  * deprecated the DebugClassLoader as it has been moved to the Debug component instead
 
 2.3.0

ClassCollectionLoader.php

@@ -353,17 +353,14 @@ class ClassCollectionLoader
             $unresolved = new \ArrayObject();
         }
         $nodeName = $node->getName();
-
-        if (isset($tree[$nodeName])) {
-            $unresolved[$nodeName] = $node;
-            foreach ($tree[$nodeName] as $dependency) {
-                if (!$resolved->offsetExists($dependency->getName())) {
-                    self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
-                }
+        $unresolved[$nodeName] = $node;
+        foreach ($tree[$nodeName] as $dependency) {
+            if (!$resolved->offsetExists($dependency->getName())) {
+                self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
             }
-            $resolved[$nodeName] = $node;
-            unset($unresolved[$nodeName]);
         }
+        $resolved[$nodeName] = $node;
+        unset($unresolved[$nodeName]);
 
         return $resolved;
     }

ClassLoader.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\ClassLoader;
 
 /**
- * ClassLoader implements an PSR-0 class loader.
+ * ClassLoader implements an PSR-0 class loader
  *
  * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
  *
@@ -76,7 +76,7 @@ class ClassLoader
     }
 
     /**
-     * Registers a set of classes.
+     * Registers a set of classes
      *
      * @param string       $prefix The classes prefix
      * @param array|string $paths  The location(s) of the classes

ClassMapGenerator.php

@@ -20,14 +20,14 @@ if (!defined('SYMFONY_TRAIT')) {
 }
 
 /**
- * ClassMapGenerator.
+ * ClassMapGenerator
  *
  * @author Gyula Sallai <salla016@gmail.com>
  */
 class ClassMapGenerator
 {
     /**
-     * Generate a class map file.
+     * Generate a class map file
      *
      * @param array|string $dirs Directories or a single path to search in
      * @param string       $file The name of the class map file
@@ -45,7 +45,7 @@ class ClassMapGenerator
     }
 
     /**
-     * Iterate over all files in the given directory searching for classes.
+     * Iterate over all files in the given directory searching for classes
      *
      * @param \Iterator|string $dir The directory to search in or an iterator
      *
@@ -81,7 +81,7 @@ class ClassMapGenerator
     }
 
     /**
-     * Extract the classes in the given file.
+     * Extract the classes in the given file
      *
      * @param string $path The file to check
      *

DebugClassLoader.php

@@ -82,7 +82,7 @@ class DebugClassLoader
     }
 
     /**
-     * Finds a file by class name.
+     * Finds a file by class name
      *
      * @param string $class A class name to resolve to file
      *

DebugUniversalClassLoader.php

@@ -15,8 +15,6 @@ namespace Symfony\Component\ClassLoader;
  * Checks that the class is actually declared in the included file.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
  */
 class DebugUniversalClassLoader extends UniversalClassLoader
 {

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2015 Fabien Potencier
+Copyright (c) 2004-2014 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

Psr4ClassLoader.php

@@ -77,7 +77,7 @@ class Psr4ClassLoader
     /**
      * Registers this instance as an autoloader.
      *
-     * @param bool $prepend
+     * @param bool    $prepend
      */
     public function register($prepend = false)
     {

README.md

@@ -4,34 +4,34 @@ ClassLoader Component
 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
+The Universal ClassLoader 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';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
-use Symfony\Component\ClassLoader\ClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
 
-$loader = new ClassLoader();
+$loader = new UniversalClassLoader();
 $loader->register();
 ```
 
-Then, register some namespaces with the `addPrefix()` method:
+Then, register some namespaces with the `registerNamespace()` method:
 
 ```php
-$loader->addPrefix('Symfony', __DIR__.'/src');
-$loader->addPrefix('Monolog', __DIR__.'/vendor/monolog/src');
+$loader->registerNamespace('Symfony', __DIR__.'/src');
+$loader->registerNamespace('Monolog', __DIR__.'/vendor/monolog/src');
 ```
 
-The `addPrefix()` method takes a namespace prefix and a path where to
+The `registerNamespace()` 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');
+$loader->registerNamespace('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
 ```
 
 The order of registration is significant and the first registered namespace
@@ -40,14 +40,14 @@ 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'));
+$loader->registerNamespace('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
 ```
 
-Alternatively, you can use the `addPrefixes()` method to register more
+Alternatively, you can use the `registerNamespaces()` method to register more
 than one namespace at once:
 
 ```php
-$loader->addPrefixes(array(
+$loader->registerNamespaces(array(
     'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'),
     'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
     'Doctrine' => __DIR__.'/vendor/doctrine/lib',
@@ -55,20 +55,16 @@ $loader->addPrefixes(array(
 ));
 ```
 
-For better performance, you can use the APC class loader:
+For better performance, you can use the APC based version of the universal
+class loader:
 
 ```php
-require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
-require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
 
-use Symfony\Component\ClassLoader\ClassLoader;
-use Symfony\Component\ClassLoader\ApcClassLoader;
+use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
-$loader = new ClassLoader();
-$loader->addPrefix('Symfony', __DIR__.'/src');
-
-$loader = new ApcClassLoader('apc.prefix.', $loader);
-$loader->register();
+$loader = new ApcUniversalClassLoader('apc.prefix.');
 ```
 
 Furthermore, the component provides tools to aggregate classes into a single

Tests/ApcUniversalClassLoaderTest.php

@@ -13,12 +13,10 @@ namespace Symfony\Component\ClassLoader\Tests;
 
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
-class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         if (!extension_loaded('apc')) {
             $this->markTestSkipped('The apc extension is not available.');
         }

Tests/ClassCollectionLoaderTest.php

@@ -146,38 +146,6 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    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';
-
-        $classes = array(
-            'ClassesWithParents\\F',
-            'ClassesWithParents\\G',
-        );
-
-        $expected = array(
-            'ClassesWithParents\\CTrait',
-            'ClassesWithParents\\F',
-            'ClassesWithParents\\G',
-        );
-
-        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
-        $m = $r->getMethod('getOrderedClasses');
-        $m->setAccessible(true);
-
-        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
-
-        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
-    }
-
     /**
      * @dataProvider getFixNamespaceDeclarationsData
      */

Tests/ClassMapGeneratorTest.php

@@ -16,7 +16,7 @@ use Symfony\Component\ClassLoader\ClassMapGenerator;
 class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var string|null
+     * @var string $workspace
      */
     private $workspace = null;
 

Tests/Fixtures/ClassesWithParents/F.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace ClassesWithParents;
-
-class F
-{
-    use CTrait;
-}

Tests/Fixtures/ClassesWithParents/G.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace ClassesWithParents;
-
-class G
-{
-    use CTrait;
-}

Tests/UniversalClassLoaderTest.php

@@ -13,13 +13,8 @@ namespace Symfony\Component\ClassLoader\Tests;
 
 use Symfony\Component\ClassLoader\UniversalClassLoader;
 
-class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+class UniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     /**
      * @dataProvider getLoadClassTests
      */

UniversalClassLoader.php

@@ -57,8 +57,6 @@ namespace Symfony\Component\ClassLoader;
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @api
- *
- * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ClassLoader class instead.
  */
 class UniversalClassLoader
 {
@@ -70,7 +68,7 @@ class UniversalClassLoader
 
     /**
      * Turns on searching the include for class files. Allows easy loading
-     * of installed PEAR packages.
+     * of installed PEAR packages
      *
      * @param bool $useIncludePath
      */
@@ -175,7 +173,7 @@ class UniversalClassLoader
     }
 
     /**
-     * Registers an array of namespaces.
+     * Registers an array of namespaces
      *
      * @param array $namespaces An array of namespaces (namespaces as keys and locations as values)
      *

WinCacheClassLoader.php

@@ -17,19 +17,11 @@ namespace Symfony\Component\ClassLoader;
  * It expects an object implementing a findFile method to find the file. This
  * allow using it as a wrapper around the other loaders of the component (the
  * ClassLoader and the UniversalClassLoader for instance) but also around any
- * other autoloaders following this convention (the Composer one for instance).
- *
- *     // with a Symfony autoloader
- *     use Symfony\Component\ClassLoader\ClassLoader;
+ * other autoloader following this convention (the Composer one for instance)
  *
  *     $loader = new ClassLoader();
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
  *
- *     // or with a Composer autoloader
- *     use Composer\Autoload\ClassLoader;
- *
- *     $loader = new ClassLoader();
+ *     // register classes with namespaces
  *     $loader->add('Symfony\Component', __DIR__.'/component');
  *     $loader->add('Symfony',           __DIR__.'/framework');
  *
@@ -51,9 +43,10 @@ class WinCacheClassLoader
     private $prefix;
 
     /**
-     * A class loader object that implements the findFile() method.
+     * The class loader object being decorated.
      *
-     * @var object
+     * @var \Symfony\Component\ClassLoader\ClassLoader
+     *   A class loader object that implements the findFile() method.
      */
     protected $decorated;
 

XcacheClassLoader.php

@@ -17,19 +17,11 @@ namespace Symfony\Component\ClassLoader;
  * It expects an object implementing a findFile method to find the file. This
  * allows using it as a wrapper around the other loaders of the component (the
  * ClassLoader and the UniversalClassLoader for instance) but also around any
- * other autoloaders following this convention (the Composer one for instance).
- *
- *     // with a Symfony autoloader
- *     use Symfony\Component\ClassLoader\ClassLoader;
+ * other autoloader following this convention (the Composer one for instance)
  *
  *     $loader = new ClassLoader();
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
  *
- *     // or with a Composer autoloader
- *     use Composer\Autoload\ClassLoader;
- *
- *     $loader = new ClassLoader();
+ *     // register classes with namespaces
  *     $loader->add('Symfony\Component', __DIR__.'/component');
  *     $loader->add('Symfony',           __DIR__.'/framework');
  *
@@ -53,9 +45,7 @@ class XcacheClassLoader
     private $prefix;
 
     /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
+     * @var object A class loader object that implements the findFile() method
      */
     private $decorated;
 

composer.json

@@ -20,7 +20,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "symfony/finder": "~2.0,>=2.0.5"
+        "symfony/finder": "~2.0"
     },
     "autoload": {
         "psr-0": { "Symfony\\Component\\ClassLoader\\": "" }
@@ -28,7 +28,7 @@
     "target-dir": "Symfony/Component/ClassLoader",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev"
+            "dev-master": "2.6-dev"
         }
     }
 }

phpunit.xml.dist

@@ -6,10 +6,6 @@
          colors="true"
          bootstrap="vendor/autoload.php"
 >
-    <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
-    </php>
     <testsuites>
         <testsuite name="Symfony ClassLoader Component Test Suite">
             <directory>./Tests/</directory>