From 7a4019bbcf3f82fe7bbc410dd3b61f187a44944a Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 13 May 2016 14:21:08 -0500
Subject: [PATCH 01/34] bumped Symfony version to 3.1.0

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 7318cb2fedc07..e891863321f32 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '3.1.0-BETA1';
+    const VERSION = '3.1.0-DEV';
     const VERSION_ID = 30100;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 1;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'BETA1';
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '01/2017';
     const END_OF_LIFE = '07/2017';

From 834f55026345ffc220995091b2095c6651ec38dd Mon Sep 17 00:00:00 2001
From: Mathieu Lemoine <mlemoine@mlemoine.name>
Date: Fri, 13 May 2016 15:34:52 -0400
Subject: [PATCH 02/34] [DX][DI] Make Autowiring exceptions more future
 friendly

---
 .../Compiler/AutowirePass.php                 | 15 +++++---
 .../Tests/Compiler/AutowirePassTest.php       | 37 ++++++++++---------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index e4457d4608451..a7812fe03d683 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -225,13 +225,16 @@ private function set($type, $id)
     private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)
     {
         if (isset($this->notGuessableTypes[$typeHint->name])) {
-            throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s". Several services implementing this type have been declared: "%s".', $typeHint->name, $id, implode('", "', $this->types[$typeHint->name])));
-        }
+            $classOrInterface = $typeHint->isInterface() ? 'interface' : 'class';
+            $matchingServices = implode(', ', $this->types[$typeHint->name]);
+
+            throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s". Multiple services exist for this %s (%s).', $typeHint->name, $id, $classOrInterface, $matchingServices));
 
-        $noAvailableDefinitionMessage = sprintf('Unable to autowire argument of type "%s" for the service "%s". This type cannot be instantiated automatically and no service implementing this type is declared.', $typeHint->name, $id);
+        }
 
         if (!$typeHint->isInstantiable()) {
-            throw new RuntimeException($noAvailableDefinitionMessage);
+            $classOrInterface = $typeHint->isInterface() ? 'interface' : 'class';
+            throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s". No services were found matching this %s and it cannot be auto-registered.', $typeHint->name, $id, $classOrInterface));
         }
 
         $argumentId = sprintf('autowired.%s', $typeHint->name);
@@ -244,7 +247,9 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)
         try {
             $this->completeDefinition($argumentId, $argumentDefinition);
         } catch (RuntimeException $e) {
-            throw new RuntimeException($noAvailableDefinitionMessage, 0, $e);
+            $classOrInterface = $typeHint->isInterface() ? 'interface' : 'class';
+            $message = sprintf('Unable to autowire argument of type "%s" for the service "%s". No services were found matching this %s and it cannot be auto-registered.', $typeHint->name, $id, $classOrInterface);
+            throw new RuntimeException($message, 0, $e);
         }
 
         return new Reference($argumentId);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 6098d9a9131c8..b5badc31fdbcd 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -103,7 +103,7 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a". Several services implementing this type have been declared: "c1", "c2".
+     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a". Multiple services exist for this interface (c1, c2, c3).
      */
     public function testTypeCollision()
     {
@@ -111,6 +111,7 @@ public function testTypeCollision()
 
         $container->register('c1', __NAMESPACE__.'\CollisionA');
         $container->register('c2', __NAMESPACE__.'\CollisionB');
+        $container->register('c3', __NAMESPACE__.'\CollisionB');
         $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
         $aDefinition->setAutowired(true);
 
@@ -120,7 +121,7 @@ public function testTypeCollision()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" for the service "a". Several services implementing this type have been declared: "a1", "a2".
+     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" for the service "a". Multiple services exist for this class (a1, a2).
      */
     public function testTypeNotGuessable()
     {
@@ -137,7 +138,7 @@ public function testTypeNotGuessable()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\A" for the service "a". Several services implementing this type have been declared: "a1", "a2".
+     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\A" for the service "a". Multiple services exist for this class (a1, a2).
      */
     public function testTypeNotGuessableWithSubclass()
     {
@@ -152,6 +153,21 @@ public function testTypeNotGuessableWithSubclass()
         $pass->process($container);
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a". No services were found matching this interface and it cannot be auto-registered.
+     */
+    public function testTypeNotGuessableNoServicesFound()
+    {
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
     public function testTypeNotGuessableWithTypeSet()
     {
         $container = new ContainerBuilder();
@@ -207,21 +223,6 @@ public function testCreateDefinition()
         $this->assertEquals(__NAMESPACE__.'\Lille', $lilleDefinition->getClass());
     }
 
-    /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a". This type cannot be instantiated automatically and no service implementing this type is declared.
-     */
-    public function testCreateNonInstanciable()
-    {
-        $container = new ContainerBuilder();
-
-        $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
-        $aDefinition->setAutowired(true);
-
-        $pass = new AutowirePass();
-        $pass->process($container);
-    }
-
     public function testResolveParameter()
     {
         $container = new ContainerBuilder();

From 7d9e74e340134e3288b8d11525e8319ba592af99 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Sat, 14 May 2016 13:17:24 +0200
Subject: [PATCH 03/34] remove methods that were needed for PHP 5.3

---
 .../Console/Helper/ProgressIndicator.php      | 42 ++-----------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
index ccf9771bcf9e4..f90a85c2918ca 100644
--- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
@@ -76,42 +76,6 @@ public function setMessage($message)
         $this->display();
     }
 
-    /**
-     * Gets the current indicator message.
-     *
-     * @return string|null
-     *
-     * @internal for PHP 5.3 compatibility
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Gets the progress bar start time.
-     *
-     * @return int The progress bar start time
-     *
-     * @internal for PHP 5.3 compatibility
-     */
-    public function getStartTime()
-    {
-        return $this->startTime;
-    }
-
-    /**
-     * Gets the current animated indicator character.
-     *
-     * @return string
-     *
-     * @internal for PHP 5.3 compatibility
-     */
-    public function getCurrentValue()
-    {
-        return $this->indicatorValues[$this->indicatorCurrent % count($this->indicatorValues)];
-    }
-
     /**
      * Starts the indicator output.
      *
@@ -294,13 +258,13 @@ private static function initPlaceholderFormatters()
     {
         return array(
             'indicator' => function (ProgressIndicator $indicator) {
-                return $indicator->getCurrentValue();
+                return $indicator->indicatorValues[$indicator->indicatorCurrent % count($indicator->indicatorValues)];
             },
             'message' => function (ProgressIndicator $indicator) {
-                return $indicator->getMessage();
+                return $indicator->message;
             },
             'elapsed' => function (ProgressIndicator $indicator) {
-                return Helper::formatTime(time() - $indicator->getStartTime());
+                return Helper::formatTime(time() - $indicator->startTime);
             },
             'memory' => function () {
                 return Helper::formatMemory(memory_get_usage(true));

From f8dd87d7cc2e9c2551322662fb3d9bed7f332d3c Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Sat, 2 Apr 2016 12:30:41 +0200
Subject: [PATCH 04/34] [WebProfilerBundle] Fix CORS ajax security issues

---
 .../Resources/views/Profiler/base_js.html.twig | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 8c10c95655317..d9f92ca26a33e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -80,6 +80,20 @@
 
             requestStack = [],
 
+            extractHeaders = function(xhr, stackElement) {
+                // Here we avoid to call xhr.getResponseHeader in order to
+                // prevent polluting the console with CORS security errors
+                var allHeaders = xhr.getAllResponseHeaders();
+                var ret;
+
+                if (ret = allHeaders.match(/^x-debug-token:\s+(.*)$/im)) {
+                    stackElement.profile = ret[1];
+                }
+                if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) {
+                    stackElement.profilerUrl = ret[1];
+                }
+            },
+
             renderAjaxRequests = function() {
                 var requestCounter = document.querySelectorAll('.sf-toolbar-ajax-requests');
                 if (!requestCounter.length) {
@@ -239,8 +253,8 @@
                                 stackElement.duration = new Date() - stackElement.start;
                                 stackElement.loading = false;
                                 stackElement.error = self.status < 200 || self.status >= 400;
-                                stackElement.profile = self.getResponseHeader("X-Debug-Token");
-                                stackElement.profilerUrl = self.getResponseHeader("X-Debug-Token-Link");
+
+                                extractHeaders(self, stackElement);
 
                                 Sfjs.renderAjaxRequests();
                             }

From ac7f74eccac01ce7b279c41b72f1422e575e67f6 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jbenoist@20minutes.fr>
Date: Tue, 17 May 2016 14:52:22 +0200
Subject: [PATCH 05/34] Use levenshtein level for better Bundle matching

---
 .../Controller/ControllerNameParser.php                |  1 +
 .../Tests/Controller/ControllerNameParserTest.php      | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
index 873c736841ba8..374d0eba10ff6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
@@ -142,6 +142,7 @@ private function findAlternative($nonExistentBundleName)
             $lev = levenshtein($nonExistentBundleName, $bundleName);
             if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
                 $alternative = $bundleName;
+                $shortest = $lev;
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
index 4718c1eb0b238..0fe47b0908d83 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -59,8 +59,8 @@ public function testBuild()
     {
         $parser = $this->createParser();
 
-        $this->assertEquals('FooBundle:Default:index', $parser->build('TestBundle\FooBundle\Controller\DefaultController::indexAction'), '->parse() converts a class::method string to a short a:b:c notation string');
-        $this->assertEquals('FooBundle:Sub\Default:index', $parser->build('TestBundle\FooBundle\Controller\Sub\DefaultController::indexAction'), '->parse() converts a class::method string to a short a:b:c notation string');
+        $this->assertEquals('FoooooBundle:Default:index', $parser->build('TestBundle\FooBundle\Controller\DefaultController::indexAction'), '->parse() converts a class::method string to a short a:b:c notation string');
+        $this->assertEquals('FoooooBundle:Sub\Default:index', $parser->build('TestBundle\FooBundle\Controller\Sub\DefaultController::indexAction'), '->parse() converts a class::method string to a short a:b:c notation string');
 
         try {
             $parser->build('TestBundle\FooBundle\Controller\DefaultController::index');
@@ -132,8 +132,9 @@ public function testInvalidBundleName($bundleName, $suggestedBundleName)
     public function getInvalidBundleNameTests()
     {
         return array(
-            array('FoodBundle:Default:index', 'FooBundle:Default:index'),
-            array('CrazyBundle:Default:index', false),
+            'Alternative will be found using levenshtein' => array('FoodBundle:Default:index', 'FooBundle:Default:index'),
+            'Alternative will be found using partial match' => array('FabpotFooBund:Default:index', 'FabpotFooBundle:Default:index'),
+            'Bundle does not exist at all' => array('CrazyBundle:Default:index', false),
         );
     }
 
@@ -162,6 +163,7 @@ private function createParser()
         $bundles = array(
             'SensioFooBundle' => $this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'),
             'SensioCmsFooBundle' => $this->getBundle('TestBundle\Sensio\Cms\FooBundle', 'SensioCmsFooBundle'),
+            'FoooooBundle' => $this->getBundle('TestBundle\FooBundle', 'FoooooBundle'),
             'FooBundle' => $this->getBundle('TestBundle\FooBundle', 'FooBundle'),
             'FabpotFooBundle' => $this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'),
         );

From 187b64561586b81a0c8896328826cbe5dcb51e5a Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Tue, 17 May 2016 18:47:41 +0200
Subject: [PATCH 06/34] [FrameworkBundle] update upgrade instructions

---
 UPGRADE-3.0.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 8925b911890e0..327a36bf93c8e 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -636,6 +636,11 @@ UPGRADE FROM 2.x to 3.0
    be removed in Symfony 3.0. Use the `debug:config`, `debug:container`,
    `debug:router`, `debug:translation` and `lint:yaml` commands instead.
 
+ * The base `Controller`class is now abstract.
+
+ * The visibility of all methods of the base `Controller` class has been changed from
+   `public` to `protected`.
+
  * The `getRequest` method of the base `Controller` class has been deprecated
    since Symfony 2.4 and must be therefore removed in 3.0. The only reliable
    way to get the `Request` object is to inject it in the action method.

From 0c8358b3fe30ba50f0d42186b4ffeb216b48a51d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 16 May 2016 11:02:32 +0200
Subject: [PATCH 07/34] [Cache] Rename nonce to version

---
 .../DependencyInjection/FrameworkExtension.php         |  6 +++---
 .../Bundle/FrameworkBundle/Resources/config/cache.xml  |  4 ++--
 .../Component/Cache/Adapter/AbstractAdapter.php        |  4 ++--
 src/Symfony/Component/Cache/Adapter/ApcuAdapter.php    | 10 +++++-----
 .../Component/Cache/Tests/Adapter/ApcuAdapterTest.php  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 84a5e3d0946d7..c434cac057aae 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1037,9 +1037,9 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        $nonce = substr(str_replace('/', '-', base64_encode(md5(uniqid(mt_rand(), true), true))), 0, -2);
-        $container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $nonce);
-        $container->getDefinition('cache.adapter.system')->replaceArgument(2, $nonce);
+        $version = substr(str_replace('/', '-', base64_encode(md5(uniqid(mt_rand(), true), true))), 0, -2);
+        $container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);
+        $container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);
 
         foreach (array('doctrine', 'psr6', 'redis') as $name) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index 931b74a58d7fc..c438a1a66ff14 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -28,7 +28,7 @@
             <tag name="monolog.logger" channel="cache" />
             <argument /> <!-- namespace -->
             <argument /> <!-- default lifetime -->
-            <argument /> <!-- nonce -->
+            <argument /> <!-- version -->
             <argument>%kernel.cache_dir%/pools</argument>
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
@@ -38,7 +38,7 @@
             <tag name="monolog.logger" channel="cache" />
             <argument /> <!-- namespace -->
             <argument /> <!-- default lifetime -->
-            <argument /> <!-- nonce -->
+            <argument /> <!-- version -->
             <call method="setLogger">
                 <argument type="service" id="logger" on-invalid="ignore" />
             </call>
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 8c753fb814301..01207f54e6c0b 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -68,7 +68,7 @@ function ($deferred, $namespace, &$expiredIds) {
         );
     }
 
-    public static function createSystemCache($namespace, $defaultLifetime, $nonce, $directory, LoggerInterface $logger = null)
+    public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)
     {
         $fs = new FilesystemAdapter($namespace, $defaultLifetime, $directory);
         if (null !== $logger) {
@@ -78,7 +78,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $nonce, $
             return $fs;
         }
 
-        $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $nonce);
+        $apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
         if (null !== $logger) {
             $apcu->setLogger($logger);
         }
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
index 35a4d987e338c..a1c24a6350df2 100644
--- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -24,7 +24,7 @@ public static function isSupported()
         return function_exists('apcu_fetch') && ini_get('apc.enabled') && !('cli' === PHP_SAPI && !ini_get('apc.enable_cli'));
     }
 
-    public function __construct($namespace = '', $defaultLifetime = 0, $nonce = null)
+    public function __construct($namespace = '', $defaultLifetime = 0, $version = null)
     {
         if (!static::isSupported()) {
             throw new CacheException('APCu is not enabled');
@@ -34,12 +34,12 @@ public function __construct($namespace = '', $defaultLifetime = 0, $nonce = null
         }
         parent::__construct($namespace, $defaultLifetime);
 
-        if (null !== $nonce) {
-            CacheItem::validateKey($nonce);
+        if (null !== $version) {
+            CacheItem::validateKey($version);
 
-            if (!apcu_exists($nonce.':nonce'.$namespace)) {
+            if (!apcu_exists($version.':'.$namespace)) {
                 $this->clear($namespace);
-                apcu_add($nonce.':nonce'.$namespace, null);
+                apcu_add($version.':'.$namespace, null);
             }
         }
     }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
index 9dcbb5ba9dc06..1cd4269b45f1d 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
@@ -44,7 +44,7 @@ public function testUnserializable()
         $this->assertFalse($item->isHit());
     }
 
-    public function testNonce()
+    public function testVersion()
     {
         $namespace = str_replace('\\', '.', __CLASS__);
 

From 6bcb74d27cece7062d77fdfa967661267ab9e596 Mon Sep 17 00:00:00 2001
From: Jules Pietri <heah@heahprod.com>
Date: Wed, 18 May 2016 11:23:21 +0200
Subject: [PATCH 08/34] [YAML] fixed "dump" signature in upgrade file

---
 UPGRADE-3.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
index fffb06bad9354..134dfa4e5dfa2 100644
--- a/UPGRADE-3.1.md
+++ b/UPGRADE-3.1.md
@@ -202,7 +202,7 @@ Yaml
    After:
 
    ```php
-   Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, Yaml::DUMP_OBJECT);
+   Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_OBJECT);
    ```
 
  * The `!!php/object` tag to indicate dumped PHP objects has been deprecated

From f49659f1372d4bfc9d9616f92c316e4cc5fd8726 Mon Sep 17 00:00:00 2001
From: Krzysiek Piasecki <krzysiekpiasecki@gmail.com>
Date: Thu, 12 May 2016 08:29:24 +0200
Subject: [PATCH 09/34] [Validator] Support for DateTimeImmutable

---
 .../Component/Validator/Constraints/DateTimeValidator.php  | 2 +-
 .../Component/Validator/Constraints/DateValidator.php      | 2 +-
 .../Validator/Tests/Constraints/DateTimeValidatorTest.php  | 7 +++++++
 .../Validator/Tests/Constraints/DateValidatorTest.php      | 7 +++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
index 8d82bd8ca9a4b..0a867a7d4b25b 100644
--- a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -30,7 +30,7 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\DateTime');
         }
 
-        if (null === $value || '' === $value || $value instanceof \DateTime) {
+        if (null === $value || '' === $value || $value instanceof \DateTimeInterface) {
             return;
         }
 
diff --git a/src/Symfony/Component/Validator/Constraints/DateValidator.php b/src/Symfony/Component/Validator/Constraints/DateValidator.php
index bfeb5fca30ef3..ed836de9aced2 100644
--- a/src/Symfony/Component/Validator/Constraints/DateValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DateValidator.php
@@ -47,7 +47,7 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Date');
         }
 
-        if (null === $value || '' === $value || $value instanceof \DateTime) {
+        if (null === $value || '' === $value || $value instanceof \DateTimeInterface) {
             return;
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
index ebb1f3e6b74fb..dbc4d1aa688d3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
@@ -42,6 +42,13 @@ public function testDateTimeClassIsValid()
         $this->assertNoViolation();
     }
 
+    public function testDateTimeImmutableClassIsValid()
+    {
+        $this->validator->validate(new \DateTimeImmutable(), new DateTime());
+
+        $this->assertNoViolation();
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
index 67bb2340c3630..ec62de6281c58 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
@@ -42,6 +42,13 @@ public function testDateTimeClassIsValid()
         $this->assertNoViolation();
     }
 
+    public function testDateTimeImmutableClassIsValid()
+    {
+        $this->validator->validate(new \DateTimeImmutable(), new Date());
+
+        $this->assertNoViolation();
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */

From 2718a6c764416ede6afa87fe4aaa28a480b93091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rouven=20We=C3=9Fling?= <rouven@contentful.com>
Date: Sat, 30 Apr 2016 12:40:11 +0200
Subject: [PATCH 10/34] [DependencyInjection] Avoid generating call_user_func
 in more cases

---
 .../DependencyInjection/Dumper/PhpDumper.php  |  8 +++
 .../Tests/Fixtures/containers/container9.php  | 18 +++++
 .../Tests/Fixtures/graphviz/services9.dot     |  4 ++
 .../Tests/Fixtures/php/services19.php         |  2 +-
 .../Tests/Fixtures/php/services9.php          | 68 +++++++++++++++++++
 .../Tests/Fixtures/php/services9_compiled.php | 32 +++++++++
 .../Tests/Fixtures/xml/services9.xml          | 12 ++++
 .../Tests/Fixtures/yaml/services9.yml         | 14 ++++
 8 files changed, 157 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index e0a763dfe8d5b..ba7fa385d8cd2 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -537,6 +537,10 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta
                 return sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
             }
 
+            if (0 === strpos($class, 'new ')) {
+                return sprintf("        (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+            }
+
             return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
 
@@ -713,6 +717,10 @@ private function addNewInstance(Definition $definition, $return, $instantiation)
                     return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
+                if (0 === strpos($class, 'new ')) {
+                    return sprintf("        $return{$instantiation}(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
+                }
+
                 return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
index 96f334fdd153f..f499635604bed 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
@@ -78,6 +78,15 @@
     ->register('configured_service', 'stdClass')
     ->setConfigurator(array(new Reference('configurator_service'), 'configureStdClass'))
 ;
+$container
+    ->register('configurator_service_simple', 'ConfClass')
+    ->addArgument('bar')
+    ->setPublic(false)
+;
+$container
+    ->register('configured_service_simple', 'stdClass')
+    ->setConfigurator(array(new Reference('configurator_service_simple'), 'configureStdClass'))
+;
 $container
     ->register('decorated', 'stdClass')
 ;
@@ -111,5 +120,14 @@
     ->register('service_from_static_method', 'Bar\FooClass')
     ->setFactory(array('Bar\FooClass', 'getInstance'))
 ;
+$container
+    ->register('factory_simple', 'SimpleFactoryClass')
+    ->addArgument('foo')
+    ->setPublic(false)
+;
+$container
+    ->register('factory_service_simple', 'Bar')
+    ->setFactory(array(new Reference('factory_simple'), 'getInstance'))
+;
 
 return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
index f6536980aa54f..3b24ef8ffbca3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
@@ -14,6 +14,8 @@ digraph sc {
   node_request [label="request\nRequest\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_configurator_service [label="configurator_service\nConfClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_configured_service [label="configured_service\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_configurator_service_simple [label="configurator_service_simple\nConfClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_configured_service_simple [label="configured_service_simple\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_decorated [label="decorated\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_decorator_service [label="decorator_service\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_decorator_service_with_name [label="decorator_service_with_name\nstdClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
@@ -22,6 +24,8 @@ digraph sc {
   node_factory_service [label="factory_service\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_new_factory_service [label="new_factory_service\nFooBarBaz\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_service_from_static_method [label="service_from_static_method\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_factory_simple [label="factory_simple\nSimpleFactoryClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_factory_service_simple [label="factory_service_simple\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
   node_foo2 [label="foo2\n\n", shape=record, fillcolor="#ff9999", style="filled"];
   node_foo3 [label="foo3\n\n", shape=record, fillcolor="#ff9999", style="filled"];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index cc2a18dcd1d57..6c56cfcebf700 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -40,7 +40,7 @@ public function __construct()
      */
     protected function getServiceFromAnonymousFactoryService()
     {
-        return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));
+        return $this->services['service_from_anonymous_factory'] = (new \Bar\FooClass())->getInstance();
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
index a29f7dd768c51..cb84452bcad87 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -28,12 +28,16 @@ public function __construct()
             'bar' => 'getBarService',
             'baz' => 'getBazService',
             'configurator_service' => 'getConfiguratorServiceService',
+            'configurator_service_simple' => 'getConfiguratorServiceSimpleService',
             'configured_service' => 'getConfiguredServiceService',
+            'configured_service_simple' => 'getConfiguredServiceSimpleService',
             'decorated' => 'getDecoratedService',
             'decorator_service' => 'getDecoratorServiceService',
             'decorator_service_with_name' => 'getDecoratorServiceWithNameService',
             'deprecated_service' => 'getDeprecatedServiceService',
             'factory_service' => 'getFactoryServiceService',
+            'factory_service_simple' => 'getFactoryServiceSimpleService',
+            'factory_simple' => 'getFactorySimpleService',
             'foo' => 'getFooService',
             'foo.baz' => 'getFoo_BazService',
             'foo_bar' => 'getFooBarService',
@@ -104,6 +108,23 @@ protected function getConfiguredServiceService()
         return $instance;
     }
 
+    /**
+     * Gets the 'configured_service_simple' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \stdClass A stdClass instance.
+     */
+    protected function getConfiguredServiceSimpleService()
+    {
+        $this->services['configured_service_simple'] = $instance = new \stdClass();
+
+        $this->get('configurator_service_simple')->configureStdClass($instance);
+
+        return $instance;
+    }
+
     /**
      * Gets the 'decorated' service.
      *
@@ -173,6 +194,19 @@ protected function getFactoryServiceService()
         return $this->services['factory_service'] = $this->get('foo.baz')->getInstance();
     }
 
+    /**
+     * Gets the 'factory_service_simple' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar A Bar instance.
+     */
+    protected function getFactoryServiceSimpleService()
+    {
+        return $this->services['factory_service_simple'] = $this->get('factory_simple')->getInstance();
+    }
+
     /**
      * Gets the 'foo' service.
      *
@@ -334,6 +368,40 @@ protected function getConfiguratorServiceService()
         return $instance;
     }
 
+    /**
+     * Gets the 'configurator_service_simple' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \ConfClass A ConfClass instance.
+     */
+    protected function getConfiguratorServiceSimpleService()
+    {
+        return $this->services['configurator_service_simple'] = new \ConfClass('bar');
+    }
+
+    /**
+     * Gets the 'factory_simple' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \SimpleFactoryClass A SimpleFactoryClass instance.
+     */
+    protected function getFactorySimpleService()
+    {
+        return $this->services['factory_simple'] = new \SimpleFactoryClass('foo');
+    }
+
     /**
      * Gets the 'inlined' service.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 5386b12a99457..4fd1ac90f3faf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -30,10 +30,12 @@ public function __construct()
             'bar' => 'getBarService',
             'baz' => 'getBazService',
             'configured_service' => 'getConfiguredServiceService',
+            'configured_service_simple' => 'getConfiguredServiceSimpleService',
             'decorator_service' => 'getDecoratorServiceService',
             'decorator_service_with_name' => 'getDecoratorServiceWithNameService',
             'deprecated_service' => 'getDeprecatedServiceService',
             'factory_service' => 'getFactoryServiceService',
+            'factory_service_simple' => 'getFactoryServiceSimpleService',
             'foo' => 'getFooService',
             'foo.baz' => 'getFoo_BazService',
             'foo_bar' => 'getFooBarService',
@@ -114,6 +116,23 @@ protected function getConfiguredServiceService()
         return $instance;
     }
 
+    /**
+     * Gets the 'configured_service_simple' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \stdClass A stdClass instance.
+     */
+    protected function getConfiguredServiceSimpleService()
+    {
+        $this->services['configured_service_simple'] = $instance = new \stdClass();
+
+        (new \ConfClass('bar'))->configureStdClass($instance);
+
+        return $instance;
+    }
+
     /**
      * Gets the 'decorator_service' service.
      *
@@ -170,6 +189,19 @@ protected function getFactoryServiceService()
         return $this->services['factory_service'] = $this->get('foo.baz')->getInstance();
     }
 
+    /**
+     * Gets the 'factory_service_simple' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar A Bar instance.
+     */
+    protected function getFactoryServiceSimpleService()
+    {
+        return $this->services['factory_service_simple'] = (new \SimpleFactoryClass('foo'))->getInstance();
+    }
+
     /**
      * Gets the 'foo' service.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
index 4ddb8655c55f2..d3974c07b01a7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
@@ -84,6 +84,12 @@
     <service id="configured_service" class="stdClass">
       <configurator service="configurator_service" method="configureStdClass"/>
     </service>
+    <service id="configurator_service_simple" class="ConfClass" public="false">
+      <argument>bar</argument>
+    </service>
+    <service id="configured_service_simple" class="stdClass">
+      <configurator service="configurator_service_simple" method="configureStdClass"/>
+    </service>
     <service id="decorated" class="stdClass"/>
     <service id="decorator_service" class="stdClass" decorates="decorated"/>
     <service id="decorator_service_with_name" class="stdClass" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
@@ -103,6 +109,12 @@
     <service id="service_from_static_method" class="Bar\FooClass">
       <factory class="Bar\FooClass" method="getInstance"/>
     </service>
+    <service id="factory_simple" class="SimpleFactoryClass" public="false">
+      <argument>foo</argument>
+    </service>
+    <service id="factory_service_simple" class="Bar">
+      <factory service="factory_simple" method="getInstance"/>
+    </service>
     <service id="alias_for_foo" alias="foo"/>
     <service id="alias_for_alias" alias="foo"/>
   </services>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index 6efeb37e747d4..4a97dcadffa66 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -67,6 +67,13 @@ services:
     configured_service:
         class: stdClass
         configurator: ['@configurator_service', configureStdClass]
+    configurator_service_simple:
+        class: ConfClass
+        public: false
+        arguments: ['bar']
+    configured_service_simple:
+        class: stdClass
+        configurator: ['@configurator_service_simple', configureStdClass]
     decorated:
         class: stdClass
     decorator_service:
@@ -93,5 +100,12 @@ services:
     service_from_static_method:
         class: Bar\FooClass
         factory: [Bar\FooClass, getInstance]
+    factory_simple:
+        class: SimpleFactoryClass
+        public: false
+        arguments: ['foo']
+    factory_service_simple:
+        class: Bar
+        factory: ['@factory_simple', getInstance]
     alias_for_foo: '@foo'
     alias_for_alias: '@foo'

From 103526b40f6cfc46ad2f627e4e19c8f02cc08276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= <filip@prochazka.su>
Date: Thu, 12 May 2016 17:11:08 +0200
Subject: [PATCH 11/34] Catch \Throwable

---
 src/Symfony/Component/Debug/DebugClassLoader.php          | 4 ++++
 src/Symfony/Component/Debug/ErrorHandler.php              | 6 ++++++
 src/Symfony/Component/OptionsResolver/OptionsResolver.php | 6 ++++++
 src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
index 36afa369301b2..603c814b569ea 100644
--- a/src/Symfony/Component/Debug/DebugClassLoader.php
+++ b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -175,6 +175,10 @@ public function loadClass($class)
         } catch (\Exception $e) {
             ErrorHandler::unstackErrors();
 
+            throw $e;
+        } catch (\Throwable $e) {
+            ErrorHandler::unstackErrors();
+
             throw $e;
         }
 
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
index 33779af3251e7..9c30ffea4461a 100644
--- a/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -447,6 +447,10 @@ public function handleError($type, $message, $file, $line, array $context, array
             } catch (\Exception $e) {
                 $this->isRecursive = false;
 
+                throw $e;
+            } catch (\Throwable $e) {
+                $this->isRecursive = false;
+
                 throw $e;
             }
         }
@@ -555,6 +559,8 @@ public static function handleFatalError(array $error = null)
             }
         } catch (\Exception $exception) {
             // Handled below
+        } catch (\Throwable $exception) {
+            // Handled below
         }
 
         if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index e0578af71781d..bc763202f228a 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -861,6 +861,9 @@ public function offsetGet($option)
             } catch (\Exception $e) {
                 unset($this->calling[$option]);
                 throw $e;
+            } catch (\Throwable $e) {
+                unset($this->calling[$option]);
+                throw $e;
             }
             unset($this->calling[$option]);
             // END
@@ -963,6 +966,9 @@ public function offsetGet($option)
             } catch (\Exception $e) {
                 unset($this->calling[$option]);
                 throw $e;
+            } catch (\Throwable $e) {
+                unset($this->calling[$option]);
+                throw $e;
             }
             unset($this->calling[$option]);
             // END
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
index cc4b2ef498974..1035bd70c292f 100644
--- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -141,6 +141,8 @@ public function dump(Data $data, $output = null)
             $this->dumpLine(-1);
         } catch (\Exception $exception) {
             // Re-thrown below
+        } catch (\Throwable $exception) {
+            // Re-thrown below
         }
         if ($output) {
             $this->setOutput($prevOutput);

From de671f4cb2299f46fdbbd43e3bc747e813b0a90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= <filip@prochazka.su>
Date: Thu, 12 May 2016 17:11:08 +0200
Subject: [PATCH 12/34] Catch \Throwable

---
 .../Component/DependencyInjection/Compiler/AutowirePass.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index e4457d4608451..7bb0516dc02e2 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -44,8 +44,8 @@ public function process(ContainerBuilder $container)
                     $this->completeDefinition($id, $definition);
                 }
             }
-        } catch (\Error $e) {
         } catch (\Exception $e) {
+        } catch (\Throwable $e) {
         }
 
         spl_autoload_unregister($throwingAutoloader);

From 3234ca491c20f3b173448115838056ac284b8c80 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Thu, 19 May 2016 21:50:23 +0200
Subject: [PATCH 13/34] fix removed commands wording in upgrade file

---
 UPGRADE-3.0.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 35823d8aaf234..aef162311c169 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -1604,8 +1604,7 @@ UPGRADE FROM 2.x to 3.0
 
 ### WebProfiler
 
- * The `profiler:import` and `profiler:export` commands have been deprecated and
-   will be removed in 3.0.
+ * The `profiler:import` and `profiler:export` commands have been removed.
 
  * All the profiler storages different than `FileProfilerStorage` have been
    removed. The removed classes are:

From c73f34d2bc19d87a73a7b43482546e855db18354 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 20 May 2016 13:48:17 +0200
Subject: [PATCH 14/34] [Config] Allow schemed path in FileResource

---
 src/Symfony/Component/Config/Resource/FileResource.php    | 4 ++++
 .../Component/Config/Tests/Resource/FileResourceTest.php  | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
index f94640fffc34c..65a195f5d2877 100644
--- a/src/Symfony/Component/Config/Resource/FileResource.php
+++ b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -36,6 +36,10 @@ public function __construct($resource)
     {
         $this->resource = realpath($resource);
 
+        if (false === $this->resource && file_exists($resource)) {
+            $this->resource = $resource;
+        }
+
         if (false === $this->resource) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $resource));
         }
diff --git a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
index 4151f66bc5cac..6a168e6351d53 100644
--- a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
@@ -21,7 +21,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
+        $this->file = sys_get_temp_dir().'/tmp.xml';
         $this->time = time();
         touch($this->file, $this->time);
         $this->resource = new FileResource($this->file);
@@ -41,6 +41,12 @@ public function testGetResource()
         $this->assertSame(realpath($this->file), $this->resource->getResource(), '->getResource() returns the path to the resource');
     }
 
+    public function testGetResourceWithScheme()
+    {
+        $resource = new FileResource('file://'.$this->file);
+        $this->assertSame('file://'.$this->file, $resource->getResource(), '->getResource() returns the path to the schemed resource');
+    }
+
     public function testToString()
     {
         $this->assertSame(realpath($this->file), (string) $this->resource);

From cd66a452c6576fd308716f1c20905c08d20903f2 Mon Sep 17 00:00:00 2001
From: bradbyu <brad.neeley@gmail.com>
Date: Fri, 13 May 2016 10:45:14 -0400
Subject: [PATCH 15/34] Update UPGRADE FROM 2.x to 3.0

---
 UPGRADE-3.0.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 475fcbbc80d56..467c13e6448ca 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -132,7 +132,10 @@ UPGRADE FROM 2.x to 3.0
 
 ### Form
 
- *  The `ChoiceToBooleanArrayTransformer`, `ChoicesToBooleanArrayTransformer`,
+ * The `max_length` option was removed. Use the `attr` option instead by setting it to
+   an `array` with a `maxlength` key.
+
+ * The `ChoiceToBooleanArrayTransformer`, `ChoicesToBooleanArrayTransformer`,
     `FixRadioInputListener`, and `FixCheckboxInputListener` classes were removed.
 
  * The `choice_list` option of `ChoiceType` was removed.

From 94e4706609b5bfe5f0ac2c26f53141042a65b55c Mon Sep 17 00:00:00 2001
From: Peter Rehm <peter.rehm@renvest.de>
Date: Thu, 19 May 2016 16:20:34 +0200
Subject: [PATCH 16/34] Fixed server status command when port has been omitted

---
 .../Bundle/FrameworkBundle/Command/ServerStatusCommand.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStatusCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStatusCommand.php
index 2c6d2c49ff09c..fa5c537a0c97a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStatusCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStatusCommand.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -31,6 +32,7 @@ protected function configure()
         $this
             ->setDefinition(array(
                 new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1:8000'),
+                new InputOption('port', 'p', InputOption::VALUE_REQUIRED, 'Address port number', '8000'),
             ))
             ->setName('server:status')
             ->setDescription('Outputs the status of the built-in web server for the given address')
@@ -44,6 +46,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $address = $input->getArgument('address');
 
+        if (false === strpos($address, ':')) {
+            $address = $address.':'.$input->getOption('port');
+        }
+
         // remove an orphaned lock file
         if (file_exists($this->getLockFile($address)) && !$this->isServerRunning($address)) {
             unlink($this->getLockFile($address));

From a4b1fa669432ff433df65a7e89e122c3d7d8b892 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Sat, 14 May 2016 17:57:37 +0200
Subject: [PATCH 17/34] chomp newlines only at the end of YAML documents

---
 src/Symfony/Component/Yaml/Parser.php         | 26 ++++++++++++++-----
 .../Component/Yaml/Tests/ParserTest.php       |  3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index a37e3e69484cb..67f780aaae376 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -25,6 +25,7 @@ class Parser
     const FOLDED_SCALAR_PATTERN = self::BLOCK_SCALAR_HEADER_PATTERN;
 
     private $offset = 0;
+    private $totalNumberOfLines;
     private $lines = array();
     private $currentLineNb = -1;
     private $currentLine = '';
@@ -33,11 +34,13 @@ class Parser
     /**
      * Constructor.
      *
-     * @param int $offset The offset of YAML document (used for line numbers in error messages)
+     * @param int      $offset             The offset of YAML document (used for line numbers in error messages)
+     * @param int|null $totalNumberOfLines The overall number of lines being parsed
      */
-    public function __construct($offset = 0)
+    public function __construct($offset = 0, $totalNumberOfLines = null)
     {
         $this->offset = $offset;
+        $this->totalNumberOfLines = $totalNumberOfLines;
     }
 
     /**
@@ -61,6 +64,10 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
         $value = $this->cleanup($value);
         $this->lines = explode("\n", $value);
 
+        if (null === $this->totalNumberOfLines) {
+            $this->totalNumberOfLines = count($this->lines);
+        }
+
         if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
             $mbEncoding = mb_internal_encoding();
             mb_internal_encoding('UTF-8');
@@ -93,7 +100,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                 // array
                 if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
                     $c = $this->getRealCurrentLineNb() + 1;
-                    $parser = new self($c);
+                    $parser = new self($c, $this->totalNumberOfLines);
                     $parser->refs = &$this->refs;
                     $data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport);
                 } else {
@@ -102,7 +109,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                     ) {
                         // this is a compact notation element, add to next block and parse
                         $c = $this->getRealCurrentLineNb();
-                        $parser = new self($c);
+                        $parser = new self($c, $this->totalNumberOfLines);
                         $parser->refs = &$this->refs;
 
                         $block = $values['value'];
@@ -153,7 +160,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                             $value = $this->getNextEmbedBlock();
                         }
                         $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new self($c);
+                        $parser = new self($c, $this->totalNumberOfLines);
                         $parser->refs = &$this->refs;
                         $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport);
 
@@ -190,7 +197,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                         $data[$key] = null;
                     } else {
                         $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new self($c);
+                        $parser = new self($c, $this->totalNumberOfLines);
                         $parser->refs = &$this->refs;
                         $data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
                     }
@@ -528,6 +535,8 @@ private function parseBlockScalar($style, $chomping = '', $indentation = 0)
         if ($notEOF) {
             $blockLines[] = '';
             $this->moveToPreviousLine();
+        } elseif (!$notEOF && !$this->isCurrentLineLastLineInDocument()) {
+            $blockLines[] = '';
         }
 
         // folded style
@@ -634,6 +643,11 @@ private function isCurrentLineComment()
         return '' !== $ltrimmedLine && $ltrimmedLine[0] === '#';
     }
 
+    private function isCurrentLineLastLineInDocument()
+    {
+        return ($this->offset + $this->currentLineNb) >= ($this->totalNumberOfLines - 1);
+    }
+
     /**
      * Cleanups a YAML string to be parsed.
      *
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 34cc81b2d353a..6645c36108069 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -826,6 +826,7 @@ public function getCommentLikeStringInScalarBlockData()
 foo
 # bar
 baz
+
 EOT
                     ,
                 ),
@@ -854,7 +855,7 @@ public function getCommentLikeStringInScalarBlockData()
         $expected = array(
             'foo' => array(
                 'bar' => array(
-                    'scalar-block' => 'line1 line2>',
+                    'scalar-block' => "line1 line2>\n",
                 ),
                 'baz' => array(
                     'foobar' => null,

From c2f7fedfd6494ac8e97347e554b0d3d16f7086eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sun, 22 May 2016 13:47:44 +0200
Subject: [PATCH 18/34] [Serializer] Add test for ignored attributes during
 denormalization

---
 .../Tests/Normalizer/ObjectNormalizerTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index c0602d7fa6b7d..398a579b9fa75 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -324,6 +324,19 @@ public function testIgnoredAttributes()
         );
     }
 
+    public function testIgnoredAttributesDenormalize()
+    {
+        $this->normalizer->setIgnoredAttributes(array('fooBar', 'bar', 'baz'));
+
+        $obj = new ObjectDummy();
+        $obj->setFoo('foo');
+
+        $this->assertEquals(
+            $obj,
+            $this->normalizer->denormalize(array('fooBar' => 'fooBar', 'foo' => 'foo', 'baz' => 'baz'), __NAMESPACE__.'\ObjectDummy')
+        );
+    }
+
     public function provideCallbacks()
     {
         return array(

From 717e1a9e47d0899efcb65676cf10285a43a03a23 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Sun, 22 May 2016 18:02:36 +0200
Subject: [PATCH 19/34] [Yaml] properly handle unindented collections

---
 src/Symfony/Component/Yaml/Parser.php         |  2 +-
 .../Component/Yaml/Tests/ParserTest.php       | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index a37e3e69484cb..d27968bb40827 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -711,7 +711,7 @@ private function isNextLineUnIndentedCollection()
      */
     private function isStringUnIndentedCollectionItem()
     {
-        return 0 === strpos($this->currentLine, '- ');
+        return '-' === rtrim($this->currentLine) || 0 === strpos($this->currentLine, '- ');
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 34cc81b2d353a..ba4064272a827 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -557,6 +557,34 @@ public function testSequenceInAMapping()
         );
     }
 
+    public function testSequenceInMappingStartedBySingleDashLine()
+    {
+        $yaml = <<<EOT
+a:
+-
+  b:
+  -
+    bar: baz
+- foo
+d: e
+EOT;
+        $expected = array(
+            'a' => array(
+                array(
+                    'b' => array(
+                        array(
+                            'bar' => 'baz',
+                        ),
+                    ),
+                ),
+                'foo',
+            ),
+            'd' => 'e',
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
+
     /**
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      */

From 02070f9fd353df6395db1cff0a46eb0ea3cbb605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Mor=C3=A1vek=20=28moravek=2Emartin=29?=
 <moravek.martin@gmail.com>
Date: Sun, 22 May 2016 21:49:29 +0900
Subject: [PATCH 20/34] People - person singularization

---
 src/Symfony/Component/PropertyAccess/StringUtil.php           | 3 +++
 src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/Symfony/Component/PropertyAccess/StringUtil.php b/src/Symfony/Component/PropertyAccess/StringUtil.php
index 248a6483d8b0a..caa8c3d7e1a0d 100644
--- a/src/Symfony/Component/PropertyAccess/StringUtil.php
+++ b/src/Symfony/Component/PropertyAccess/StringUtil.php
@@ -124,6 +124,9 @@ class StringUtil
 
         // chateaux (chateau)
         array('xuae', 4, false, true, 'eau'),
+
+        // people (person)
+        array('elpoep', 6, true, true, 'person'),
     );
 
     /**
diff --git a/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php b/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
index 0fd6bb69b2956..983e355cb9038 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
@@ -107,6 +107,8 @@ public function singularifyProvider()
             array('objectives', 'objective'),
             array('oxen', 'ox'),
             array('parties', 'party'),
+            array('people', 'person'),
+            array('persons', 'person'),
             array('phenomena', array('phenomenon', 'phenomenum')),
             array('photos', 'photo'),
             array('pianos', 'piano'),

From 55d9a7a7324371feb20fdea3103669350b544f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Mor=C3=A1vek=20=28moravek=2Emartin=29?=
 <moravek.martin@gmail.com>
Date: Sat, 21 May 2016 01:03:47 +0900
Subject: [PATCH 21/34] Added people - person inflection

---
 src/Symfony/Component/Inflector/Inflector.php           | 3 +++
 src/Symfony/Component/Inflector/Tests/InflectorTest.php | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/Symfony/Component/Inflector/Inflector.php b/src/Symfony/Component/Inflector/Inflector.php
index 0fc58982fe897..7b227c5ac60a8 100644
--- a/src/Symfony/Component/Inflector/Inflector.php
+++ b/src/Symfony/Component/Inflector/Inflector.php
@@ -126,6 +126,9 @@ final class Inflector
 
         // chateaux (chateau)
         array('xuae', 4, false, true, 'eau'),
+
+        // people (person)
+        array('elpoep', 6, true, true, 'person'),
     );
 
     /**
diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
index 0f3643374a5b3..43aa682f37565 100644
--- a/src/Symfony/Component/Inflector/Tests/InflectorTest.php
+++ b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@@ -107,6 +107,8 @@ public function singularizeProvider()
             array('objectives', 'objective'),
             array('oxen', 'ox'),
             array('parties', 'party'),
+            array('people', 'person'),
+            array('persons', 'person'),
             array('phenomena', array('phenomenon', 'phenomenum')),
             array('photos', 'photo'),
             array('pianos', 'piano'),

From 9bdaba48018b459bb8fdc3673e6155e0e418adb7 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Mon, 23 May 2016 11:57:38 +0200
Subject: [PATCH 22/34] [Yaml] fix exception contexts

---
 src/Symfony/Component/Yaml/Parser.php           | 8 ++++----
 src/Symfony/Component/Yaml/Tests/ParserTest.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 46e7549749a48..2739723c7e78c 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -88,7 +88,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
             $isRef = $isInPlace = $isProcessed = false;
             if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
                 if ($context && 'mapping' == $context) {
-                    throw new ParseException('You cannot define a sequence item when in a mapping');
+                    throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                 }
                 $context = 'sequence';
 
@@ -127,7 +127,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                 }
             } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) {
                 if ($context && 'sequence' == $context) {
-                    throw new ParseException('You cannot define a mapping item when in a sequence');
+                    throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine);
                 }
                 $context = 'mapping';
 
@@ -214,7 +214,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
             } else {
                 // multiple documents are not supported
                 if ('---' === $this->currentLine) {
-                    throw new ParseException('Multiple documents are not supported.');
+                    throw new ParseException('Multiple documents are not supported.', $this->currentLineNb + 1, $this->currentLine);
                 }
 
                 // 1-liner optionally followed by newline(s)
@@ -449,7 +449,7 @@ private function parseValue($value, $exceptionOnInvalidType, $objectSupport)
             }
 
             if (!array_key_exists($value, $this->refs)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLine);
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLineNb + 1, $this->currentLine);
             }
 
             return $this->refs[$value];
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index c3fc6b2ada7ce..87f0cdbb1bb7b 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -525,7 +525,7 @@ public function testShortcutKeyUnindentedCollectionException()
 
     /**
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage Multiple documents are not supported.
+     * @expectedExceptionMessageRegExp /^Multiple documents are not supported.+/
      */
     public function testMultipleDocumentsNotSupportedException()
     {

From 58ac241c1d56b1d6b23976476a58c0533fa1c5ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sun, 22 May 2016 13:56:26 +0200
Subject: [PATCH 23/34] [Serializer] ObjectNormalizer: add missing parameters

---
 .../Component/Serializer/Normalizer/ObjectNormalizer.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index fc774e6563686..2c2457b8ac81f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -68,14 +68,14 @@ protected function extractAttributes($object, $format = null, array $context = a
                 $attributeName = lcfirst(substr($name, 2));
             }
 
-            if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName)) {
+            if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName, $format, $context)) {
                 $attributes[$attributeName] = true;
             }
         }
 
         // properties
         foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
-            if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name)) {
+            if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
                 continue;
             }
 

From 29b4115d1a408105c5395393503beea39cb1669f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sun, 22 May 2016 13:53:30 +0200
Subject: [PATCH 24/34] [Serializer] AbstractObjectNormalizer: be sure that
 isAllowedAttribute is called

---
 .../Serializer/Normalizer/AbstractObjectNormalizer.php       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index d39023a4fd0f2..983f5a704c0ba 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -182,10 +182,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                 $attribute = $this->nameConverter->denormalize($attribute);
             }
 
-            $allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
-            $ignored = in_array($attribute, $this->ignoredAttributes);
-
-            if (!$allowed || $ignored) {
+            if (($allowedAttributes !== false && !in_array($attribute, $allowedAttributes)) || !$this->isAllowedAttribute($class, $attribute, $format, $context)) {
                 continue;
             }
 

From 9461750bd0703a01a31c3cdcebf922cda404d14d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 25 May 2016 09:47:04 +0200
Subject: [PATCH 25/34] [Cache] Drop counting hit/miss in ProxyAdapter

---
 .../Component/Cache/Adapter/ProxyAdapter.php  | 36 ++-----------------
 .../Cache/Tests/Adapter/ProxyAdapterTest.php  | 17 ---------
 2 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
index ec90e63c469d6..d4e503cf8ba07 100644
--- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -24,8 +24,6 @@ class ProxyAdapter implements AdapterInterface
     private $namespace;
     private $namespaceLen;
     private $createCacheItem;
-    private $hits = 0;
-    private $misses = 0;
 
     public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
     {
@@ -54,13 +52,8 @@ public function getItem($key)
     {
         $f = $this->createCacheItem;
         $item = $this->pool->getItem($this->getId($key));
-        if ($isHit = $item->isHit()) {
-            ++$this->hits;
-        } else {
-            ++$this->misses;
-        }
 
-        return $f($key, $item->get(), $isHit);
+        return $f($key, $item->get(), $item->isHit());
     }
 
     /**
@@ -158,39 +151,14 @@ private function generateItems($items)
         $f = $this->createCacheItem;
 
         foreach ($items as $key => $item) {
-            if ($isHit = $item->isHit()) {
-                ++$this->hits;
-            } else {
-                ++$this->misses;
-            }
             if ($this->namespaceLen) {
                 $key = substr($key, $this->namespaceLen);
             }
 
-            yield $key => $f($key, $item->get(), $isHit);
+            yield $key => $f($key, $item->get(), $item->isHit());
         }
     }
 
-    /**
-     * Returns the number of cache read hits.
-     *
-     * @return int
-     */
-    public function getHits()
-    {
-        return $this->hits;
-    }
-
-    /**
-     * Returns the number of cache read misses.
-     *
-     * @return int
-     */
-    public function getMisses()
-    {
-        return $this->misses;
-    }
-
     private function getId($key)
     {
         CacheItem::validateKey($key);
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
index 58594b0e1ef0d..76606e256eea6 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
@@ -29,21 +29,4 @@ public function createCachePool()
     {
         return new ProxyAdapter(new ArrayAdapter());
     }
-
-    public function testGetHitsMisses()
-    {
-        $pool = $this->createCachePool();
-
-        $this->assertSame(0, $pool->getHits());
-        $this->assertSame(0, $pool->getMisses());
-
-        $bar = $pool->getItem('bar');
-        $this->assertSame(0, $pool->getHits());
-        $this->assertSame(1, $pool->getMisses());
-
-        $pool->save($bar->set('baz'));
-        $bar = $pool->getItem('bar');
-        $this->assertSame(1, $pool->getHits());
-        $this->assertSame(1, $pool->getMisses());
-    }
 }

From 37cacc4874856128babf6130f7fec18708fd0fcb Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Wed, 25 May 2016 22:21:27 +0200
Subject: [PATCH 26/34] [Serializer][#18837] adding a test

---
 .../AbstractObjectNormalizerTest.php          | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php

diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
new file mode 100644
index 0000000000000..5660dbc361d7d
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
+
+class AbstractObjectNormalizerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testDenormalize()
+    {
+        $normalizer = new AbstractObjectNormalizerDummy();
+        $normalizedData = $normalizer->denormalize(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), __NAMESPACE__.'\Dummy');
+
+        $this->assertSame('foo', $normalizedData->foo);
+        $this->assertNull($normalizedData->bar);
+        $this->assertSame('baz', $normalizedData->baz);
+    }
+}
+
+class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
+{
+    protected function extractAttributes($object, $format = null, array $context = array())
+    {
+    }
+
+    protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
+    {
+    }
+
+    protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
+    {
+        $object->$attribute = $value;
+    }
+
+    protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = array())
+    {
+        return in_array($attribute, array('foo', 'baz'));
+    }
+}
+
+class Dummy
+{
+    public $foo;
+    public $bar;
+    public $baz;
+}

From dbf45e4a76b7f424fda62946546336e584852463 Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Thu, 26 May 2016 03:56:44 +0200
Subject: [PATCH 27/34] [Ldap] Fixed issue with Entry password attribute
 containing array of values and made password attribute configurable

---
 .../Security/UserProvider/LdapFactory.php     |   2 +
 .../Core/Tests/User/LdapUserProviderTest.php  | 139 +++++++++++++++++-
 .../Security/Core/User/LdapUserProvider.php   |  41 +++++-
 3 files changed, 177 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
index 2612bf522149c..ecaf35364db91 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -35,6 +35,7 @@ public function create(ContainerBuilder $container, $id, $config)
             ->replaceArgument(4, $config['default_roles'])
             ->replaceArgument(5, $config['uid_key'])
             ->replaceArgument(6, $config['filter'])
+            ->replaceArgument(7, $config['password_attribute'])
         ;
     }
 
@@ -58,6 +59,7 @@ public function addConfiguration(NodeDefinition $node)
                 ->end()
                 ->scalarNode('uid_key')->defaultValue('sAMAccountName')->end()
                 ->scalarNode('filter')->defaultValue('({uid_key}={username})')->end()
+                ->scalarNode('password_attribute')->defaultNull()->end()
             ->end()
         ;
     }
diff --git a/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
index 6876eec8df997..b942e76da1154 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
@@ -105,7 +105,10 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapEntry()
         $provider->loadUserByUsername('foo');
     }
 
-    public function testSuccessfulLoadUserByUsername()
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
+     */
+    public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
     {
         $result = $this->getMock(CollectionInterface::class);
         $query = $this->getMock(QueryInterface::class);
@@ -120,8 +123,95 @@ public function testSuccessfulLoadUserByUsername()
             ->method('offsetGet')
             ->with(0)
             ->will($this->returnValue(new Entry('foo', array(
-                    'sAMAccountName' => 'foo',
-                    'userpassword' => 'bar',
+                    'sAMAccountName' => array('foo'),
+                    'userpassword' => array('bar', 'baz'),
+                )
+            )))
+        ;
+        $result
+            ->expects($this->once())
+            ->method('count')
+            ->will($this->returnValue(1))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('escape')
+            ->will($this->returnValue('foo'))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('query')
+            ->will($this->returnValue($query))
+        ;
+
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
+        $this->assertInstanceOf(
+            'Symfony\Component\Security\Core\User\User',
+            $provider->loadUserByUsername('foo')
+        );
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
+     */
+    public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
+    {
+        $result = $this->getMock(CollectionInterface::class);
+        $query = $this->getMock(QueryInterface::class);
+        $query
+            ->expects($this->once())
+            ->method('execute')
+            ->will($this->returnValue($result))
+        ;
+        $ldap = $this->getMock(LdapInterface::class);
+        $result
+            ->expects($this->once())
+            ->method('offsetGet')
+            ->with(0)
+            ->will($this->returnValue(new Entry('foo', array(
+                    'sAMAccountName' => array('foo'),
+                )
+            )))
+        ;
+        $result
+            ->expects($this->once())
+            ->method('count')
+            ->will($this->returnValue(1))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('escape')
+            ->will($this->returnValue('foo'))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('query')
+            ->will($this->returnValue($query))
+        ;
+
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
+        $this->assertInstanceOf(
+            'Symfony\Component\Security\Core\User\User',
+            $provider->loadUserByUsername('foo')
+        );
+    }
+
+    public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttribute()
+    {
+        $result = $this->getMock(CollectionInterface::class);
+        $query = $this->getMock(QueryInterface::class);
+        $query
+            ->expects($this->once())
+            ->method('execute')
+            ->will($this->returnValue($result))
+        ;
+        $ldap = $this->getMock(LdapInterface::class);
+        $result
+            ->expects($this->once())
+            ->method('offsetGet')
+            ->with(0)
+            ->will($this->returnValue(new Entry('foo', array(
+                    'sAMAccountName' => array('foo'),
                 )
             )))
         ;
@@ -147,4 +237,47 @@ public function testSuccessfulLoadUserByUsername()
             $provider->loadUserByUsername('foo')
         );
     }
+
+    public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
+    {
+        $result = $this->getMock(CollectionInterface::class);
+        $query = $this->getMock(QueryInterface::class);
+        $query
+            ->expects($this->once())
+            ->method('execute')
+            ->will($this->returnValue($result))
+        ;
+        $ldap = $this->getMock(LdapInterface::class);
+        $result
+            ->expects($this->once())
+            ->method('offsetGet')
+            ->with(0)
+            ->will($this->returnValue(new Entry('foo', array(
+                    'sAMAccountName' => array('foo'),
+                    'userpassword' => array('bar'),
+                )
+            )))
+        ;
+        $result
+            ->expects($this->once())
+            ->method('count')
+            ->will($this->returnValue(1))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('escape')
+            ->will($this->returnValue('foo'))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('query')
+            ->will($this->returnValue($query))
+        ;
+
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
+        $this->assertInstanceOf(
+            'Symfony\Component\Security\Core\User\User',
+            $provider->loadUserByUsername('foo')
+        );
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
index a37981cc3f515..e722c98e6d687 100644
--- a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Core\User;
 
 use Symfony\Component\Ldap\Entry;
+use Symfony\Component\Security\Core\Exception\InvalidArgumentException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Ldap\Exception\ConnectionException;
@@ -31,6 +32,7 @@ class LdapUserProvider implements UserProviderInterface
     private $searchPassword;
     private $defaultRoles;
     private $defaultSearch;
+    private $passwordAttribute;
 
     /**
      * @param LdapInterface $ldap
@@ -41,7 +43,7 @@ class LdapUserProvider implements UserProviderInterface
      * @param string        $uidKey
      * @param string        $filter
      */
-    public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = array(), $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})')
+    public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = array(), $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})', $passwordAttribute = null)
     {
         $this->ldap = $ldap;
         $this->baseDn = $baseDn;
@@ -49,6 +51,7 @@ public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $sea
         $this->searchPassword = $searchPassword;
         $this->defaultRoles = $defaultRoles;
         $this->defaultSearch = str_replace('{uid_key}', $uidKey, $filter);
+        $this->passwordAttribute = $passwordAttribute;
     }
 
     /**
@@ -99,8 +102,42 @@ public function supportsClass($class)
         return $class === 'Symfony\Component\Security\Core\User\User';
     }
 
+    /**
+     * Loads a user from an LDAP entry.
+     *
+     * @param string $username
+     * @param Entry  $entry
+     *
+     * @return User
+     */
     private function loadUser($username, Entry $entry)
     {
-        return new User($username, $entry->getAttribute('userpassword'), $this->defaultRoles);
+        $password = $this->getPassword($entry);
+
+        return new User($username, $password, $this->defaultRoles);
+    }
+
+    /**
+     * Fetches the password from an LDAP entry.
+     *
+     * @param null|Entry $entry
+     */
+    private function getPassword(Entry $entry)
+    {
+        if (null === $this->passwordAttribute) {
+            return;
+        }
+
+        if (!$entry->hasAttribute($this->passwordAttribute)) {
+            throw new InvalidArgumentException(sprintf('Missing attribute "%s" for user "%s".', $this->passwordAttribute, $entry->getDn()));
+        }
+
+        $values = $entry->getAttribute($this->passwordAttribute);
+
+        if (1 !== count($values)) {
+            throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $this->passwordAttribute));
+        }
+
+        return $values[0];
     }
 }

From 91a2f5dea193d01596428fe92d2b5333d1a4730d Mon Sep 17 00:00:00 2001
From: Linnaea Von Lavia <linnaea@users.noreply.github.com>
Date: Thu, 26 May 2016 10:56:28 +0800
Subject: [PATCH 28/34] Fix js comment in profiler

---
 .../Resources/views/Profiler/base_js.html.twig                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index d9f92ca26a33e..23e05030c5862 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -81,8 +81,8 @@
             requestStack = [],
 
             extractHeaders = function(xhr, stackElement) {
-                // Here we avoid to call xhr.getResponseHeader in order to
-                // prevent polluting the console with CORS security errors
+                /* Here we avoid to call xhr.getResponseHeader in order to */
+                /* prevent polluting the console with CORS security errors */
                 var allHeaders = xhr.getAllResponseHeaders();
                 var ret;
 

From 7cb76558ceca37d06b366dbe46aceb6ae274306d Mon Sep 17 00:00:00 2001
From: Peter Rehm <peter.rehm@renvest.de>
Date: Wed, 25 May 2016 08:27:19 +0200
Subject: [PATCH 29/34] [Console][DX] Fixed ambiguous error message when using
 a duplicate option shortcut

---
 .../Component/Console/Command/Command.php     |  4 +--
 .../Console/Tests/ApplicationTest.php         | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index e4b8fb0aa7e9b..9385b9d2a6680 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -287,14 +287,14 @@ public function mergeApplicationDefinition($mergeArgs = true)
             return;
         }
 
+        $this->definition->addOptions($this->application->getDefinition()->getOptions());
+
         if ($mergeArgs) {
             $currentArguments = $this->definition->getArguments();
             $this->definition->setArguments($this->application->getDefinition()->getArguments());
             $this->definition->addArguments($currentArguments);
         }
 
-        $this->definition->addOptions($this->application->getDefinition()->getOptions());
-
         $this->applicationDefinitionMerged = true;
         if ($mergeArgs) {
             $this->applicationDefinitionMergedWithArgs = true;
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 8e44b7ae17267..8637b0f58f39c 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -645,6 +645,33 @@ public function testRunReturnsExitCodeOneForExceptionCodeZero()
         $this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
     }
 
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage An option with shortcut "e" already exists.
+     */
+    public function testAddingOptionWithDuplicateShortcut()
+    {
+        $dispatcher = new EventDispatcher();
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+        $application->setDispatcher($dispatcher);
+
+        $application->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'Environment'));
+
+        $application
+            ->register('foo')
+            ->setAliases(['f'])
+            ->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))
+            ->setCode(function (InputInterface $input, OutputInterface $output) {})
+        ;
+
+        $input = new ArrayInput(array('command' => 'foo'));
+        $output = new NullOutput();
+
+        $application->run($input, $output);
+    }
+
     /**
      * @expectedException \LogicException
      * @dataProvider getAddingAlreadySetDefinitionElementData

From 963fe1d6350e6c56ad84b1e6b76c3f389d33b130 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Sun, 22 May 2016 12:24:43 +0200
Subject: [PATCH 30/34] [Console] SymfonyStyle: Align multi-line/very-long-line
 blocks

Remove SymfonyStyle::comment() changes (out of scope)

CS Fixes

Add tests
---
 .../Component/Console/Style/SymfonyStyle.php  | 19 ++++++++++++++++---
 .../Style/SymfonyStyle/command/command_10.php | 17 +++++++++++++++++
 .../Style/SymfonyStyle/command/command_9.php  | 11 +++++++++++
 .../Style/SymfonyStyle/output/output_10.txt   |  7 +++++++
 .../Style/SymfonyStyle/output/output_9.txt    |  5 +++++
 .../Console/Tests/Style/SymfonyStyleTest.php  |  2 +-
 6 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt

diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
index 21fc3b92cfee0..03550836cfae8 100644
--- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
+++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -67,23 +67,36 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
     {
         $this->autoPrependBlock();
         $messages = is_array($messages) ? array_values($messages) : array($messages);
+        $indentLength = 0;
         $lines = array();
 
-        // add type
         if (null !== $type) {
-            $messages[0] = sprintf('[%s] %s', $type, $messages[0]);
+            $typePrefix = sprintf('[%s] ', $type);
+            $indentLength = strlen($typePrefix);
+            $lineIndentation = str_repeat(' ', $indentLength);
         }
 
         // wrap and add newlines for each element
         foreach ($messages as $key => $message) {
             $message = OutputFormatter::escape($message);
-            $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL, true)));
+            $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix) - $indentLength, PHP_EOL, true)));
+
+            // prefix each line with a number of spaces equivalent to the type length
+            if (null !== $type) {
+                foreach ($lines as &$line) {
+                    $line = $lineIndentation === substr($line, 0, $indentLength) ? $line : $lineIndentation.$line;
+                }
+            }
 
             if (count($messages) > 1 && $key < count($messages) - 1) {
                 $lines[] = '';
             }
         }
 
+        if (null !== $type) {
+            $lines[0] = substr_replace($lines[0], $typePrefix, 0, $indentLength);
+        }
+
         if ($padding && $this->isDecorated()) {
             array_unshift($lines, '');
             $lines[] = '';
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
new file mode 100644
index 0000000000000..4120df9cb6b64
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php
@@ -0,0 +1,17 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+
+//Ensure that all lines are aligned to the begin of the first line in a very long line block
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output->block(
+        'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
+        'CUSTOM',
+        'fg=white;bg=green',
+        'X ',
+        true
+    );
+};
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
new file mode 100644
index 0000000000000..0f0a4e69d0e6e
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
+
+//Ensure that all lines are aligned to the begin of the first line in a multi-line block
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyleWithForcedLineLength($input, $output);
+    $output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+};
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt
new file mode 100644
index 0000000000000..385c6a283c84d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt
@@ -0,0 +1,7 @@
+
+X [CUSTOM] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et      
+X          dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+X          commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat    
+X          nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit    
+X          anim id est laborum                                                                                          
+
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt
new file mode 100644
index 0000000000000..069c0d5119f7b
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt
@@ -0,0 +1,5 @@
+
+X [CUSTOM] Custom block                                                                                                 
+X                                                                                                                       
+X          Second custom block line                                                                                     
+
diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
index 6bf64129f4221..889a9c82f2dcb 100644
--- a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
+++ b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -57,7 +57,7 @@ public function inputCommandToOutputFilesProvider()
 
     public function testLongWordsBlockWrapping()
     {
-        $word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
+        $word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygovgollhjvhvljfezefeqifzeiqgiqzhrsdgihqzridghqridghqirshdghdghieridgheirhsdgehrsdvhqrsidhqshdgihrsidvqhneriqsdvjzergetsrfhgrstsfhsetsfhesrhdgtesfhbzrtfbrztvetbsdfbrsdfbrn';
         $wordLength = strlen($word);
         $maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
 

From c59a3da6064c30269ef40b48d5424ed2b1eb4ad1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 26 May 2016 10:04:58 +0200
Subject: [PATCH 31/34] fixed PHP 5.3 compat in tests

---
 src/Symfony/Component/Console/Tests/ApplicationTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 8637b0f58f39c..d237721647790 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -661,7 +661,7 @@ public function testAddingOptionWithDuplicateShortcut()
 
         $application
             ->register('foo')
-            ->setAliases(['f'])
+            ->setAliases(array('f'))
             ->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))
             ->setCode(function (InputInterface $input, OutputInterface $output) {})
         ;

From a842b97087a733348c82846241f32ffdae0fcf50 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 26 May 2016 10:21:12 +0200
Subject: [PATCH 32/34] fixed PHP 5.3 compat in tests

---
 .../Tests/Fixtures/Style/SymfonyStyle/command/command_9.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
index 0f0a4e69d0e6e..6420730fd64ad 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
@@ -7,5 +7,5 @@
 //Ensure that all lines are aligned to the begin of the first line in a multi-line block
 return function (InputInterface $input, OutputInterface $output) {
     $output = new SymfonyStyleWithForcedLineLength($input, $output);
-    $output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+    $output->block(array('Custom block', 'Second custom block line'), 'CUSTOM', 'fg=white;bg=green', 'X ', true);
 };

From 73914a391ea6c554df02df450a0d4b927c615f5f Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 26 May 2016 10:30:54 +0200
Subject: [PATCH 33/34] updated CHANGELOG for 3.1.0-RC1

---
 CHANGELOG-3.1.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index 9b183cb3a8c60..cb59a7e2ece03 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -7,6 +7,27 @@ in 3.1 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
 
+* 3.1.0-RC1 (2016-05-26)
+
+ * bug #18879 [Console] SymfonyStyle: Align multi-line/very-long-line blocks (chalasr)
+ * bug #18881 [Security][Ldap] Fixed issue with password attribute containing an array of values. (csarrazi)
+ * bug #18864 [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut (peterrehm)
+ * bug #18883 Fix js comment in profiler (linnaea)
+ * feature #18867 [Cache] Drop counting hit/miss in ProxyAdapter (nicolas-grekas)
+ * bug #18837 [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called (dunglas)
+ * bug #18838 [Serializer] ObjectNormalizer: add missing parameters (dunglas)
+ * bug #18844 [Yaml] fix exception contexts (xabbuh)
+ * bug #18840 [Yaml] properly handle unindented collections (xabbuh)
+ * bug #18765 Catch \Throwable (fprochazka)
+ * bug #18813 Catch \Throwable (fprochazka)
+ * bug #18839 People - person singularization (Keeo)
+ * bug #18820 [Config] Allow schemed paths in FileResource (nicolas-grekas)
+ * bug #18828 [Yaml] chomp newlines only at the end of YAML documents (xabbuh)
+ * bug #18814 Fixed server status command when port has been omitted (peterrehm)
+ * bug #18759 [Validator] Support for DateTimeImmutable (krzysiekpiasecki)
+ * bug #18799 Use levenshtein level for better Bundle matching (j0k3r)
+ * bug #18413 [WebProfilerBundle] Fix CORS ajax security issues (romainneutron)
+
 * 3.1.0-BETA1 (2016-05-13)
 
  * feature #18725 [Ldap] Added the possibility to configure all available Ldap options for connection (csarrazi)

From ebcbca0ba2629abdbfcdc922f10ed1c1516ffcb5 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 26 May 2016 10:31:07 +0200
Subject: [PATCH 34/34] updated VERSION for 3.1.0-RC1

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index e891863321f32..f0280fb4f116e 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '3.1.0-DEV';
+    const VERSION = '3.1.0-RC1';
     const VERSION_ID = 30100;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 1;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = 'RC1';
 
     const END_OF_MAINTENANCE = '01/2017';
     const END_OF_LIFE = '07/2017';