From dd69b8875dc2477a12edc18f1baaf0113c8331b3 Mon Sep 17 00:00:00 2001
From: Julien Falque <julien.falque@gmail.com>
Date: Mon, 7 Nov 2016 20:38:43 +0100
Subject: [PATCH 01/81] Fix bundle commands are not available via find()

---
 .../FrameworkBundle/Console/Application.php   | 10 ++++
 .../Tests/Console/ApplicationTest.php         | 46 +++++++++++--------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index 221a00425069b..6e6aca6043c67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -90,6 +90,16 @@ public function doRun(InputInterface $input, OutputInterface $output)
         return parent::doRun($input, $output);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function find($name)
+    {
+        $this->registerCommands();
+
+        return parent::find($name);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
index fc0e7654db2ca..a944da863f6d0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -32,8 +32,7 @@ public function testBundleInterfaceImplementation()
 
     public function testBundleCommandsAreRegistered()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $bundle = $this->createBundleMock(array());
 
         $kernel = $this->getKernel(array($bundle), true);
 
@@ -46,8 +45,7 @@ public function testBundleCommandsAreRegistered()
 
     public function testBundleCommandsAreRetrievable()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $bundle = $this->createBundleMock(array());
 
         $kernel = $this->getKernel(array($bundle));
 
@@ -60,47 +58,41 @@ public function testBundleCommandsAreRetrievable()
 
     public function testBundleSingleCommandIsRetrievable()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock(array($command));
 
         $kernel = $this->getKernel(array($bundle));
 
         $application = new Application($kernel);
 
-        $command = new Command('example');
-        $application->add($command);
-
         $this->assertSame($command, $application->get('example'));
     }
 
     public function testBundleCommandCanBeFound()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $command = new Command('example');
+
+        $bundle = $this->createBundleMock(array($command));
 
         $kernel = $this->getKernel(array($bundle));
 
         $application = new Application($kernel);
 
-        $command = new Command('example');
-        $application->add($command);
-
         $this->assertSame($command, $application->find('example'));
     }
 
     public function testBundleCommandCanBeFoundByAlias()
     {
-        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
-        $bundle->expects($this->once())->method('registerCommands');
+        $command = new Command('example');
+        $command->setAliases(array('alias'));
+
+        $bundle = $this->createBundleMock(array($command));
 
         $kernel = $this->getKernel(array($bundle));
 
         $application = new Application($kernel);
 
-        $command = new Command('example');
-        $command->setAliases(array('alias'));
-        $application->add($command);
-
         $this->assertSame($command, $application->find('alias'));
     }
 
@@ -167,4 +159,18 @@ private function getKernel(array $bundles, $useDispatcher = false)
 
         return $kernel;
     }
+
+    private function createBundleMock(array $commands)
+    {
+        $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+        $bundle
+            ->expects($this->once())
+            ->method('registerCommands')
+            ->will($this->returnCallback(function (Application $application) use ($commands) {
+                $application->addCommands($commands);
+            }))
+        ;
+
+        return $bundle;
+    }
 }

From bb3ee76d566ad61982b9f3dee0dc2fdee4a9439c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 15 Nov 2016 22:27:40 +0100
Subject: [PATCH 02/81] [Serializer] Optimize max depth checking

---
 .../Normalizer/AbstractObjectNormalizer.php   | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 9ff231e7a426c..577edc1a7067f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\Type;
+use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
@@ -67,9 +68,10 @@ public function normalize($object, $format = null, array $context = array())
         $stack = array();
         $attributes = $this->getAttributes($object, $format, $context);
         $class = get_class($object);
+        $attributesMetadata = $this->classMetadataFactory ? $this->classMetadataFactory->getMetadataFor($class)->getAttributesMetadata() : null;
 
         foreach ($attributes as $attribute) {
-            if ($this->isMaxDepthReached($class, $attribute, $context)) {
+            if (null !== $attributesMetadata && $this->isMaxDepthReached($attributesMetadata, $class, $attribute, $context)) {
                 continue;
             }
 
@@ -303,42 +305,35 @@ private function updateData(array $data, $attribute, $attributeValue)
     /**
      * Is the max depth reached for the given attribute?
      *
-     * @param string $class
-     * @param string $attribute
-     * @param array  $context
+     * @param AttributeMetadataInterface[] $attributesMetadata
+     * @param string                       $class
+     * @param string                       $attribute
+     * @param array                        $context
      *
      * @return bool
      */
-    private function isMaxDepthReached($class, $attribute, array &$context)
+    private function isMaxDepthReached(array $attributesMetadata, $class, $attribute, array &$context)
     {
-        if (!$this->classMetadataFactory || !isset($context[static::ENABLE_MAX_DEPTH])) {
+        if (
+            !isset($context[static::ENABLE_MAX_DEPTH]) ||
+            !isset($attributesMetadata[$attribute]) ||
+            null === $maxDepth = $attributesMetadata[$attribute]->getMaxDepth()
+        ) {
             return false;
         }
 
-        $classMetadata = $this->classMetadataFactory->getMetadataFor($class);
-        $attributesMetadata = $classMetadata->getAttributesMetadata();
-
-        if (!isset($attributesMetadata[$attribute])) {
-            return false;
-        }
+        $key = sprintf(static::DEPTH_KEY_PATTERN, $class, $attribute);
+        if (!isset($context[$key])) {
+            $context[$key] = 1;
 
-        $maxDepth = $attributesMetadata[$attribute]->getMaxDepth();
-        if (null === $maxDepth) {
             return false;
         }
 
-        $key = sprintf(static::DEPTH_KEY_PATTERN, $class, $attribute);
-        $keyExist = isset($context[$key]);
-
-        if ($keyExist && $context[$key] === $maxDepth) {
+        if ($context[$key] === $maxDepth) {
             return true;
         }
 
-        if ($keyExist) {
-            ++$context[$key];
-        } else {
-            $context[$key] = 1;
-        }
+        ++$context[$key];
 
         return false;
     }

From 2acaf5f5112ea353e04879e91e116904d9ebf8e7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 2 Nov 2016 09:57:00 +0100
Subject: [PATCH 03/81] [github] Tweak PR template

---
 .github/PULL_REQUEST_TEMPLATE.md | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 99ba8e00213af..216a2ba4e5625 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,19 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | "master" for new features / 2.7, 2.8 or 3.1 for fixes
+| Branch?       | master / 2.7, 2.8, 3.1 or 3.2 <!--see comment below-->
 | Bug fix?      | yes/no
 | New feature?  | yes/no
 | BC breaks?    | yes/no
 | Deprecations? | yes/no
 | Tests pass?   | yes/no
-| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
+| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
 | License       | MIT
-| Doc PR        | reference to the documentation PR, if any
+| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->
+
+<!--
+- Bug fixes must be submitted against the lowest branch where they apply
+  (lowest branches are regularly merged to upper ones so they get the fixes too).
+- Features and deprecations must be submitted against the master branch.
+- Please fill in this template according to the PR you're about to submit.
+- Replace this comment by a description of what your PR is solving.
+-->

From 70c42f2676eb82ba2d6137919ddf50b41eaa73ee Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 16 Nov 2016 18:59:59 +0100
Subject: [PATCH 04/81] Cast result to int before adding to it

This fixes the occasional warning about non-numeric values when using PHP 7.1
---
 .../Loader/XmlFileLoader.php                  | 23 ++++++++++---------
 .../xml/with_key_outside_collection.xml       |  9 ++++++++
 .../Tests/Loader/XmlFileLoaderTest.php        |  9 ++++++++
 3 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/with_key_outside_collection.xml

diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index e60c2f7df76c1..b3e4ef4d3e7c1 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -346,21 +346,22 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
                 $arg->setAttribute('key', $arg->getAttribute('name'));
             }
 
-            if (!$arg->hasAttribute('key')) {
-                $key = !$arguments ? 0 : max(array_keys($arguments)) + 1;
-            } else {
-                $key = $arg->getAttribute('key');
-            }
-
-            // parameter keys are case insensitive
-            if ('parameter' == $name && $lowercase) {
-                $key = strtolower($key);
-            }
-
             // this is used by DefinitionDecorator to overwrite a specific
             // argument of the parent definition
             if ($arg->hasAttribute('index')) {
                 $key = 'index_'.$arg->getAttribute('index');
+            } elseif (!$arg->hasAttribute('key')) {
+                // Append an empty argument, then fetch its key to overwrite it later
+                $arguments[] = null;
+                $keys = array_keys($arguments);
+                $key = array_pop($keys);
+            } else {
+                $key = $arg->getAttribute('key');
+
+                // parameter keys are case insensitive
+                if ('parameter' == $name && $lowercase) {
+                    $key = strtolower($key);
+                }
             }
 
             switch ($arg->getAttribute('type')) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/with_key_outside_collection.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/with_key_outside_collection.xml
new file mode 100644
index 0000000000000..5f3a2843612df
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/with_key_outside_collection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="Foo">
+      <argument key="type">foo</argument>
+      <argument>bar</argument>
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 2de5915f4ef41..fd4517228430c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -542,4 +542,13 @@ public function testLoadInlinedServices()
         $this->assertSame('Baz', $barConfigurator[0]->getClass());
         $this->assertSame('configureBar', $barConfigurator[1]);
     }
+
+    public function testArgumentWithKeyOutsideCollection()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('with_key_outside_collection.xml');
+
+        $this->assertSame(array('type' => 'foo', 'bar'), $container->getDefinition('foo')->getArguments());
+    }
 }

From 7e8490715c29e02270cee788f09a2b0e43496a5e Mon Sep 17 00:00:00 2001
From: Jules Pietri <heah@heahprod.com>
Date: Sun, 6 Nov 2016 15:11:25 +0100
Subject: [PATCH 05/81] [Form] fixed "empty_value" option deprecation

---
 .../Component/Form/Extension/Core/Type/ChoiceType.php    | 9 +++++++--
 .../Component/Form/Extension/Core/Type/DateType.php      | 4 ++--
 .../Component/Form/Extension/Core/Type/TimeType.php      | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 49bea1aceca09..d376109828718 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -39,6 +39,11 @@
 
 class ChoiceType extends AbstractType
 {
+    /**
+     * @internal To be removed in 3.0
+     */
+    const DEPRECATED_EMPTY_VALUE = '__deprecated_empty_value__';
+
     /**
      * Caches created choice lists.
      *
@@ -336,7 +341,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($that) {
-            if (!is_object($options['empty_value']) || !$options['empty_value'] instanceof \Exception) {
+            if ($that::DEPRECATED_EMPTY_VALUE !== $options['empty_value']) {
                 @trigger_error(sprintf('The form option "empty_value" of the "%s" form type (%s) is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);
 
                 if (null === $placeholder || '' === $placeholder) {
@@ -388,7 +393,7 @@ public function configureOptions(OptionsResolver $resolver)
             'preferred_choices' => array(),
             'group_by' => null,
             'empty_data' => $emptyData,
-            'empty_value' => new \Exception(), // deprecated
+            'empty_value' => self::DEPRECATED_EMPTY_VALUE,
             'placeholder' => $placeholder,
             'error_bubbling' => false,
             'compound' => $compound,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index ae4c6bacf2066..8af7a96f13cd6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -183,7 +183,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
-            if (!is_object($options['empty_value']) || !$options['empty_value'] instanceof \Exception) {
+            if (ChoiceType::DEPRECATED_EMPTY_VALUE !== $options['empty_value']) {
                 @trigger_error('The form option "empty_value" is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', E_USER_DEPRECATED);
 
                 $placeholder = $options['empty_value'];
@@ -218,7 +218,7 @@ public function configureOptions(OptionsResolver $resolver)
             'format' => $format,
             'model_timezone' => null,
             'view_timezone' => null,
-            'empty_value' => new \Exception(), // deprecated
+            'empty_value' => ChoiceType::DEPRECATED_EMPTY_VALUE,
             'placeholder' => $placeholder,
             'html5' => true,
             // Don't modify \DateTime classes by reference, we treat
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 8232170278502..dab0572927be8 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -171,7 +171,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
-            if (!is_object($options['empty_value']) || !$options['empty_value'] instanceof \Exception) {
+            if (ChoiceType::DEPRECATED_EMPTY_VALUE !== $options['empty_value']) {
                 @trigger_error('The form option "empty_value" is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', E_USER_DEPRECATED);
 
                 $placeholder = $options['empty_value'];
@@ -203,7 +203,7 @@ public function configureOptions(OptionsResolver $resolver)
             'with_seconds' => false,
             'model_timezone' => null,
             'view_timezone' => null,
-            'empty_value' => new \Exception(), // deprecated
+            'empty_value' => ChoiceType::DEPRECATED_EMPTY_VALUE,
             'placeholder' => $placeholder,
             'html5' => true,
             // Don't modify \DateTime classes by reference, we treat

From de7b326c7ce13f74eadcb0fbe7dd773a0cbe269b Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Sat, 26 Nov 2016 16:44:35 +0100
Subject: [PATCH 06/81] Maintain the selected panel when redirecting to another
 profile

---
 .../WebProfilerBundle/Resources/views/Profiler/layout.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index 146718ac30c7f..804b03a95ef27 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -39,7 +39,7 @@
                                     {%- else -%}
                                             {{ redirect_route }}
                                     {%- endif %}
-                                    (<a href="{{ path('_profiler', { token: redirect.token }) }}">{{ redirect.token }}</a>)
+                                    (<a href="{{ path('_profiler', { token: redirect.token, panel: app.request.query.get('panel', 'request') }) }}">{{ redirect.token }}</a>)
                                 </dd>
                             </dl>
                         {%- endif %}

From 595a9781e2482e2cd0929a888eb99b8d90696b2c Mon Sep 17 00:00:00 2001
From: Antanas Arvasevicius <antanas.arvasevicius@gmail.com>
Date: Sat, 10 Sep 2016 20:39:00 +0300
Subject: [PATCH 07/81] [DependencyInjection] PhpDumper.php: hasReference()
 should not search references in lazy service arguments.

---
 .../Compiler/CheckCircularReferencesPass.php  | 17 ++++---
 .../DependencyInjection/Dumper/PhpDumper.php  |  7 +++
 .../Tests/Dumper/PhpDumperTest.php            | 51 +++++++++++++++++++
 .../Tests/Fixtures/includes/classes.php       | 30 +++++++++++
 4 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index d7570ddc2c4d1..b6a898736f653 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -60,14 +60,19 @@ private function checkOutEdges(array $edges)
             $id = $node->getId();
 
             if (empty($this->checkedNodes[$id])) {
-                $searchKey = array_search($id, $this->currentPath);
-                $this->currentPath[] = $id;
 
-                if (false !== $searchKey) {
-                    throw new ServiceCircularReferenceException($id, array_slice($this->currentPath, $searchKey));
-                }
+                // * don't check circular dependencies in lazy services.
+                $isLazy = $node->getValue() && $node->getValue()->isLazy();
+                if (!$isLazy) {
+                    $searchKey = array_search($id, $this->currentPath);
+                    $this->currentPath[] = $id;
+
+                    if (false !== $searchKey) {
+                        throw new ServiceCircularReferenceException($id, array_slice($this->currentPath, $searchKey));
+                    }
 
-                $this->checkOutEdges($node->getOutEdges());
+                    $this->checkOutEdges($node->getOutEdges());
+                }
 
                 $this->checkedNodes[$id] = true;
                 array_pop($this->currentPath);
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2f7a01bc081d4..bf5956b394d43 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1293,6 +1293,13 @@ private function hasReference($id, array $arguments, $deep = false, array &$visi
                     $visited[$argumentId] = true;
 
                     $service = $this->container->getDefinition($argumentId);
+
+                    // if exists proxy dumper (proxy-manager) don't search references in lazy services.
+                    // As these services will be instantiated lazily and don't have direct related references.
+                    if ($service->isLazy() && !($this->getProxyDumper() instanceof NullDumper)) {
+                        continue;
+                    }
+
                     $arguments = array_merge($service->getMethodCalls(), $service->getArguments(), $service->getProperties());
 
                     if ($this->hasReference($id, $arguments, $deep, $visited)) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 72215e8c486a5..ab9d5926106a5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Dumper;
 
+use DummyProxyDumper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -19,6 +20,8 @@
 use Symfony\Component\DependencyInjection\Variable;
 use Symfony\Component\ExpressionLanguage\Expression;
 
+require_once __DIR__.'/../Fixtures/includes/classes.php';
+
 class PhpDumperTest extends \PHPUnit_Framework_TestCase
 {
     protected static $fixturesPath;
@@ -286,4 +289,52 @@ public function testInitializePropertiesBeforeMethodCalls()
         $container = new \Symfony_DI_PhpDumper_Test_Properties_Before_Method_Calls();
         $this->assertTrue($container->get('bar')->callPassed(), '->dump() initializes properties before method calls');
     }
+
+    public function testCircularReferenceAllowanceForLazyServices()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->addArgument(new Reference('bar'));
+        $container->register('bar', 'stdClass')->setLazy(true)->addArgument(new Reference('foo'));
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->dump();
+    }
+
+    public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServices()
+    {
+        /*
+         *   test graph:
+         *              [connection] -> [event_manager] --> [entity_manager](lazy)
+         *                                                           |
+         *                                                           --(call)- addEventListener ("@lazy_service")
+         *
+         *              [lazy_service](lazy) -> [entity_manager](lazy)
+         *
+         */
+
+        $container = new ContainerBuilder();
+
+        $eventManagerDefinition = new Definition('stdClass');
+
+        $connectionDefinition = $container->register('connection', 'stdClass');
+        $connectionDefinition->addArgument($eventManagerDefinition);
+
+        $container->register('entity_manager', 'stdClass')
+            ->setLazy(true)
+            ->addArgument(new Reference('connection'));
+
+        $lazyServiceDefinition = $container->register('lazy_service', 'stdClass');
+        $lazyServiceDefinition->setLazy(true);
+        $lazyServiceDefinition->addArgument(new Reference('entity_manager'));
+
+        $eventManagerDefinition->addMethodCall('addEventListener', array(new Reference('lazy_service')));
+
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $dumper->setProxyDumper(new DummyProxyDumper());
+        $dumper->dump();
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
index 48b687c1f4e53..cdc89e42ab3a8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -1,5 +1,8 @@
 <?php
 
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface as ProxyDumper;
+
 function sc_configure($instance)
 {
     $instance->configure();
@@ -76,3 +79,30 @@ public function callPassed()
         return $this->callPassed;
     }
 }
+
+class DummyProxyDumper implements ProxyDumper
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isProxyCandidate(Definition $definition)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProxyFactoryCode(Definition $definition, $id)
+    {
+        return '';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProxyCode(Definition $definition)
+    {
+        return '';
+    }
+}

From 4514c1b0c487c061a0fd2d18afe0f2c6a7e2388b Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Tue, 29 Nov 2016 21:18:47 +0100
Subject: [PATCH 08/81] [Serializer] Add deprecation missing from UPGRADE files

---
 UPGRADE-3.2.md | 5 +++++
 UPGRADE-4.0.md | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
index f4b043c754c66..5862071d94093 100644
--- a/UPGRADE-3.2.md
+++ b/UPGRADE-3.2.md
@@ -116,6 +116,11 @@ HttpFoundation
      - `isInvalid`/`isSuccessful`/`isRedirection`/`isClientError`/`isServerError`
      - `isOk`/`isForbidden`/`isNotFound`/`isRedirect`/`isEmpty`
 
+Serializer
+----------
+
+ * Method `AbstractNormalizer::instantiateObject()` will have a 6th `$format = null` argument in Symfony 4.0. Not defining it when overriding the method is deprecated.
+
 TwigBridge
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 483b7e6ed1447..227e9b93f36e8 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -170,6 +170,8 @@ Serializer
  * The ability to pass a Doctrine `Cache` instance to the `ClassMetadataFactory`
    class has been removed. You should use the `CacheClassMetadataFactory` class
    instead.
+   
+ * Not defining the 6th argument `$format = null` of the `AbstractNormalizer::instantiateObject()` method when overriding it is not supported anymore.
 
 Translation
 -----------

From 597bbdc41845a65e04f7deab7cd0d261791d4ce6 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 30 Nov 2016 09:00:20 +0100
Subject: [PATCH 09/81] Lines length should be 80 or less characters

---
 UPGRADE-3.2.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
index 5862071d94093..97a8aeba029c0 100644
--- a/UPGRADE-3.2.md
+++ b/UPGRADE-3.2.md
@@ -119,7 +119,9 @@ HttpFoundation
 Serializer
 ----------
 
- * Method `AbstractNormalizer::instantiateObject()` will have a 6th `$format = null` argument in Symfony 4.0. Not defining it when overriding the method is deprecated.
+ * Method `AbstractNormalizer::instantiateObject()` will have a 6th
+   `$format = null` argument in Symfony 4.0. Not defining it when overriding
+   the method is deprecated.
 
 TwigBridge
 ----------

From d681c1abc4c2e3e8c616edc7a9aa8ff2582a724f Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 30 Nov 2016 09:01:12 +0100
Subject: [PATCH 10/81] Lines length should be 80 or less characters

---
 UPGRADE-4.0.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 227e9b93f36e8..2cd22e1a1236c 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -171,7 +171,9 @@ Serializer
    class has been removed. You should use the `CacheClassMetadataFactory` class
    instead.
    
- * Not defining the 6th argument `$format = null` of the `AbstractNormalizer::instantiateObject()` method when overriding it is not supported anymore.
+ * Not defining the 6th argument `$format = null` of the
+   `AbstractNormalizer::instantiateObject()` method when overriding it is not
+   supported anymore.
 
 Translation
 -----------

From b5520e92c9ecc5d11741dbcdb1542e17d6cc996e Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 30 Nov 2016 10:16:00 +0100
Subject: [PATCH 11/81] bumped Symfony version to 3.2.1

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

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index b76db82d81b7d..eefd76b16d8f7 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '3.2.0';
-    const VERSION_ID = 30200;
+    const VERSION = '3.2.1-DEV';
+    const VERSION_ID = 30201;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 2;
-    const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 1;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '07/2017';
     const END_OF_LIFE = '01/2018';

From 07cdfd533d5ff9c710600d552f0bb5b2f48c8ee3 Mon Sep 17 00:00:00 2001
From: Maxime STEINHAUSSER <maxime.steinhausser@elao.com>
Date: Wed, 30 Nov 2016 15:40:17 +0100
Subject: [PATCH 12/81] [WebProfiler][Translator] Fix TranslationDataCollector
 should use cloneVar

---
 .../Resources/views/Collector/translation.html.twig      | 3 +--
 .../DataCollector/TranslationDataCollector.php           | 4 ++--
 .../Tests/DataCollector/TranslationDataCollectorTest.php | 9 ++++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
index 0be04e76117d8..f5ff17680a236 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
@@ -183,8 +183,7 @@
 
                         <div id="parameters-{{ loop.index }}" class="hidden">
                             {% for parameters in message.parameters %}
-                                {{ profiler_dump(parameters) }}
-                                {% if not loop.last %}<br />{% endif %}
+                                {{ profiler_dump(parameters, maxDepth=1) }}
                             {% endfor %}
                         </div>
                     {% endif %}
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
index cb59d0a7e70e4..6b5e165aad9a7 100644
--- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
+++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -101,12 +101,12 @@ private function sanitizeCollectedMessages($messages)
 
             if (!isset($result[$messageId])) {
                 $message['count'] = 1;
-                $message['parameters'] = !empty($message['parameters']) ? array($message['parameters']) : array();
+                $message['parameters'] = !empty($message['parameters']) ? array($this->cloneVar($message['parameters'])) : array();
                 $messages[$key]['translation'] = $this->sanitizeString($message['translation']);
                 $result[$messageId] = $message;
             } else {
                 if (!empty($message['parameters'])) {
-                    $result[$messageId]['parameters'][] = $message['parameters'];
+                    $result[$messageId]['parameters'][] = $this->cloneVar($message['parameters']);
                 }
 
                 ++$result[$messageId]['count'];
diff --git a/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php b/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
index 3d1e86e22cbed..ba9df0751b389 100644
--- a/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
+++ b/src/Symfony/Component/Translation/Tests/DataCollector/TranslationDataCollectorTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 class TranslationDataCollectorTest extends \PHPUnit_Framework_TestCase
 {
@@ -39,6 +40,8 @@ public function testCollectEmptyMessages()
 
     public function testCollect()
     {
+        $cloner = new VarCloner();
+
         $collectedMessages = array(
             array(
                   'id' => 'foo',
@@ -115,9 +118,9 @@ public function testCollect()
                   'state' => DataCollectorTranslator::MESSAGE_MISSING,
                   'count' => 3,
                   'parameters' => array(
-                      array('%count%' => 3),
-                      array('%count%' => 3),
-                      array('%count%' => 4, '%foo%' => 'bar'),
+                      $cloner->cloneVar(array('%count%' => 3)),
+                      $cloner->cloneVar(array('%count%' => 3)),
+                      $cloner->cloneVar(array('%count%' => 4, '%foo%' => 'bar')),
                   ),
                   'transChoiceNumber' => 3,
             ),

From 695d10071b92725a57f5ae74b03c938bcd535708 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 29 Nov 2016 18:32:01 +0100
Subject: [PATCH 13/81] [FrameworkBundle] Resolve env params in debug:config
 command

---
 .../Command/ConfigDebugCommand.php            |  2 +-
 .../Command/ContainerDebugCommand.php         |  7 ++++-
 .../Console/Descriptor/Descriptor.php         |  2 +-
 .../DependencyInjection/ContainerBuilder.php  | 31 +++++++++++++------
 .../Tests/ContainerBuilderTest.php            |  2 +-
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 22811c6558894..17571fb48ad25 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->validateConfiguration($extension, $configuration);
 
-        $configs = $container->getParameterBag()->resolveValue($configs);
+        $configs = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($configs));
 
         $processor = new Processor();
         $config = $processor->processConfiguration($configuration, $configs);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
index 981df241cd3a1..c9d0e419e290e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Config\FileLocator;
 
 /**
@@ -96,7 +97,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $object = $this->getContainerBuilder();
 
         if ($input->getOption('parameters')) {
-            $object = $object->getParameterBag();
+            $parameters = array();
+            foreach ($object->getParameterBag()->all() as $k => $v) {
+                $parameters[$k] = $object->resolveEnvPlaceholders($v);
+            }
+            $object = new ParameterBag($parameters);
             $options = array();
         } elseif ($parameter = $input->getOption('parameter')) {
             $options = array('parameter' => $parameter);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index da809aea8df63..95c9324662490 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -57,7 +57,7 @@ public function describe(OutputInterface $output, $object, array $options = arra
                 $this->describeContainerService($this->resolveServiceDefinition($object, $options['id']), $options);
                 break;
             case $object instanceof ContainerBuilder && isset($options['parameter']):
-                $this->describeContainerParameter($object->getParameter($options['parameter']), $options);
+                $this->describeContainerParameter($object->resolveEnvPlaceholders($object->getParameter($options['parameter'])), $options);
                 break;
             case $object instanceof ContainerBuilder:
                 $this->describeContainerServices($object, $options);
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 58a38048f7530..45c6f2cf677b0 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1026,34 +1026,47 @@ public function getExpressionLanguageProviders()
     }
 
     /**
-     * Resolves env parameter placeholders in a string.
+     * Resolves env parameter placeholders in a string or an array.
      *
-     * @param string      $string    The string to resolve
+     * @param mixed       $value     The value to resolve
      * @param string|null $format    A sprintf() format to use as replacement for env placeholders or null to use the default parameter format
      * @param array       &$usedEnvs Env vars found while resolving are added to this array
      *
      * @return string The string with env parameters resolved
      */
-    public function resolveEnvPlaceholders($string, $format = null, array &$usedEnvs = null)
+    public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null)
     {
-        $bag = $this->getParameterBag();
-        $envPlaceholders = $bag instanceof EnvPlaceholderParameterBag ? $bag->getEnvPlaceholders() : $this->envPlaceholders;
-
         if (null === $format) {
             $format = '%%env(%s)%%';
         }
 
+        if (is_array($value)) {
+            $result = array();
+            foreach ($value as $k => $v) {
+                $result[$this->resolveEnvPlaceholders($k, $format, $usedEnvs)] = $this->resolveEnvPlaceholders($v, $format, $usedEnvs);
+            }
+
+            return $result;
+        }
+
+        if (!is_string($value)) {
+            return $value;
+        }
+
+        $bag = $this->getParameterBag();
+        $envPlaceholders = $bag instanceof EnvPlaceholderParameterBag ? $bag->getEnvPlaceholders() : $this->envPlaceholders;
+
         foreach ($envPlaceholders as $env => $placeholders) {
             foreach ($placeholders as $placeholder) {
-                if (false !== stripos($string, $placeholder)) {
-                    $string = str_ireplace($placeholder, sprintf($format, $env), $string);
+                if (false !== stripos($value, $placeholder)) {
+                    $value = str_ireplace($placeholder, sprintf($format, $env), $value);
                     $usedEnvs[$env] = $env;
                     $this->envCounters[$env] = isset($this->envCounters[$env]) ? 1 + $this->envCounters[$env] : 1;
                 }
             }
         }
 
-        return $string;
+        return $value;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 155da75fb7958..9ba5a36c4d55d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -495,7 +495,7 @@ public function testMerge()
         $bag = new EnvPlaceholderParameterBag();
         $bag->get('env(Foo)');
         $config = new ContainerBuilder($bag);
-        $config->resolveEnvPlaceholders($bag->get('env(Bar)'));
+        $this->assertSame(array('%env(Bar)%'), $config->resolveEnvPlaceholders(array($bag->get('env(Bar)'))));
         $container->merge($config);
         $this->assertEquals(array('Foo' => 0, 'Bar' => 1), $container->getEnvCounters());
     }

From 44a0ef169c74df3bc90cae604ae26b434b7fce1b Mon Sep 17 00:00:00 2001
From: Maxime STEINHAUSSER <maxime.steinhausser@elao.com>
Date: Wed, 30 Nov 2016 16:30:36 +0100
Subject: [PATCH 14/81] [WebProfilerBundle] Fix vertical alignment for profiler
 open action

---
 .../Resources/views/Profiler/open.css.twig                  | 6 ++++--
 .../Resources/views/Profiler/open.html.twig                 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
index 9e290b22e6432..144e86f062bb1 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
@@ -31,21 +31,23 @@ body {
     background-color: #222;
     position: fixed;
     top: 0;
+    display: flex;
     width: 100%;
 }
 .header h1 {
-    float: left;
     color: #FFF;
     font-weight: normal;
     font-size: 21px;
     margin: 0;
     padding: 10px 10px 8px;
+    word-break: break-all;
 }
 
 a.doc {
-    float: right;
     color: #FFF;
     text-decoration: none;
+    margin: auto;
+    margin-right: 10px;
 }
 
 a.doc:hover {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.html.twig
index 438146b633ecb..9b482f1f0aa96 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.html.twig
@@ -8,8 +8,8 @@
 
 {% block body %}
 <div class="header">
-    <a class="doc" href="https://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}/reference/configuration/framework.html#ide" rel="help">Open in your IDE?</a>
     <h1>{{ file }} <small>line {{ line }}</small></h1>
+    <a class="doc" href="https://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}/reference/configuration/framework.html#ide" rel="help">Open in your IDE?</a>
 </div>
 <div class="source">
     {{ filename|file_excerpt(line, -1) }}

From 18fc6b54da0108cb0393142066affa005c99e88b Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Wed, 30 Nov 2016 19:19:43 +0100
Subject: [PATCH 15/81] [Console] Fix wrong handling of multiline arg/opt
 descriptions

---
 .../Console/Descriptor/TextDescriptor.php        | 16 ++++++++--------
 .../Console/Tests/Fixtures/input_argument_4.txt  |  2 +-
 .../Console/Tests/Fixtures/input_option_5.txt    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index 0d722ed5aaeae..eb02c89dfa372 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -38,13 +38,13 @@ protected function describeInputArgument(InputArgument $argument, array $options
         }
 
         $totalWidth = isset($options['total_width']) ? $options['total_width'] : strlen($argument->getName());
-        $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
+        $spacingWidth = $totalWidth - strlen($argument->getName());
 
-        $this->writeText(sprintf('  <info>%s</info>%s%s%s',
+        $this->writeText(sprintf('  <info>%s</info>  %s%s%s',
             $argument->getName(),
             str_repeat(' ', $spacingWidth),
-            // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*[\r\n]\s*/', "\n".str_repeat(' ', $totalWidth + 17), $argument->getDescription()),
+            // + 4 = 2 spaces before <info>, 2 spaces after </info>
+            preg_replace('/\s*[\r\n]\s*/', "\n".str_repeat(' ', $totalWidth + 4), $argument->getDescription()),
             $default
         ), $options);
     }
@@ -75,13 +75,13 @@ protected function describeInputOption(InputOption $option, array $options = arr
             sprintf('--%s%s', $option->getName(), $value)
         );
 
-        $spacingWidth = $totalWidth - strlen($synopsis) + 2;
+        $spacingWidth = $totalWidth - strlen($synopsis);
 
-        $this->writeText(sprintf('  <info>%s</info>%s%s%s%s',
+        $this->writeText(sprintf('  <info>%s</info>  %s%s%s%s',
             $synopsis,
             str_repeat(' ', $spacingWidth),
-            // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*[\r\n]\s*/', "\n".str_repeat(' ', $totalWidth + 17), $option->getDescription()),
+            // + 4 = 2 spaces before <info>, 2 spaces after </info>
+            preg_replace('/\s*[\r\n]\s*/', "\n".str_repeat(' ', $totalWidth + 4), $option->getDescription()),
             $default,
             $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''
         ), $options);
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.txt
index aa74e8ceb2507..fc7d669a112ec 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.txt
@@ -1,2 +1,2 @@
   <info>argument_name</info>  multiline
-                              argument description
+                 argument description
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.txt
index 4368883cc7217..9563b4cab142c 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.txt
@@ -1,2 +1,2 @@
   <info>-o, --option_name=OPTION_NAME</info>  multiline
-                                              option description
+                                 option description

From 26f588a7b584b3e39f6223d06bbb305e00e6453c Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Thu, 1 Dec 2016 15:23:59 +0100
Subject: [PATCH 16/81] Fix unresolved parameters from default bundle configs
 in debug:config

---
 .../Bundle/FrameworkBundle/Command/ConfigDebugCommand.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 9059905e04f54..22a98d8023a4e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln(sprintf('# Current configuration for "%s"', $name));
         }
 
-        $output->writeln(Yaml::dump(array($extension->getAlias() => $config), 10));
+        $output->writeln(Yaml::dump(array($extension->getAlias() => $container->getParameterBag()->resolveValue($config)), 10));
     }
 
     private function compileContainer()

From 997beb21bf942c1f54ae225c8da61a13255ef396 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Thu, 1 Dec 2016 20:26:29 +0100
Subject: [PATCH 17/81] [WebProfilerBundle] Fix dump block is unfairly
 restrained

---
 .../Resources/views/Profiler/toolbar.css.twig                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index d87e81399d412..14dd2d4b591ce 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -356,11 +356,13 @@
     border-color: #777;
     border-radius: 0;
     margin: 6px 0 12px 0;
-    width: 200px;
 }
 .sf-toolbar-block-dump pre.sf-dump:last-child {
     margin-bottom: 0;
 }
+.sf-toolbar-block-dump .sf-toolbar-info-piece {
+    display: block;
+}
 .sf-toolbar-block-dump .sf-toolbar-info-piece .sf-toolbar-file-line {
     color: #AAA;
     margin-left: 4px;

From b0a8f8e376fabed0890c7ff32578acbfabb3785d Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Thu, 1 Dec 2016 11:14:27 -0500
Subject: [PATCH 18/81] Fixed max width from ajax request url element (td)

---
 .../WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index d87e81399d412..12dd8a3d45302 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -315,7 +315,7 @@
     padding: 4px;
 }
 .sf-ajax-request-url {
-    max-width: 300px;
+    max-width: 250px;
     line-height: 9px;
     overflow: hidden;
     text-overflow: ellipsis;

From 22e56680564523010a1a8b603f76f6e603f762fb Mon Sep 17 00:00:00 2001
From: Nicolas Dewez <nicolas.dewez@sensiolabs.com>
Date: Thu, 1 Dec 2016 22:26:29 +0100
Subject: [PATCH 19/81] Fix hide button in toolbar

---
 .../Resources/views/Profiler/toolbar_js.html.twig               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
index 1dfeb1a29c8eb..ea038277c4bec 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -66,7 +66,7 @@
                         }
                     };
                 }
-                Sfjs.addEventListener(document.getElementById('sfToolbarHideButton-{{ token }}'), 'click', function () {
+                Sfjs.addEventListener(document.getElementById('sfToolbarHideButton-{{ token }}'), 'click', function (event) {
                     event.preventDefault();
 
                     var p = this.parentNode;

From 070800359e6901af225055c5c7b960ab38d0ff5d Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Wed, 30 Nov 2016 20:06:05 +0100
Subject: [PATCH 20/81] [Form] Remove unused var cloner property

---
 .../Form/Extension/DataCollector/FormDataCollector.php       | 2 ++
 .../Form/Extension/DataCollector/FormDataExtractor.php       | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index b72a5739f843d..624632f3b2ce8 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -17,8 +17,10 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\Validator\ConstraintViolationInterface;
 use Symfony\Component\VarDumper\Caster\Caster;
 use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
index a09b87fa1c330..de6fac41231de 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
@@ -23,11 +23,6 @@
  */
 class FormDataExtractor implements FormDataExtractorInterface
 {
-    /**
-     * @var VarCloner
-     */
-    private $cloner;
-
     /**
      * Constructs a new data extractor.
      */

From 2c818193c1ead4748a8f31d687418f0baff91898 Mon Sep 17 00:00:00 2001
From: Maxime STEINHAUSSER <maxime.steinhausser@elao.com>
Date: Thu, 1 Dec 2016 11:14:14 +0100
Subject: [PATCH 21/81] [TwigBundle] Fix twig loader registered twice

---
 .../TwigBundle/DependencyInjection/Compiler/ExtensionPass.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 87469984688ab..d09de2d615c0a 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -73,7 +74,7 @@ public function process(ContainerBuilder $container)
             $loader->addTag('twig.loader');
             $loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
 
-            $container->setDefinition('twig.loader.filesystem', $loader);
+            $container->setAlias('twig.loader.filesystem', new Alias('twig.loader.native_filesystem', false));
         }
 
         if ($container->has('assets.packages')) {

From b8e77792bc0c838650e3d9a3dec20fbc0fe86684 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Wed, 30 Nov 2016 17:57:42 -0500
Subject: [PATCH 22/81] Grouping FrameworkBundle upgrade notes

---
 UPGRADE-3.2.md | 74 ++++++++++++++++++++++++--------------------------
 UPGRADE-4.0.md | 72 ++++++++++++++++++++++++------------------------
 2 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
index f4b043c754c66..a26ed257739ab 100644
--- a/UPGRADE-3.2.md
+++ b/UPGRADE-3.2.md
@@ -6,28 +6,6 @@ BrowserKit
 
  * Client HTTP user agent has been changed to 'Symfony BrowserKit' (was 'Symfony2 BrowserKit' before).
 
-FrameworkBundle
----------------
-
- * The `doctrine/annotations` dependency has been removed; require it via `composer
-   require doctrine/annotations` if you are using annotations in your project
- * The `symfony/security-core` and `symfony/security-csrf` dependencies have
-   been removed; require them via `composer require symfony/security-core
-   symfony/security-csrf` if you depend on them and don't already depend on
-   `symfony/symfony`
- * The `symfony/templating` dependency has been removed; require it via `composer
-   require symfony/templating` if you depend on it and don't already depend on
-   `symfony/symfony`
- * The `symfony/translation` dependency has been removed; require it via `composer
-   require symfony/translation` if you depend on it and don't already depend on
-   `symfony/symfony`
- * The `symfony/asset` dependency has been removed; require it via `composer
-   require symfony/asset` if you depend on it and don't already depend on
-   `symfony/symfony`
- * The `Resources/public/images/*` files have been removed.
- * The `Resources/public/css/*.css` files have been removed (they are now inlined
-   in TwigBundle).
-
 Console
 -------
 
@@ -72,25 +50,26 @@ Form
 FrameworkBundle
 ---------------
 
+ * The `doctrine/annotations` dependency has been removed; require it via `composer
+   require doctrine/annotations` if you are using annotations in your project
+ * The `symfony/security-core` and `symfony/security-csrf` dependencies have
+   been removed; require them via `composer require symfony/security-core
+   symfony/security-csrf` if you depend on them and don't already depend on
+   `symfony/symfony`
+ * The `symfony/templating` dependency has been removed; require it via `composer
+   require symfony/templating` if you depend on it and don't already depend on
+   `symfony/symfony`
+ * The `symfony/translation` dependency has been removed; require it via `composer
+   require symfony/translation` if you depend on it and don't already depend on
+   `symfony/symfony`
+ * The `symfony/asset` dependency has been removed; require it via `composer
+   require symfony/asset` if you depend on it and don't already depend on
+   `symfony/symfony`
+ * The `Resources/public/images/*` files have been removed.
+ * The `Resources/public/css/*.css` files have been removed (they are now inlined
+   in TwigBundle).
  * The service `serializer.mapping.cache.doctrine.apc` is deprecated. APCu should now
    be automatically used when available.
-
-HttpKernel
-----------
-
- * `DataCollector::varToString()` is deprecated and will be removed in Symfony
-   4.0. Use the `cloneVar()` method instead.
-
- * Surrogate name in a `Surrogate-Capability` HTTP request header has been changed to 'symfony'.
-
-   Before:
-   ```
-   Surrogate-Capability: symfony2="ESI/1.0"
-   ```
-
-   After:
-   ```
-   Surrogate-Capability: symfony="ESI/1.0"
    ```
 
 HttpFoundation
@@ -116,6 +95,23 @@ HttpFoundation
      - `isInvalid`/`isSuccessful`/`isRedirection`/`isClientError`/`isServerError`
      - `isOk`/`isForbidden`/`isNotFound`/`isRedirect`/`isEmpty`
 
+HttpKernel
+----------
+
+ * `DataCollector::varToString()` is deprecated and will be removed in Symfony
+   4.0. Use the `cloneVar()` method instead.
+
+ * Surrogate name in a `Surrogate-Capability` HTTP request header has been changed to 'symfony'.
+
+   Before:
+   ```
+   Surrogate-Capability: symfony2="ESI/1.0"
+   ```
+
+   After:
+   ```
+   Surrogate-Capability: symfony="ESI/1.0"
+
 TwigBridge
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 483b7e6ed1447..d018136932b56 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -182,6 +182,42 @@ TwigBridge
  * The possibility to inject the Form Twig Renderer into the form extension
    has been removed. Inject it into the `TwigRendererEngine` instead.
 
+Validator
+---------
+
+ * The `DateTimeValidator::PATTERN` constant was removed.
+
+ * `Tests\Constraints\AbstractConstraintValidatorTest` has been removed in
+   favor of `Test\ConstraintValidatorTestCase`.
+
+   Before:
+
+   ```php
+   // ...
+   use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
+
+   class MyCustomValidatorTest extends AbstractConstraintValidatorTest
+   {
+       // ...
+   }
+   ```
+
+   After:
+
+   ```php
+   // ...
+   use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+   class MyCustomValidatorTest extends ConstraintValidatorTestCase
+   {
+       // ...
+   }
+   ```
+   
+ * The default value of the strict option of the `Choice` Constraint has been
+   changed to `true` as of 4.0. If you need the the previous behaviour ensure to 
+   set the option to `false`.
+
 Yaml
 ----
 
@@ -273,39 +309,3 @@ Yaml
    the `!php/object` tag.
 
  * Duplicate mapping keys lead to a `ParseException`.
-
-Validator
----------
-
- * The `DateTimeValidator::PATTERN` constant was removed.
-
- * `Tests\Constraints\AbstractConstraintValidatorTest` has been removed in
-   favor of `Test\ConstraintValidatorTestCase`.
-
-   Before:
-
-   ```php
-   // ...
-   use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
-
-   class MyCustomValidatorTest extends AbstractConstraintValidatorTest
-   {
-       // ...
-   }
-   ```
-
-   After:
-
-   ```php
-   // ...
-   use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
-
-   class MyCustomValidatorTest extends ConstraintValidatorTestCase
-   {
-       // ...
-   }
-   ```
-   
- * The default value of the strict option of the `Choice` Constraint has been
-   changed to `true` as of 4.0. If you need the the previous behaviour ensure to 
-   set the option to `false`.

From 27de65aa144c089935ba6f318550237ae1508b9c Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Tue, 29 Nov 2016 20:46:44 +0100
Subject: [PATCH 23/81] [Serializer] Fix argument object denormalization

---
 .../Normalizer/AbstractNormalizer.php         |  6 ++-
 .../DenormalizerDecoratorSerializer.php       | 43 -------------------
 .../Tests/Normalizer/ObjectNormalizerTest.php |  5 +--
 .../Serializer/Tests/SerializerTest.php       | 29 +++++++++++++
 4 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizerDecoratorSerializer.php

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 82f6e1e2a8f39..cd46b5b97d20c 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Serializer\Exception\CircularReferenceException;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
@@ -336,8 +337,11 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
                     $parameterData = $data[$key];
                     try {
                         if (null !== $constructorParameter->getClass()) {
+                            if (!$this->serializer instanceof DenormalizerInterface) {
+                                throw new LogicException(sprintf('Cannot create an instance of %s from serialized data because the serializer inject in "%s" is not a denormalizer', $constructorParameter->getClass(), static::class));
+                            }
                             $parameterClass = $constructorParameter->getClass()->getName();
-                            $parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);
+                            $parameterData = $this->serializer->denormalize($parameterData, $parameterClass, $format, $context);
                         }
                     } catch (\ReflectionException $e) {
                         throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizerDecoratorSerializer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizerDecoratorSerializer.php
deleted file mode 100644
index 06d36c4bd85ca..0000000000000
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizerDecoratorSerializer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Symfony\Component\Serializer\Tests\Fixtures;
-
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Serializer\SerializerInterface;
-
-/**
- * @author Théo FIDRY <theo.fidry@gmail.com>
- */
-class DenormalizerDecoratorSerializer implements SerializerInterface
-{
-    private $normalizer;
-
-    /**
-     * @param NormalizerInterface|DenormalizerInterface $normalizer
-     */
-    public function __construct($normalizer)
-    {
-        if (false === $normalizer instanceof NormalizerInterface && false === $normalizer instanceof DenormalizerInterface) {
-            throw new \InvalidArgumentException();
-        }
-
-        $this->normalizer = $normalizer;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function serialize($data, $format, array $context = array())
-    {
-        return $this->normalizer->normalize($data, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deserialize($data, $type, $format, array $context = array())
-    {
-        return $this->normalizer->denormalize($data, $type, $format, $context);
-    }
-}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 161145bd97497..e1d3a905ecf73 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -23,7 +23,6 @@
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
-use Symfony\Component\Serializer\Tests\Fixtures\DenormalizerDecoratorSerializer;
 use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
@@ -171,7 +170,7 @@ public function testConstructorWithObjectTypeHintDenormalize()
         );
 
         $normalizer = new ObjectNormalizer();
-        $serializer = new DenormalizerDecoratorSerializer($normalizer);
+        $serializer = new Serializer(array($normalizer));
         $normalizer->setSerializer($serializer);
 
         $obj = $normalizer->denormalize($data, DummyWithConstructorObject::class);
@@ -197,7 +196,7 @@ public function testConstructorWithUnknownObjectTypeHintDenormalize()
         );
 
         $normalizer = new ObjectNormalizer();
-        $serializer = new DenormalizerDecoratorSerializer($normalizer);
+        $serializer = new Serializer(array($normalizer));
         $normalizer->setSerializer($serializer);
 
         $normalizer->denormalize($data, DummyWithConstructorInexistingObject::class);
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index 362357864c463..ff7820c0d07e4 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -336,6 +336,15 @@ public function testDenormalizerAware()
 
         new Serializer(array($denormalizerAware));
     }
+
+    public function testDeserializeObjectConstructorWithObjectTypeHint()
+    {
+        $jsonData = '{"bar":{"value":"baz"}}';
+
+        $serializer = new Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()));
+
+        $this->assertEquals(new Foo(new Bar('baz')), $serializer->deserialize($jsonData, Foo::class, 'json'));
+    }
 }
 
 class Model
@@ -381,3 +390,23 @@ public function toArray()
         return array('title' => $this->title, 'numbers' => $this->numbers);
     }
 }
+
+class Foo
+{
+    private $bar;
+
+    public function __construct(Bar $bar)
+    {
+        $this->bar = $bar;
+    }
+}
+
+class Bar
+{
+    private $value;
+
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+}

From dcf9fbb18c3fb73667fae79f9f678a17dcd57cc3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 2 Dec 2016 15:52:29 +0100
Subject: [PATCH 24/81] [HttpKernel] Fix annotation cache warmer with failing
 or missing classes

---
 .../CacheWarmer/AnnotationsCacheWarmer.php       | 16 +++++++++++++---
 .../AddClassesToCachePass.php                    |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
index 6d044676eb012..2c0a435617d4a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -66,9 +66,19 @@ public function warmUp($cacheDir)
 
         $arrayPool = new ArrayAdapter(0, false);
         $reader = new CachedReader($this->annotationReader, new DoctrineProvider($arrayPool));
-
-        foreach ($annotatedClasses as $class) {
-            $this->readAllComponents($reader, $class);
+        $throwingAutoloader = function ($class) { throw new \ReflectionException(sprintf('Class %s does not exist', $class)); };
+        spl_autoload_register($throwingAutoloader);
+
+        try {
+            foreach ($annotatedClasses as $class) {
+                try {
+                    $this->readAllComponents($reader, $class);
+                } catch (\ReflectionException $e) {
+                    // ignore failing reflection
+                }
+            }
+        } finally {
+            spl_autoload_unregister($throwingAutoloader);
         }
 
         $values = $arrayPool->getValues();
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php
index 0cc8d99864391..e9d012033d6d4 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php
@@ -101,7 +101,7 @@ private function getClassesInComposerClassMaps()
             }
 
             if (is_array($function) && $function[0] instanceof ClassLoader) {
-                $classes += $function[0]->getClassMap();
+                $classes += array_filter($function[0]->getClassMap());
             }
         }
 

From 9b9d33959cf8402ed16a988f0ff1dd27d386f712 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sat, 3 Dec 2016 05:32:18 +0100
Subject: [PATCH 25/81] [Finder] Refine phpdoc about argument for
 NumberComparator

---
 src/Symfony/Component/Finder/Comparator/NumberComparator.php | 2 +-
 src/Symfony/Component/Finder/Finder.php                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Finder/Comparator/NumberComparator.php b/src/Symfony/Component/Finder/Comparator/NumberComparator.php
index 4b5b5ba8380ce..16f91285a6d8c 100644
--- a/src/Symfony/Component/Finder/Comparator/NumberComparator.php
+++ b/src/Symfony/Component/Finder/Comparator/NumberComparator.php
@@ -37,7 +37,7 @@ class NumberComparator extends Comparator
     /**
      * Constructor.
      *
-     * @param string $test A comparison string
+     * @param string|int $test A comparison string or an integer
      *
      * @throws \InvalidArgumentException If the test is not understood
      */
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 90dcd20958118..c9d14809dc28a 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -200,7 +200,7 @@ public function files()
      *   $finder->depth('> 1') // the Finder will start matching at level 1.
      *   $finder->depth('< 3') // the Finder will descend at most 3 levels of directories below the starting point.
      *
-     * @param int $level The depth level expression
+     * @param string|int $level The depth level expression
      *
      * @return Finder|SplFileInfo[] The current Finder instance
      *
@@ -372,7 +372,7 @@ public function notPath($pattern)
      * $finder->size('<= 1Ki');
      * $finder->size(4);
      *
-     * @param string $size A size range string
+     * @param string|int $size A size range string or an integer
      *
      * @return Finder|SplFileInfo[] The current Finder instance
      *

From 526979644827c848eca55b022129d8cc54a0495d Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Sat, 3 Dec 2016 10:52:31 +0100
Subject: [PATCH 26/81] fix the inline level for dumped multi-line strings

---
 src/Symfony/Component/Yaml/Dumper.php                          | 2 +-
 src/Symfony/Component/Yaml/Tests/DumperTest.php                | 2 +-
 .../Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
index 10ffe82b010aa..98d82434c2388 100644
--- a/src/Symfony/Component/Yaml/Dumper.php
+++ b/src/Symfony/Component/Yaml/Dumper.php
@@ -88,7 +88,7 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0)
             $isAHash = Inline::isHash($input);
 
             foreach ($input as $key => $value) {
-                if ($inline > 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && is_string($value) && false !== strpos($value, "\n")) {
+                if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && is_string($value) && false !== strpos($value, "\n")) {
                     $output .= sprintf("%s%s%s |\n", $prefix, $isAHash ? Inline::dump($key, $flags).':' : '-', '');
 
                     foreach (preg_split('/\n|\r\n/', $value) as $row) {
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
index afc491209516b..06e9d3f5c38a9 100644
--- a/src/Symfony/Component/Yaml/Tests/DumperTest.php
+++ b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -342,7 +342,7 @@ public function testDumpMultiLineStringAsScalarBlock()
             ),
         );
 
-        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 3, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
index 5994f323062e3..b4903d30a11c0 100644
--- a/src/Symfony/Component/Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
+++ b/src/Symfony/Component/Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
@@ -10,5 +10,4 @@ data:
         empty line:
         
         baz
-    nested_inlined_multi_line_string:
-        inlined_multi_line: "foo\nbar\r\nempty line:\n\nbaz"
+    nested_inlined_multi_line_string: { inlined_multi_line: "foo\nbar\r\nempty line:\n\nbaz" }

From 5f62f0194304fd5e22caa290e625d01c735bf848 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 3 Dec 2016 11:50:08 +0100
Subject: [PATCH 27/81] fixed CS

---
 .../Compiler/CheckCircularReferencesPass.php             | 5 ++---
 .../Component/DependencyInjection/Dumper/PhpDumper.php   | 6 +++---
 .../Tests/Fixtures/includes/classes.php                  | 9 ---------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index b6a898736f653..11856b6cbc053 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -61,9 +61,8 @@ private function checkOutEdges(array $edges)
 
             if (empty($this->checkedNodes[$id])) {
 
-                // * don't check circular dependencies in lazy services.
-                $isLazy = $node->getValue() && $node->getValue()->isLazy();
-                if (!$isLazy) {
+                // don't check circular dependencies for lazy services
+                if (!$node->getValue() && $node->getValue()->isLazy()) {
                     $searchKey = array_search($id, $this->currentPath);
                     $this->currentPath[] = $id;
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index bf5956b394d43..c4bfa93d2a950 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1294,9 +1294,9 @@ private function hasReference($id, array $arguments, $deep = false, array &$visi
 
                     $service = $this->container->getDefinition($argumentId);
 
-                    // if exists proxy dumper (proxy-manager) don't search references in lazy services.
-                    // As these services will be instantiated lazily and don't have direct related references.
-                    if ($service->isLazy() && !($this->getProxyDumper() instanceof NullDumper)) {
+                    // if the proxy manager is enabled, disable searching for references in lazy services,
+                    // as these services will be instantiated lazily and don't have direct related references.
+                    if ($service->isLazy() && !$this->getProxyDumper() instanceof NullDumper) {
                         continue;
                     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
index cdc89e42ab3a8..0ecdea3fbfb89 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -82,25 +82,16 @@ public function callPassed()
 
 class DummyProxyDumper implements ProxyDumper
 {
-    /**
-     * {@inheritdoc}
-     */
     public function isProxyCandidate(Definition $definition)
     {
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getProxyFactoryCode(Definition $definition, $id)
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getProxyCode(Definition $definition)
     {
         return '';

From 36b7ba64f4a27c742be010f855d0fb27bfccfb76 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Wed, 2 Nov 2016 11:44:02 -0400
Subject: [PATCH 28/81] [Form][DX] FileType "multiple" fixes

---
 .../Form/Extension/Core/Type/FileType.php     | 41 ++++++++++++++++---
 .../Extension/Core/Type/FileTypeTest.php      | 27 ++++++++++++
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index bc24899de5cb0..914c9402fc8e4 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -12,12 +12,37 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FileType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        if ($options['multiple']) {
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+                $form = $event->getForm();
+                $data = $event->getData();
+
+                // submitted data for an input file (not required) without choosing any file
+                if (array(null) === $data) {
+                    $emptyData = $form->getConfig()->getEmptyData();
+
+                    $data = is_callable($emptyData) ? call_user_func($emptyData, $form, $data) : $emptyData;
+                    $event->setData($data);
+                }
+            });
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -39,9 +64,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
-        $view
-            ->vars['multipart'] = true
-        ;
+        $view->vars['multipart'] = true;
     }
 
     /**
@@ -49,10 +72,18 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
+        $dataClass = function (Options $options) {
+            return $options['multiple'] ? null : 'Symfony\Component\HttpFoundation\File\File';
+        };
+
+        $emptyData = function (Options $options) {
+            return $options['multiple'] ? array() : null;
+        };
+
         $resolver->setDefaults(array(
             'compound' => false,
-            'data_class' => 'Symfony\Component\HttpFoundation\File\File',
-            'empty_data' => null,
+            'data_class' => $dataClass,
+            'empty_data' => $emptyData,
             'multiple' => false,
         ));
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
index 55555efecb7bf..c6a61af8b7159 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -44,6 +44,33 @@ public function testSubmitEmpty()
         $this->assertNull($form->getData());
     }
 
+    public function testSubmitEmptyMultiple()
+    {
+        $form = $this->factory->createBuilder('file', null, array(
+            'multiple' => true,
+        ))->getForm();
+
+        // submitted data when an input file is uploaded without choosing any file
+        $form->submit(array(null));
+
+        $this->assertSame(array(), $form->getData());
+    }
+
+    public function testSetDataMultiple()
+    {
+        $form = $this->factory->createBuilder('file', null, array(
+            'multiple' => true,
+        ))->getForm();
+
+        $data = array(
+            $this->createUploadedFileMock('abcdef', 'first.jpg', true),
+            $this->createUploadedFileMock('zyxwvu', 'second.jpg', true),
+        );
+
+        $form->setData($data);
+        $this->assertSame($data, $form->getData());
+    }
+
     public function testSubmitMultiple()
     {
         $form = $this->factory->createBuilder('file', null, array(

From aea04784513aff2e9e56cfe692746597ccb2392e Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Sat, 3 Dec 2016 14:48:59 +0100
Subject: [PATCH 29/81] fix a test checking for a value

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

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index 11856b6cbc053..156bcc0c3ab7b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -62,7 +62,7 @@ private function checkOutEdges(array $edges)
             if (empty($this->checkedNodes[$id])) {
 
                 // don't check circular dependencies for lazy services
-                if (!$node->getValue() && $node->getValue()->isLazy()) {
+                if (!$node->getValue() || !$node->getValue()->isLazy()) {
                     $searchKey = array_search($id, $this->currentPath);
                     $this->currentPath[] = $id;
 

From d1a7164626f06f5bcaeab20ff964318ef474b88b Mon Sep 17 00:00:00 2001
From: Iltar van der Berg <ivanderberg@hostnet.nl>
Date: Mon, 5 Dec 2016 08:37:16 +0100
Subject: [PATCH 30/81] Regression test for missing controller arguments

---
 .../HttpKernel/Controller/ControllerResolver.php    | 10 +++++++++-
 .../Tests/Controller/ControllerResolverTest.php     | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index c76b57bb6a7db..a1cff53535dc1 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -36,6 +36,13 @@ class ControllerResolver implements ControllerResolverInterface
      */
     private $supportsVariadic;
 
+    /**
+     * If scalar types exists.
+     *
+     * @var bool
+     */
+    private $supportsScalarTypes;
+
     /**
      * Constructor.
      *
@@ -46,6 +53,7 @@ public function __construct(LoggerInterface $logger = null)
         $this->logger = $logger;
 
         $this->supportsVariadic = method_exists('ReflectionParameter', 'isVariadic');
+        $this->supportsScalarTypes = method_exists('ReflectionParameter', 'getType');
     }
 
     /**
@@ -132,7 +140,7 @@ protected function doGetArguments(Request $request, $controller, array $paramete
                 $arguments[] = $request;
             } elseif ($param->isDefaultValueAvailable()) {
                 $arguments[] = $param->getDefaultValue();
-            } elseif ($param->allowsNull()) {
+            } elseif ($this->supportsScalarTypes && $param->hasType() && $param->allowsNull()) {
                 $arguments[] = null;
             } else {
                 if (is_array($controller)) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
index 9aa7e20a9a910..f3b0ac025d6bf 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -223,6 +223,19 @@ public function testCreateControllerCanReturnAnyCallable()
         $mock->getController($request);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testIfExceptionIsThrownWhenMissingAnArgument()
+    {
+        $resolver = new ControllerResolver();
+        $request = Request::create('/');
+
+        $controller = array($this, 'controllerMethod1');
+
+        $resolver->getArguments($request, $controller);
+    }
+
     /**
      * @requires PHP 7.1
      */

From 9e588b8d96906886d8e6132d82e2e42ce764107e Mon Sep 17 00:00:00 2001
From: Iltar van der Berg <ivanderberg@hostnet.nl>
Date: Mon, 5 Dec 2016 09:10:32 +0100
Subject: [PATCH 31/81] Regression test for missing controller arguments (3.1)

---
 .../ArgumentResolver/DefaultValueResolver.php         |  2 +-
 .../Tests/Controller/ArgumentResolverTest.php         | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php
index 1af03651c3799..e58fd3ab2bed7 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php
@@ -27,7 +27,7 @@ final class DefaultValueResolver implements ArgumentValueResolverInterface
      */
     public function supports(Request $request, ArgumentMetadata $argument)
     {
-        return $argument->hasDefaultValue() || ($argument->isNullable() && !$argument->isVariadic());
+        return $argument->hasDefaultValue() || (null !== $argument->getType() && $argument->isNullable() && !$argument->isVariadic());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
index 964d83236278e..d89ba605b7646 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -203,6 +203,17 @@ public function testGetArgumentWithoutArray()
         $resolver->getArguments($request, $controller);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testIfExceptionIsThrownWhenMissingAnArgument()
+    {
+        $request = Request::create('/');
+        $controller = array($this, 'controllerWithFoo');
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
     /**
      * @requires PHP 7.1
      */

From 10947739995b315ab17c7db670ff0089a747f7ac Mon Sep 17 00:00:00 2001
From: Arthur de Moulins <arthurdemoulins@gmail.com>
Date: Fri, 2 Dec 2016 16:57:47 +0100
Subject: [PATCH 32/81] inject project root path into twig filesystem loader

---
 .../DependencyInjection/Compiler/ExtensionPass.php       | 6 +++++-
 .../Bundle/TwigBundle/Loader/FilesystemLoader.php        | 9 +++++----
 src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml  | 5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 603cbe8e22ef1..dbad1b653c1dd 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -64,9 +64,13 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.debug')->addTag('twig.extension');
         }
 
+        $composerRootDir = $this->getComposerRootDir($container->getParameter('kernel.root_dir'));
+        $loader = $container->getDefinition('twig.loader.filesystem');
+        $loader->replaceArgument(2, $composerRootDir);
+
         if (!$container->has('templating')) {
             $loader = $container->getDefinition('twig.loader.native_filesystem');
-            $loader->replaceArgument(1, $this->getComposerRootDir($container->getParameter('kernel.root_dir')));
+            $loader->replaceArgument(1, $composerRootDir);
             $loader->addTag('twig.loader');
             $loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
 
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
index 53fe300e29a62..0a9ac7a3ca19a 100644
--- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
+++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -29,12 +29,13 @@ class FilesystemLoader extends \Twig_Loader_Filesystem
     /**
      * Constructor.
      *
-     * @param FileLocatorInterface        $locator A FileLocatorInterface instance
-     * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
+     * @param FileLocatorInterface        $locator  A FileLocatorInterface instance
+     * @param TemplateNameParserInterface $parser   A TemplateNameParserInterface instance
+     * @param string|null                 $rootPath The root path common to all relative paths (null for getcwd())
      */
-    public function __construct(FileLocatorInterface $locator, TemplateNameParserInterface $parser)
+    public function __construct(FileLocatorInterface $locator, TemplateNameParserInterface $parser, $rootPath = null)
     {
-        parent::__construct(array());
+        parent::__construct(array(), $rootPath);
 
         $this->locator = $locator;
         $this->parser = $parser;
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index c82cbafbeb953..06af08d15ba7a 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -46,12 +46,13 @@
 
         <service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
             <argument type="collection" /> <!-- paths -->
-            <argument></argument> <!-- project's root dir -->
+            <argument /> <!-- project's root dir -->
         </service>
 
         <service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
             <argument type="service" id="templating.locator" />
             <argument type="service" id="templating.name_parser" />
+            <argument /> <!-- project's root dir -->
             <tag name="twig.loader"/>
         </service>
 
@@ -87,7 +88,7 @@
 
         <service id="twig.extension.code" class="Symfony\Bridge\Twig\Extension\CodeExtension" public="false">
             <tag name="twig.extension" />
-            <argument type="service" id="debug.file_link_formatter"></argument>
+            <argument type="service" id="debug.file_link_formatter" />
             <argument>%kernel.root_dir%</argument>
             <argument>%kernel.charset%</argument>
         </service>

From 899fa7936bccb786d0d661c504e06489660101d3 Mon Sep 17 00:00:00 2001
From: Dariusz Ruminski <keradus@gmail.com>
Date: Sat, 3 Dec 2016 12:12:21 +0100
Subject: [PATCH 33/81] [Console] fixed PHP7 Errors when not using Dispatcher

---
 src/Symfony/Component/Console/Application.php  |  8 +++++++-
 .../Console/Tests/ApplicationTest.php          | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index b11268ade33bf..2aff1b635ba1c 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -843,7 +843,13 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
         }
 
         if (null === $this->dispatcher) {
-            return $command->run($input, $output);
+            try {
+                return $command->run($input, $output);
+            } catch (\Exception $e) {
+                throw $e;
+            } catch (\Throwable $e) {
+                throw new FatalThrowableError($e);
+            }
         }
 
         $event = new ConsoleCommandEvent($command, $input, $output);
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 9d375f6b7b264..2612be9e9eaaa 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -951,6 +951,24 @@ public function testRunDispatchesAllEventsWithException()
         $this->assertContains('before.foo.caught.after.', $tester->getDisplay());
     }
 
+    public function testRunWithError()
+    {
+        $this->setExpectedException('Exception', 'dymerr');
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('dym.');
+
+            throw new \Error('dymerr');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'dym'));
+    }
+
     /**
      * @expectedException        \LogicException
      * @expectedExceptionMessage caught

From adc4a26971749d31d23f8a5f2ec80243231cb421 Mon Sep 17 00:00:00 2001
From: Gabriel Moreira <gabriel.moreira@photomerchant.net>
Date: Sun, 4 Dec 2016 10:01:09 +0100
Subject: [PATCH 34/81] [HttpKernel] Fixed RequestDataCollector handling of
 null header values.

---
 .../Component/HttpKernel/DataCollector/RequestDataCollector.php | 2 +-
 .../HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index deafe10745732..0f2dc9b6c6084 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -125,7 +125,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 continue;
             }
             if ('request_headers' === $key || 'response_headers' === $key) {
-                $value = array_map(function ($v) { return isset($v[1]) ? $v : $v[0]; }, $value);
+                $value = array_map(function ($v) { return isset($v[0]) && !isset($v[1]) ? $v[0] : $v; }, $value);
             }
             if ('request_server' !== $key && 'request_cookies' !== $key) {
                 $this->data[$key] = array_map(array($this, 'cloneVar'), $value);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
index 0e4cfe0d6ba91..a8b4e1ce2e7c9 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -234,6 +234,7 @@ protected function createResponse()
         $response = new Response();
         $response->setStatusCode(200);
         $response->headers->set('Content-Type', 'application/json');
+        $response->headers->set('X-Foo-Bar', null);
         $response->headers->setCookie(new Cookie('foo', 'bar', 1, '/foo', 'localhost', true, true));
         $response->headers->setCookie(new Cookie('bar', 'foo', new \DateTime('@946684800')));
         $response->headers->setCookie(new Cookie('bazz', 'foo', '2000-12-12'));

From 0cd2c589eb8aa70e94fcb32b31d4e0907b2d3b6f Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Wed, 30 Nov 2016 09:21:31 -0600
Subject: [PATCH 35/81] Ignore missing 'debug.file_link_formatter' service in
 Debug and Twig bundles

---
 src/Symfony/Bundle/DebugBundle/Resources/config/services.xml | 2 +-
 src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
index aada03eff87cf..655d0ae5c7e89 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/DebugBundle/Resources/config/services.xml
@@ -14,7 +14,7 @@
         <service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector">
             <tag name="data_collector" id="dump" template="@Debug/Profiler/dump.html.twig" priority="240" />
             <argument type="service" id="debug.stopwatch" on-invalid="ignore" />
-            <argument type="service" id="debug.file_link_formatter"></argument>
+            <argument type="service" id="debug.file_link_formatter" on-invalid="ignore"></argument>
             <argument>%kernel.charset%</argument>
             <argument type="service" id="request_stack" />
             <argument>null</argument><!-- var_dumper.cli_dumper when debug.dump_destination is set -->
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 06af08d15ba7a..c2477cef6e2cb 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -88,7 +88,7 @@
 
         <service id="twig.extension.code" class="Symfony\Bridge\Twig\Extension\CodeExtension" public="false">
             <tag name="twig.extension" />
-            <argument type="service" id="debug.file_link_formatter" />
+            <argument type="service" id="debug.file_link_formatter" on-invalid="ignore" />
             <argument>%kernel.root_dir%</argument>
             <argument>%kernel.charset%</argument>
         </service>

From 164a20c8523bf390118e654ef08081c65ab3619d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 5 Dec 2016 15:31:21 +0100
Subject: [PATCH 36/81] [Form] Fix FormDataCollector

---
 .../DataCollector/FormDataCollector.php       | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 624632f3b2ce8..a0f5a7835ad31 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -209,9 +209,7 @@ public function collectViewVariables(FormView $view)
      */
     public function buildPreliminaryFormTree(FormInterface $form)
     {
-        $this->data['forms'][$form->getName()] = array();
-
-        $this->recursiveBuildPreliminaryFormTree($form, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);
+        $this->data['forms'][$form->getName()] = &$this->recursiveBuildPreliminaryFormTree($form, $this->data['forms_by_hash']);
     }
 
     /**
@@ -219,9 +217,7 @@ public function buildPreliminaryFormTree(FormInterface $form)
      */
     public function buildFinalFormTree(FormInterface $form, FormView $view)
     {
-        $this->data['forms'][$form->getName()] = array();
-
-        $this->recursiveBuildFinalFormTree($form, $view, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);
+        $this->data['forms'][$form->getName()] = &$this->recursiveBuildFinalFormTree($form, $view, $this->data['forms_by_hash']);
     }
 
     /**
@@ -354,26 +350,25 @@ protected function cloneVar($var, $isClass = false)
         return $cache = $this->cloner->cloneVar($var);
     }
 
-    private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output, array &$outputByHash)
+    private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &$outputByHash)
     {
         $hash = spl_object_hash($form);
 
+        $output = &$outputByHash[$hash];
         $output = isset($this->dataByForm[$hash])
             ? $this->dataByForm[$hash]
             : array();
 
-        $outputByHash[$hash] = &$output;
-
         $output['children'] = array();
 
         foreach ($form as $name => $child) {
-            $output['children'][$name] = array();
-
-            $this->recursiveBuildPreliminaryFormTree($child, $output['children'][$name], $outputByHash);
+            $output['children'][$name] = &$this->recursiveBuildPreliminaryFormTree($child, $outputByHash);
         }
+
+        return $output;
     }
 
-    private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output, array &$outputByHash)
+    private function &recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, array &$outputByHash)
     {
         $viewHash = spl_object_hash($view);
         $formHash = null;
@@ -386,6 +381,9 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
             // corresponding FormInterface instance for its view in a different way
             $formHash = $this->formsByView[$viewHash];
         }
+        if (null !== $formHash) {
+            $output = &$outputByHash[$formHash];
+        }
 
         $output = isset($this->dataByView[$viewHash])
             ? $this->dataByView[$viewHash]
@@ -398,8 +396,6 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
                     ? $this->dataByForm[$formHash]
                     : array()
             );
-
-            $outputByHash[$formHash] = &$output;
         }
 
         $output['children'] = array();
@@ -411,9 +407,9 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
                 ? $form->get($name)
                 : null;
 
-            $output['children'][$name] = array();
-
-            $this->recursiveBuildFinalFormTree($childForm, $childView, $output['children'][$name], $outputByHash);
+            $output['children'][$name] = &$this->recursiveBuildFinalFormTree($childForm, $childView, $outputByHash);
         }
+
+        return $output;
     }
 }

From bfe149fdc68b411e76aca2610e2358cde50b6ac4 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 5 Dec 2016 18:10:19 +0100
Subject: [PATCH 37/81] [Cache] Fix dumping SplDoublyLinkedList iter mode

---
 .../Component/VarDumper/Caster/SplCaster.php  |  2 +-
 .../VarDumper/Tests/Caster/SplCasterTest.php  | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php

diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
index 79e8bb80b9afc..b0b57e3cda598 100644
--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -64,7 +64,7 @@ public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, S
         $c->setIteratorMode(\SplDoublyLinkedList::IT_MODE_KEEP | $mode & ~\SplDoublyLinkedList::IT_MODE_DELETE);
 
         $a += array(
-            $prefix.'mode' => new ConstStub((($mode & \SplDoublyLinkedList::IT_MODE_LIFO) ? 'IT_MODE_LIFO' : 'IT_MODE_FIFO').' | '.(($mode & \SplDoublyLinkedList::IT_MODE_KEEP) ? 'IT_MODE_KEEP' : 'IT_MODE_DELETE'), $mode),
+            $prefix.'mode' => new ConstStub((($mode & \SplDoublyLinkedList::IT_MODE_LIFO) ? 'IT_MODE_LIFO' : 'IT_MODE_FIFO').' | '.(($mode & \SplDoublyLinkedList::IT_MODE_DELETE) ? 'IT_MODE_DELETE' : 'IT_MODE_KEEP'), $mode),
             $prefix.'dllist' => iterator_to_array($c),
         );
         $c->setIteratorMode($mode);
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
new file mode 100644
index 0000000000000..96e0307385fb6
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -0,0 +1,43 @@
+<?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\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Test\VarDumperTestCase;
+
+class SplCasterTest extends VarDumperTestCase
+{
+    /**
+     * @dataProvider provideCastSplDoublyLinkedList
+     */
+    public function testCastSplDoublyLinkedList($modeValue, $modeDump)
+    {
+        $var = new \SplDoublyLinkedList();
+        $var->setIteratorMode($modeValue);
+        $dump = <<<EOTXT
+SplDoublyLinkedList {
+%Amode: $modeDump
+  dllist: []
+}
+EOTXT;
+        $this->assertDumpMatchesFormat($dump, $var);
+    }
+
+    public function provideCastSplDoublyLinkedList()
+    {
+        return array(
+            array(\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'),
+            array(\SplDoublyLinkedList::IT_MODE_LIFO, 'IT_MODE_LIFO | IT_MODE_KEEP'),
+            array(\SplDoublyLinkedList::IT_MODE_FIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_FIFO | IT_MODE_DELETE'),
+            array(\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_LIFO | IT_MODE_DELETE'),
+        );
+    }
+}

From 50400c45eedfd748a953dd39e6ce782fd9f22422 Mon Sep 17 00:00:00 2001
From: Adam Prager <prager.adam87@gmail.com>
Date: Mon, 5 Dec 2016 18:24:28 +0100
Subject: [PATCH 38/81] [Form] Add failing test for data collector bug

---
 .../DataCollector/FormDataCollector.php       |   2 +-
 .../DataCollector/FormDataCollectorTest.php   | 108 ++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index a0f5a7835ad31..a4b4dcfcc866d 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -254,7 +254,7 @@ public function serialize()
                     case 'resolved_options':
                     case 'default_data':
                     case 'submitted_data':
-                        if ($v) {
+                        if ($v && is_array($v)) {
                             $form[$k] = array_map($cloneVar, $v);
                         }
                         break;
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
index 0fddf14dc57bc..ff75cff20a726 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
@@ -342,6 +342,114 @@ public function testBuildFinalFormTree()
         ), $this->dataCollector->getData());
     }
 
+    public function testSerializeWithFormAddedMultipleTimes()
+    {
+        $form1 = $this->createForm('form1');
+        $form2 = $this->createForm('form2');
+        $child1 = $this->createForm('child1');
+
+        $form1View = new FormView();
+        $form2View = new FormView();
+        $child1View = new FormView();
+        $child1View->vars['is_selected'] = function ($choice, array $values) {
+            return in_array($choice, $values, true);
+        };
+
+        $form1->add($child1);
+        $form2->add($child1);
+
+        $form1View->children['child1'] = $child1View;
+        $form2View->children['child1'] = $child1View;
+
+        $this->dataExtractor->expects($this->at(0))
+            ->method('extractConfiguration')
+            ->with($form1)
+            ->will($this->returnValue(array('config' => 'foo')));
+        $this->dataExtractor->expects($this->at(1))
+            ->method('extractConfiguration')
+            ->with($child1)
+            ->will($this->returnValue(array('config' => 'bar')));
+
+        $this->dataExtractor->expects($this->at(2))
+            ->method('extractDefaultData')
+            ->with($form1)
+            ->will($this->returnValue(array('default_data' => 'foo')));
+        $this->dataExtractor->expects($this->at(3))
+            ->method('extractDefaultData')
+            ->with($child1)
+            ->will($this->returnValue(array('default_data' => 'bar')));
+
+        $this->dataExtractor->expects($this->at(4))
+            ->method('extractSubmittedData')
+            ->with($form1)
+            ->will($this->returnValue(array('submitted_data' => 'foo')));
+        $this->dataExtractor->expects($this->at(5))
+            ->method('extractSubmittedData')
+            ->with($child1)
+            ->will($this->returnValue(array('submitted_data' => 'bar')));
+
+        $this->dataExtractor->expects($this->at(6))
+            ->method('extractViewVariables')
+            ->with($form1View)
+            ->will($this->returnValue(array('view_vars' => 'foo')));
+
+        $this->dataExtractor->expects($this->at(7))
+            ->method('extractViewVariables')
+            ->with($child1View)
+            ->will($this->returnValue(array('view_vars' => $child1View->vars)));
+
+        $this->dataExtractor->expects($this->at(8))
+            ->method('extractConfiguration')
+            ->with($form2)
+            ->will($this->returnValue(array('config' => 'foo')));
+        $this->dataExtractor->expects($this->at(9))
+            ->method('extractConfiguration')
+            ->with($child1)
+            ->will($this->returnValue(array('config' => 'bar')));
+
+        $this->dataExtractor->expects($this->at(10))
+            ->method('extractDefaultData')
+            ->with($form2)
+            ->will($this->returnValue(array('default_data' => 'foo')));
+        $this->dataExtractor->expects($this->at(11))
+            ->method('extractDefaultData')
+            ->with($child1)
+            ->will($this->returnValue(array('default_data' => 'bar')));
+
+        $this->dataExtractor->expects($this->at(12))
+            ->method('extractSubmittedData')
+            ->with($form2)
+            ->will($this->returnValue(array('submitted_data' => 'foo')));
+        $this->dataExtractor->expects($this->at(13))
+            ->method('extractSubmittedData')
+            ->with($child1)
+            ->will($this->returnValue(array('submitted_data' => 'bar')));
+
+        $this->dataExtractor->expects($this->at(14))
+            ->method('extractViewVariables')
+            ->with($form2View)
+            ->will($this->returnValue(array('view_vars' => 'foo')));
+
+        $this->dataExtractor->expects($this->at(15))
+            ->method('extractViewVariables')
+            ->with($child1View)
+            ->will($this->returnValue(array('view_vars' => $child1View->vars)));
+
+        $this->dataCollector->collectConfiguration($form1);
+        $this->dataCollector->collectDefaultData($form1);
+        $this->dataCollector->collectSubmittedData($form1);
+        $this->dataCollector->collectViewVariables($form1View);
+        $this->dataCollector->buildFinalFormTree($form1, $form1View);
+
+        $this->dataCollector->collectConfiguration($form2);
+        $this->dataCollector->collectDefaultData($form2);
+        $this->dataCollector->collectSubmittedData($form2);
+        $this->dataCollector->collectViewVariables($form2View);
+        $this->dataCollector->buildFinalFormTree($form2, $form2View);
+
+        $this->dataCollector->serialize();
+    }
+
     public function testFinalFormReliesOnFormViewStructure()
     {
         $this->form->add($child1 = $this->createForm('first'));

From d99234a93020535f8acddb28a891f8016ae83943 Mon Sep 17 00:00:00 2001
From: Edwin Hageman <edwin.hageman@gmail.com>
Date: Mon, 5 Dec 2016 17:26:24 +0100
Subject: [PATCH 39/81] FIXED NON EXISTING TYPE DECLARATION

---
 src/Symfony/Component/Validator/ConstraintValidator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php
index 965a888af0981..ece4400065c6a 100644
--- a/src/Symfony/Component/Validator/ConstraintValidator.php
+++ b/src/Symfony/Component/Validator/ConstraintValidator.php
@@ -36,7 +36,7 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
     const OBJECT_TO_STRING = 2;
 
     /**
-     * @var ExecutionContextInterface2Dot5
+     * @var ExecutionContextInterface
      */
     protected $context;
 

From 182f90638d9b5f2f35a177471a5afe5af29cfec7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 6 Dec 2016 15:06:08 +0100
Subject: [PATCH 40/81] Fix merge

---
 .../Component/Form/Tests/Extension/Core/Type/FileTypeTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
index cbeeb468c1c22..fe7a6b1d727ec 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -56,7 +56,7 @@ public function testSubmitEmpty()
 
     public function testSubmitEmptyMultiple()
     {
-        $form = $this->factory->createBuilder('file', null, array(
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FileType', null, array(
             'multiple' => true,
         ))->getForm();
 
@@ -68,7 +68,7 @@ public function testSubmitEmptyMultiple()
 
     public function testSetDataMultiple()
     {
-        $form = $this->factory->createBuilder('file', null, array(
+        $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FileType', null, array(
             'multiple' => true,
         ))->getForm();
 

From 488ebbfe5d8acfad8baf8710fcdcf390962f5394 Mon Sep 17 00:00:00 2001
From: ShinDarth <borzifrancesco@gmail.com>
Date: Tue, 6 Dec 2016 16:01:27 +0100
Subject: [PATCH 41/81] [VarDumper] fix tests when xdebug is enabled

---
 src/Symfony/Component/VarDumper/Tests/VarClonerTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php b/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
index 1184f2c76a255..9f60032e0c62b 100644
--- a/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/VarClonerTest.php
@@ -137,6 +137,10 @@ public function testClone()
 
     public function testJsonCast()
     {
+        if (ini_get('xdebug.overload_var_dump') == 2) {
+            $this->markTestSkipped('xdebug is active');
+        }
+
         $data = (array) json_decode('{"1":{}}');
 
         $cloner = new VarCloner();

From a77761833f478cbf99ad3fdad03f247e0d5de94d Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 6 Dec 2016 17:18:42 +0100
Subject: [PATCH 42/81] Don't use the "app" global variable in the profiler

---
 .../WebProfilerBundle/Resources/views/Profiler/layout.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index e6da0d4e5812d..447162c9b5b62 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -39,7 +39,7 @@
                                     {%- else -%}
                                             {{ redirect_route }}
                                     {%- endif %}
-                                    (<a href="{{ path('_profiler', { token: redirect.token, panel: app.request.query.get('panel', 'request') }) }}">{{ redirect.token }}</a>)
+                                    (<a href="{{ path('_profiler', { token: redirect.token, panel: request.query.get('panel', 'request') }) }}">{{ redirect.token }}</a>)
                                 </dd>
                             </dl>
                         {%- endif %}

From 8fe144e86aa44884f05dd6b3c670c1b4b36a25cf Mon Sep 17 00:00:00 2001
From: Adam Prager <prager.adam87@gmail.com>
Date: Tue, 6 Dec 2016 14:57:19 +0100
Subject: [PATCH 43/81] [Workflow] Added missing docblock

---
 src/Symfony/Component/Workflow/DefinitionBuilder.php | 3 +++
 src/Symfony/Component/Workflow/Registry.php          | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/Symfony/Component/Workflow/DefinitionBuilder.php b/src/Symfony/Component/Workflow/DefinitionBuilder.php
index 447d67337d09f..34d27aa5e9d0d 100644
--- a/src/Symfony/Component/Workflow/DefinitionBuilder.php
+++ b/src/Symfony/Component/Workflow/DefinitionBuilder.php
@@ -79,6 +79,9 @@ public function addPlaces(array $places)
         }
     }
 
+    /**
+     * @param Transition[] $transitions
+     */
     public function addTransitions(array $transitions)
     {
         foreach ($transitions as $transition) {
diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
index 619ed5f66a5b1..53e06fbb5e8e4 100644
--- a/src/Symfony/Component/Workflow/Registry.php
+++ b/src/Symfony/Component/Workflow/Registry.php
@@ -30,6 +30,12 @@ public function add(Workflow $workflow, $className)
         $this->workflows[] = array($workflow, $className);
     }
 
+    /**
+     * @param object      $subject
+     * @param string|null $workflowName
+     *
+     * @return Workflow
+     */
     public function get($subject, $workflowName = null)
     {
         $matched = null;

From 6f1c59c7ef6456c8357e4f3512d4b8e4db98cfd9 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 5 Dec 2016 18:36:31 +0100
Subject: [PATCH 44/81] [Bridge\Twig] Trigger deprecation when using
 FormExtension::$renderer

---
 .../Bridge/Twig/Extension/FormExtension.php   | 70 ++++++++++++++++++-
 .../TwigBundle/Resources/config/twig.xml      |  7 +-
 src/Symfony/Bundle/TwigBundle/composer.json   |  2 +-
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
index 016e6a9586c97..d5c08038ecc46 100644
--- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
 use Symfony\Bridge\Twig\Form\TwigRendererInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 
 /**
@@ -23,12 +24,17 @@
  */
 class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface
 {
+    /**
+     * @deprecated since version 3.2, to be removed in 4.0 alongside with magic methods below
+     */
     private $renderer;
 
-    public function __construct(TwigRendererInterface $renderer = null)
+    public function __construct($renderer = null)
     {
-        if (null !== $this->renderer) {
+        if ($this->renderer instanceof TwigRendererInterface) {
             @trigger_error(sprintf('Passing a Twig Form Renderer to the "%s" constructor is deprecated since version 3.2 and won\'t be possible in 4.0. Pass the Twig_Environment to the TwigRendererEngine constructor instead.', static::class), E_USER_DEPRECATED);
+        } elseif (null !== $renderer && !(is_array($renderer) && isset($renderer[0], $renderer[1]) && $renderer[0] instanceof ContainerInterface)) {
+            throw new \InvalidArgumentException(sprintf('Passing any arguments the constructor of %s is reserved for internal use.', __CLASS__));
         }
         $this->renderer = $renderer;
     }
@@ -40,8 +46,10 @@ public function __construct(TwigRendererInterface $renderer = null)
      */
     public function initRuntime(\Twig_Environment $environment)
     {
-        if (null !== $this->renderer) {
+        if ($this->renderer instanceof TwigRendererInterface) {
             $this->renderer->setEnvironment($environment);
+        } elseif (null !== $this->renderer) {
+            $this->renderer[2] = $environment;
         }
     }
 
@@ -94,6 +102,62 @@ public function getTests()
         );
     }
 
+    /**
+     * @internal
+     */
+    public function __get($name)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+
+            if (is_array($this->renderer)) {
+                $renderer = $this->renderer[0]->get($this->renderer[1]);
+                if (isset($this->renderer[2])) {
+                    $renderer->setEnvironment($this->renderer[2]);
+                }
+                $this->renderer = $renderer;
+            }
+        }
+
+        return $this->$name;
+    }
+
+    /**
+     * @internal
+     */
+    public function __set($name, $value)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        $this->$name = $value;
+    }
+
+    /**
+     * @internal
+     */
+    public function __isset($name)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        return isset($this->$name);
+    }
+
+    /**
+     * @internal
+     */
+    public function __unset($name)
+    {
+        if ('renderer' === $name) {
+            @trigger_error(sprintf('Using the "%s::$renderer" property is deprecated since version 3.2 as it will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
+        unset($this->$name);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 06af08d15ba7a..f584cd75e3968 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -118,7 +118,12 @@
             <argument type="service" id="router.request_context" on-invalid="ignore" />
         </service>
 
-        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false" />
+        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
+            <argument type="collection">
+                <argument type="service" id="service_container" />
+                <argument>twig.form.renderer</argument>
+            </argument>
+        </service>
 
         <service id="twig.extension.debug" class="Twig_Extension_Debug" public="false" />
 
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index fbb5f9bf8afd5..ecb5ed5917a17 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "symfony/twig-bridge": "~3.2",
+        "symfony/twig-bridge": "^3.2.1",
         "symfony/http-foundation": "~2.8|~3.0",
         "symfony/http-kernel": "~2.8|~3.0",
         "twig/twig": "~1.28|~2.0"

From 4e563aee0232e81667a74884978a123f24e75704 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Tue, 6 Dec 2016 21:51:50 +0100
Subject: [PATCH 45/81] fix the docblock in regard to the role argument

---
 .../Security/Core/Authentication/Token/AbstractToken.php        | 2 +-
 .../Core/Authentication/Token/PreAuthenticatedToken.php         | 2 +-
 .../Core/Authentication/Token/UsernamePasswordToken.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
index 7538648b1329f..2e9c0f34b4b5d 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -33,7 +33,7 @@ abstract class AbstractToken implements TokenInterface
     /**
      * Constructor.
      *
-     * @param RoleInterface[]|string[] $roles An array of roles
+     * @param (RoleInterface|string)[] $roles An array of roles
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
index b4b5e70b188fb..a5460f50839ee 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
@@ -29,7 +29,7 @@ class PreAuthenticatedToken extends AbstractToken
      * @param string|object            $user        The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
      * @param mixed                    $credentials The user credentials
      * @param string                   $providerKey The provider key
-     * @param RoleInterface[]|string[] $roles       An array of roles
+     * @param (RoleInterface|string)[] $roles       An array of roles
      */
     public function __construct($user, $credentials, $providerKey, array $roles = array())
     {
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
index 33b00f01f82ae..71d19adc14f2b 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
@@ -29,7 +29,7 @@ class UsernamePasswordToken extends AbstractToken
      * @param string|object            $user        The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method
      * @param string                   $credentials This usually is the password of the user
      * @param string                   $providerKey The provider key
-     * @param RoleInterface[]|string[] $roles       An array of roles
+     * @param (RoleInterface|string)[] $roles       An array of roles
      *
      * @throws \InvalidArgumentException
      */

From ad477e705e5f95e7869d3b0aa50fb5e540bf1727 Mon Sep 17 00:00:00 2001
From: Victor Bocharsky <bocharsky.bw@gmail.com>
Date: Wed, 7 Dec 2016 13:56:23 +0200
Subject: [PATCH 46/81] Fix email address

---
 .../Security/Guard/Token/PostAuthenticationGuardToken.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php b/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
index 36c40cab9579d..5b353d97a6dd6 100644
--- a/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
+++ b/src/Symfony/Component/Security/Guard/Token/PostAuthenticationGuardToken.php
@@ -21,7 +21,7 @@
  * If you're using Guard authentication, you *must* use a class that implements
  * GuardTokenInterface as your authenticated token (like this class).
  *
- * @author Ryan Weaver <ryan@knpuniversity.com>n@gmail.com>
+ * @author Ryan Weaver <ryan@knpuniversity.com>
  */
 class PostAuthenticationGuardToken extends AbstractToken implements GuardTokenInterface
 {

From 8e1dac5507fd1b613a2245271ae1c4cb6e01c080 Mon Sep 17 00:00:00 2001
From: Sander Toonen <sander@ib.nl>
Date: Wed, 7 Dec 2016 14:49:15 +0100
Subject: [PATCH 47/81] [FrameworkBundle] Removed the kernel.debug parameter
 from the cache pool namespace seed

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

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
index 1748862219ddf..93adf546b7c7b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
     {
         $namespaceSuffix = '';
 
-        foreach (array('name', 'root_dir', 'environment', 'debug') as $key) {
+        foreach (array('name', 'root_dir', 'environment') as $key) {
             if ($container->hasParameter('kernel.'.$key)) {
                 $namespaceSuffix .= '.'.$container->getParameter('kernel.'.$key);
             }

From 3f94abde00df6fd1038a8beede3f101e79352b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz?= <lukaszgizy@gmail.com>
Date: Thu, 8 Dec 2016 08:04:49 +0100
Subject: [PATCH 48/81] Fixed typo

---
 .../Resources/views/Collector/exception.css.twig                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
index 197cc010d2e40..0d057b98a4334 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
@@ -9,7 +9,7 @@
     padding-bottom: 2px;
 }
 .sf-reset .traces li {
-    ccolor: #222;
+    color: #222;
     font-size: 14px;
     padding: 5px 0;
     list-style-type: decimal;

From 685a9b9d9adff18befeafffdc525e87c5034e29b Mon Sep 17 00:00:00 2001
From: Maxime STEINHAUSSER <maxime.steinhausser@elao.com>
Date: Thu, 8 Dec 2016 11:30:28 +0100
Subject: [PATCH 49/81] [Config] Fix YamlReferenceDumper extra space

---
 .../Component/Config/Definition/Dumper/YamlReferenceDumper.php  | 2 +-
 .../Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php   | 1 +
 .../Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php  | 1 +
 .../Tests/Fixtures/Configuration/ExampleConfiguration.php       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index f9da698e0924e..12ababe39435b 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -120,7 +120,7 @@ private function writeNode(NodeInterface $node, $depth = 0)
         $default = (string) $default != '' ? ' '.$default : '';
         $comments = count($comments) ? '# '.implode(', ', $comments) : '';
 
-        $text = rtrim(sprintf('%-20s %s %s', $node->getName().':', $default, $comments), ' ');
+        $text = rtrim(sprintf('%-21s%s %s', $node->getName().':', $default, $comments), ' ');
 
         if ($info = $node->getInfo()) {
             $this->writeLine('');
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
index 42207b0399e37..2c0551d062ef0 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
@@ -49,6 +49,7 @@ private function getConfigurationAsString()
     scalar-array-empty=""
     scalar-array-defaults="elem1,elem2"
     scalar-required=""
+    node-with-a-looong-name=""
     enum-with-default="this"
     enum=""
 >
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
index 131ca072fe6f6..ad1daddd7e07c 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -43,6 +43,7 @@ private function getConfigurationAsString()
         - elem1
         - elem2
     scalar_required:      ~ # Required
+    node_with_a_looong_name: ~
     enum_with_default:    this # One of "this"; "that"
     enum:                 ~ # One of "this"; "that"
 
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
index 68aa0c059399c..1573177f440ce 100644
--- a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
+++ b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
@@ -34,6 +34,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('scalar_array_empty')->defaultValue(array())->end()
                 ->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end()
                 ->scalarNode('scalar_required')->isRequired()->end()
+                ->scalarNode('node_with_a_looong_name')->end()
                 ->enumNode('enum_with_default')->values(array('this', 'that'))->defaultValue('this')->end()
                 ->enumNode('enum')->values(array('this', 'that'))->end()
                 ->arrayNode('array')

From 1ed9335e88ed543e8ab9104c3c2f4a5370d716a2 Mon Sep 17 00:00:00 2001
From: Maxime STEINHAUSSER <maxime.steinhausser@elao.com>
Date: Thu, 8 Dec 2016 11:59:24 +0100
Subject: [PATCH 50/81] [Config] Do not skip YamlReferenceDumperTest entirely

---
 .../Tests/Definition/Dumper/YamlReferenceDumperTest.php   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
index 131ca072fe6f6..21cce575e3732 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -22,8 +22,8 @@ public function testDumper()
 
         $dumper = new YamlReferenceDumper();
 
+        $this->assertContains($this->getConfigurationAsString(), $dumper->dump($configuration));
         $this->markTestIncomplete('The Yaml Dumper currently does not support prototyped arrays');
-        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
     }
 
     private function getConfigurationAsString()
@@ -32,7 +32,7 @@ private function getConfigurationAsString()
 acme_root:
     boolean:              true
     scalar_empty:         ~
-    scalar_null:          ~
+    scalar_null:          null
     scalar_true:          true
     scalar_false:         false
     scalar_default:       default
@@ -59,10 +59,6 @@ enum:                 ~ # One of "this"; "that"
 
         # Prototype
         name:                 ~
-    connections:
-        # Prototype
-        - { user: ~, pass: ~ }
-
 EOL;
     }
 }

From 073a1dae1318519066ca9fb0d2dc53392ac5fbca Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 8 Dec 2016 13:07:24 +0100
Subject: [PATCH 51/81] [Validator] Fix init of YamlFileLoader::$classes for
 empty files

---
 .../Validator/Mapping/Loader/YamlFileLoader.php      | 12 +++---------
 .../Tests/Mapping/Loader/YamlFileLoaderTest.php      |  4 ++++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index cf6dd92dcad9b..16212833dc169 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -46,13 +46,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
                 $this->yamlParser = new YamlParser();
             }
 
-            // This method may throw an exception. Do not modify the class'
-            // state before it completes
-            if (false === ($classes = $this->parseFile($this->file))) {
-                return false;
-            }
-
-            $this->classes = $classes;
+            $this->classes = $this->parseFile($this->file);
 
             if (isset($this->classes['namespaces'])) {
                 foreach ($this->classes['namespaces'] as $alias => $namespace) {
@@ -111,7 +105,7 @@ protected function parseNodes(array $nodes)
      *
      * @param string $path The path of the YAML file
      *
-     * @return array|null The class descriptions or null, if the file was empty
+     * @return array The class descriptions
      *
      * @throws \InvalidArgumentException If the file could not be loaded or did
      *                                   not contain a YAML array
@@ -126,7 +120,7 @@ private function parseFile($path)
 
         // empty file
         if (null === $classes) {
-            return;
+            return array();
         }
 
         // not an array
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 2ca64122aafae..15f02139ae318 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -31,6 +31,10 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()
         $metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
 
         $this->assertFalse($loader->loadClassMetadata($metadata));
+
+        $r = new \ReflectionProperty($loader, 'classes');
+        $r->setAccessible(true);
+        $this->assertSame(array(), $r->getValue($loader));
     }
 
     /**

From 53234e907af8ea2d0a3dee46dca0dc0d49d37d8b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 8 Dec 2016 13:36:55 +0100
Subject: [PATCH 52/81] [FrameworkBundle] Fix validation cache warmer with
 failing or missing classes

---
 .../CacheWarmer/ValidatorCacheWarmer.php      | 19 +++++++++++++++----
 .../Tests/Fixtures/Validation/Article.php     |  8 ++++++++
 .../Fixtures/Validation/Resources/person.xml  |  4 ++--
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index ce5104dc41cc5..d450cc1f85237 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -66,12 +66,23 @@ public function warmUp($cacheDir)
         $loaders = $this->validatorBuilder->getLoaders();
         $metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), new Psr6Cache($arrayPool));
 
-        foreach ($this->extractSupportedLoaders($loaders) as $loader) {
-            foreach ($loader->getMappedClasses() as $mappedClass) {
-                if ($metadataFactory->hasMetadataFor($mappedClass)) {
-                    $metadataFactory->getMetadataFor($mappedClass);
+        $throwingAutoloader = function ($class) { throw new \ReflectionException(sprintf('Class %s does not exist', $class)); };
+        spl_autoload_register($throwingAutoloader);
+
+        try {
+            foreach ($this->extractSupportedLoaders($loaders) as $loader) {
+                foreach ($loader->getMappedClasses() as $mappedClass) {
+                    try {
+                        if ($metadataFactory->hasMetadataFor($mappedClass)) {
+                            $metadataFactory->getMetadataFor($mappedClass);
+                        }
+                    } catch (\ReflectionException $e) {
+                        // ignore failing reflection
+                    }
                 }
             }
+        } finally {
+            spl_autoload_unregister($throwingAutoloader);
         }
 
         $values = $arrayPool->getValues();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
new file mode 100644
index 0000000000000..a1ecee6d0b375
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
+
+class Article implements NotExistingInterface
+{
+    public $category;
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
index b23760ae4556c..f58be2dc6c0b4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
@@ -16,8 +16,8 @@
         </property>
     </class>
 
-    <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\NonExistentClass">
-        <property name="gender">
+    <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Article">
+        <property name="category">
             <constraint name="Choice">
                 <option name="choices">
                     <value>other</value>

From 9218cacf317c0df071b4c338dd4173c63922328d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 8 Dec 2016 14:23:09 +0100
Subject: [PATCH 53/81] [Twig] Fix deprecations with Twig 1.29

---
 .../Tests/Translation/TwigExtractorTest.php    | 17 ++++++++++++++---
 .../Bridge/Twig/Translation/TwigExtractor.php  | 12 ++++++++----
 src/Symfony/Bundle/TwigBundle/TwigEngine.php   |  8 +++++++-
 .../Resources/views/Profiler/layout.html.twig  |  8 +++++---
 .../Resources/views/Profiler/toolbar.html.twig | 18 ++++++++++--------
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
index 5e7c4ce5216d0..23869da436d68 100644
--- a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -72,8 +72,7 @@ public function getExtractData()
     }
 
     /**
-     * @expectedException              \Twig_Error
-     * @expectedExceptionMessageRegExp /Unclosed "block" in ".*extractor(\/|\\)syntax_error\.twig" at line 1/
+     * @expectedException \Twig_Error
      * @dataProvider resourcesWithSyntaxErrorsProvider
      */
     public function testExtractSyntaxError($resources)
@@ -82,7 +81,19 @@ public function testExtractSyntaxError($resources)
         $twig->addExtension(new TranslationExtension($this->getMock('Symfony\Component\Translation\TranslatorInterface')));
 
         $extractor = new TwigExtractor($twig);
-        $extractor->extract($resources, new MessageCatalogue('en'));
+
+        try {
+            $extractor->extract($resources, new MessageCatalogue('en'));
+        } catch (\Twig_Error $e) {
+            if (method_exists($e, 'getSourceContext')) {
+                $this->assertSame(dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', DIRECTORY_SEPARATOR), $e->getFile());
+                $this->assertSame(1, $e->getLine());
+                $this->assertSame('Unclosed "block".', $e->getMessage());
+            } else {
+                $this->expectExceptionMessageRegExp('/Unclosed "block" in ".*extractor(\\/|\\\\)syntax_error\\.twig" at line 1/');
+            }
+            throw $e;
+        }
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
index 950c4d0810db0..35995dbd64518 100644
--- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -61,10 +61,14 @@ public function extract($resource, MessageCatalogue $catalogue)
             try {
                 $this->extractTemplate(file_get_contents($file->getPathname()), $catalogue);
             } catch (\Twig_Error $e) {
-                if ($file instanceof SplFileInfo) {
-                    $e->setTemplateName($file->getRelativePathname());
-                } elseif ($file instanceof \SplFileInfo) {
-                    $e->setTemplateName($file->getRealPath() ?: $file->getPathname());
+                if ($file instanceof \SplFileInfo) {
+                    $path = $file->getRealPath() ?: $file->getPathname();
+                    $name = $file instanceof SplFileInfo ? $file->getRelativePathname() : $path;
+                    if (method_exists($e, 'setSourceContext')) {
+                        $e->setSourceContext(new \Twig_Source('', $name, $path));
+                    } else {
+                        $e->setTemplateName($name);
+                    }
                 }
 
                 throw $e;
diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
index 0d01648d57587..fb4b728a5bede 100644
--- a/src/Symfony/Bundle/TwigBundle/TwigEngine.php
+++ b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -74,7 +74,13 @@ public function render($name, array $parameters = array())
             if ($name instanceof TemplateReference) {
                 try {
                     // try to get the real name of the template where the error occurred
-                    $e->setTemplateName(sprintf('%s', $this->locator->locate($this->parser->parse($e->getTemplateName()))));
+                    $name = $e->getTemplateName();
+                    $path = (string) $this->locator->locate($this->parser->parse($name));
+                    if (method_exists($e, 'setSourceContext')) {
+                        $e->setSourceContext(new \Twig_Source('', $name, $path));
+                    } else {
+                        $e->setTemplateName($path);
+                    }
                 } catch (\Exception $e2) {
                 }
             }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index a3d761deedba2..37be3ab98da46 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -37,9 +37,11 @@
                         <ul id="menu-profiler">
                             {% for name, template in templates %}
                                 {% set menu -%}
-                                    {% with { 'collector': profile.getcollector(name) } %}
-                                        {{- block('menu', template) -}}
-                                    {% endwith %}
+                                    {% if block('menu', template) is defined %}
+                                        {% with { 'collector': profile.getcollector(name) } %}
+                                            {{- block('menu', template) -}}
+                                        {% endwith %}
+                                    {% endif %}
                                 {%- endset %}
                                 {% if menu != '' %}
                                     <li class="{{ name }}{% if name == panel %} selected{% endif %}">
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
index 508a1a84b8da4..e0759d17bb029 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@@ -26,14 +26,16 @@
 
 <div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset clear-fix" data-no-turbolink>
     {% for name, template in templates %}
-        {% with {
-            'collector': profile.getcollector(name),
-            'profiler_url': profiler_url,
-            'token': profile.token,
-            'name': name
-          } %}
-            {{ block('toolbar', template) }}
-        {% endwith %}
+        {% if block('toolbar', template) is defined %}
+            {% with {
+                'collector': profile.getcollector(name),
+                'profiler_url': profiler_url,
+                'token': profile.token,
+                'name': name
+              } %}
+                {{ block('toolbar', template) }}
+            {% endwith %}
+        {% endif %}
     {% endfor %}
 
     {% if 'normal' != position %}

From ec28da42ae01705bd019b0f5cb9bf2c0cdc8a978 Mon Sep 17 00:00:00 2001
From: Bram Tweedegolf <bram@tweedegolf.com>
Date: Wed, 22 Jun 2016 14:09:31 +0200
Subject: [PATCH 54/81] Throw less misleading exception when property access
 not found

---
 src/Symfony/Component/PropertyAccess/PropertyAccessor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 900b0bfc5501c..0e0df89457931 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -608,6 +608,8 @@ private function writeProperty($zval, $property, $value)
             // fatal error.
 
             $object->$property = $value;
+        } elseif (self::ACCESS_TYPE_NOT_FOUND === $access[self::ACCESS_TYPE]) {
+            throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s".', $property));
         } elseif (self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE]) {
             $object->{$access[self::ACCESS_NAME]}($value);
         } else {

From fea18aae41b35680200c48fc33ce365526403866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 15 Nov 2016 22:34:49 +0100
Subject: [PATCH 55/81] [Serializer] Remove
 AbstractObjectNormalizer::isAttributeToNormalize

---
 UPGRADE-3.1.md                                     |  4 ++++
 .../Normalizer/AbstractObjectNormalizer.php        | 14 --------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
index b9163cfff369e..58ce838cfb714 100644
--- a/UPGRADE-3.1.md
+++ b/UPGRADE-3.1.md
@@ -111,6 +111,10 @@ Serializer
    deprecated and will not be supported in Symfony 4.0. You should use the
    `CacheClassMetadataFactory` class instead.
 
+ * The `AbstractObjectNormalizer::isAttributeToNormalize()` method has been removed
+   because it was initially added by mistake, has never been used and is not tested
+   nor documented.
+
 Translation
 -----------
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 9ff231e7a426c..278ec1eb95713 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -208,20 +208,6 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     abstract protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array());
 
-    /**
-     * Should this attribute be normalized?
-     *
-     * @param mixed  $object
-     * @param string $attributeName
-     * @param array  $context
-     *
-     * @return bool
-     */
-    protected function isAttributeToNormalize($object, $attributeName, &$context)
-    {
-        return !in_array($attributeName, $this->ignoredAttributes) && !$this->isMaxDepthReached(get_class($object), $attributeName, $context);
-    }
-
     /**
      * Validates the submitted data and denormalizes it.
      *

From 1681fc9c584dcd3594222ffadf55fdffe8fb91ad Mon Sep 17 00:00:00 2001
From: Amrouche Hamza <hamza@les-tilleuls.coop>
Date: Sat, 3 Dec 2016 14:35:45 +0100
Subject: [PATCH 56/81] [Validator] add class name to the cache key

---
 .../Tests/Constraints/Fixtures/ChildA.php     | 30 ++++++++++++++
 .../Tests/Constraints/Fixtures/ChildB.php     | 29 +++++++++++++
 .../Validator/Tests/Fixtures/Entity.php       | 40 ++++++++++++++++++
 .../Mapping/Loader/AnnotationLoaderTest.php   |  5 +++
 .../Validator/RecursiveValidatorTest.php      | 41 +++++++++++++++++++
 .../RecursiveContextualValidator.php          |  6 +--
 6 files changed, 148 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildA.php
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildB.php

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildA.php b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildA.php
new file mode 100644
index 0000000000000..2234ecda28e88
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildA.php
@@ -0,0 +1,30 @@
+<?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\Validator\Tests\Constraints\Fixtures;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+class ChildA
+{
+    /**
+     * @Assert\Valid
+     * @Assert\NotNull
+     * @Assert\NotBlank
+     */
+    public $name;
+    /**
+     * @var ChildB
+     * @Assert\Valid
+     * @Assert\NotNull
+     */
+    public $childB;
+}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildB.php b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildB.php
new file mode 100644
index 0000000000000..1b02d889f2f62
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ChildB.php
@@ -0,0 +1,29 @@
+<?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\Validator\Tests\Constraints\Fixtures;
+
+use Symfony\Component\Validator\Constraints as Assert;
+
+class ChildB
+{
+    /**
+     * @Assert\Valid
+     * @Assert\NotBlank
+     */
+    public $name;
+    /**
+     * @var ChildA
+     * @Assert\Valid
+     * @Assert\NotBlank
+     */
+    public $childA;
+}
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php
index b93146b06d159..ddc1974a5fc6d 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php
@@ -33,6 +33,14 @@ class Entity extends EntityParent implements EntityInterfaceB
      * @Assert\Choice(choices={"A", "B"}, message="Must be one of %choices%")
      */
     public $firstName;
+    /**
+     * @Assert\Valid
+     */
+    public $childA;
+    /**
+     * @Assert\Valid
+     */
+    public $childB;
     protected $lastName;
     public $reference;
     public $reference2;
@@ -97,4 +105,36 @@ public function validateMe(ExecutionContextInterface $context)
     public static function validateMeStatic($object, ExecutionContextInterface $context)
     {
     }
+
+    /**
+     * @return mixed
+     */
+    public function getChildA()
+    {
+        return $this->childA;
+    }
+
+    /**
+     * @param mixed $childA
+     */
+    public function setChildA($childA)
+    {
+        $this->childA = $childA;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getChildB()
+    {
+        return $this->childB;
+    }
+
+    /**
+     * @param mixed $childB
+     */
+    public function setChildB($childB)
+    {
+        $this->childB = $childB;
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
index 0e2ad41d697a0..e2e1d47a3f7d8 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Constraints\IsTrue;
+use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
@@ -67,6 +68,8 @@ public function testLoadClassMetadata()
             'message' => 'Must be one of %choices%',
             'choices' => array('A', 'B'),
         )));
+        $expected->addPropertyConstraint('childA', new Valid());
+        $expected->addPropertyConstraint('childB', new Valid());
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterConstraint('valid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
@@ -137,6 +140,8 @@ public function testLoadClassMetadataAndMerge()
             'message' => 'Must be one of %choices%',
             'choices' => array('A', 'B'),
         )));
+        $expected->addPropertyConstraint('childA', new Valid());
+        $expected->addPropertyConstraint('childB', new Valid());
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterConstraint('valid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
diff --git a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
index ab045fc477b21..cd77e948d4b1b 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
+use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildA;
+use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildB;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
 use Symfony\Component\Validator\Validator\RecursiveValidator;
 
@@ -34,6 +36,45 @@ protected function createValidator(MetadataFactoryInterface $metadataFactory, ar
     public function testEmptyGroupsArrayDoesNotTriggerDeprecation()
     {
         $entity = new Entity();
+        $childA = new ChildA();
+        $childB = new ChildB();
+        $childA->name = false;
+        $childB->name = 'fake';
+        $entity->childA = array($childA);
+        $entity->childB = array($childB);
+        $validatorContext = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
+        $validatorContext
+            ->expects($this->once())
+            ->method('validate')
+            ->with($entity, null, array())
+            ->willReturnSelf();
+
+        $validator = $this
+            ->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
+            ->disableOriginalConstructor()
+            ->setMethods(array('startContext'))
+            ->getMock();
+        $validator
+            ->expects($this->once())
+            ->method('startContext')
+            ->willReturn($validatorContext);
+
+        $validator->validate($entity, null, array());
+    }
+
+    public function testRelationBetweenChildAAndChildB()
+    {
+        $entity = new Entity();
+        $childA = new ChildA();
+        $childB = new ChildB();
+
+        $childA->childB = $childB;
+        $childB->childA = $childA;
+
+        $childA->name = false;
+        $childB->name = 'fake';
+        $entity->childA = array($childA);
+        $entity->childB = array($childB);
 
         $validatorContext = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
         $validatorContext
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 96476680a42b5..941557e4f9d5a 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -224,7 +224,7 @@ public function validateProperty($object, $propertyName, $groups = null)
             $this->validateGenericNode(
                 $propertyValue,
                 $object,
-                $cacheKey.':'.$propertyName,
+                $cacheKey.':'.get_class($object).':'.$propertyName,
                 $propertyMetadata,
                 $propertyPath,
                 $groups,
@@ -280,7 +280,7 @@ public function validatePropertyValue($objectOrClass, $propertyName, $value, $gr
             $this->validateGenericNode(
                 $value,
                 $object,
-                $cacheKey.':'.$propertyName,
+                $cacheKey.':'.get_class($object).':'.$propertyName,
                 $propertyMetadata,
                 $propertyPath,
                 $groups,
@@ -589,7 +589,7 @@ private function validateClassNode($object, $cacheKey, ClassMetadataInterface $m
                 $this->validateGenericNode(
                     $propertyValue,
                     $object,
-                    $cacheKey.':'.$propertyName,
+                    $cacheKey.':'.get_class($object).':'.$propertyName,
                     $propertyMetadata,
                     PropertyPath::append($propertyPath, $propertyName),
                     $groups,

From 59d04447b86746a0cfd166fa8f22ec1be80862c1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 8 Dec 2016 16:16:50 +0100
Subject: [PATCH 57/81] Fix merge

---
 .../PropertyAccess/Tests/PropertyAccessorCollectionTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
index ad87687bc0561..6721c2fb166e9 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -148,7 +148,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
-     * @expectedExceptionMessage Neither the property "axes" nor one of the methods "addAx()"/"removeAx()", "addAxe()"/"removeAxe()", "addAxis()"/"removeAxis()", "setAxes()", "axes()", "__set()" or "__call()" exist and have public access in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover
+     * @expectedExceptionMessage Could not determine access type for property "axes".
      */
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {

From 3289b10d9f57d88f73a7b9979cc919e7f9d5fdeb Mon Sep 17 00:00:00 2001
From: fduch <alex.medwedew@gmail.com>
Date: Mon, 5 Dec 2016 15:52:39 +0300
Subject: [PATCH 58/81] [FrameworkBundle] [Workflow] Fix service marking store
 configuration

---
 .../DependencyInjection/Configuration.php      |  2 +-
 .../Fixtures/php/workflows.php                 | 18 ++++++++++++++++++
 .../Fixtures/xml/workflows.xml                 | 11 +++++++++++
 .../Fixtures/yml/workflows.yml                 | 14 ++++++++++++++
 .../FrameworkExtensionTest.php                 |  6 ++++++
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 5c6208e6e46f2..adb825b7c3dfd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -268,7 +268,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
                                     ->thenInvalid('"type" and "service" cannot be used together.')
                                 ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) { return isset($v['arguments']) && isset($v['service']); })
+                                    ->ifTrue(function ($v) { return !empty($v['arguments']) && isset($v['service']); })
                                     ->thenInvalid('"arguments" and "service" cannot be used together.')
                                 ->end()
                             ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
index 854a858415e00..5ebfeeeb76e7a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
@@ -88,5 +88,23 @@
                 ),
             ),
         ),
+        'service_marking_store_workflow' => array(
+            'marking_store' => array(
+                'service' => 'workflow_service',
+            ),
+            'supports' => array(
+                FrameworkExtensionTest::class,
+            ),
+            'places' => array(
+                'first',
+                'last',
+            ),
+            'transitions' => array(
+                'go' => array(
+                    'from' => 'first',
+                    'to' => 'last',
+                ),
+            ),
+        ),
     ),
 ));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
index 924ff75111ca8..509bdd38fcc30 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
@@ -79,5 +79,16 @@
                 <framework:to>review</framework:to>
             </framework:transition>
         </framework:workflow>
+
+        <framework:workflow name="service_marking_store_workflow">
+            <framework:marking-store service="workflow_service"/>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:place>first</framework:place>
+            <framework:place>last</framework:place>
+            <framework:transition name="go">
+                <framework:from>first</framework:from>
+                <framework:to>last</framework:to>
+            </framework:transition>
+        </framework:workflow>
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
index a933db5100fc8..00cd4b55a897f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
@@ -63,3 +63,17 @@ framework:
                 reopen:
                     from: closed
                     to: review
+        service_marking_store_workflow:
+            marking_store:
+                service: workflow_service
+            supports:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+            places:
+                - first
+                - last
+            transitions:
+                go:
+                    from:
+                        - first
+                    to:
+                        - last
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index c1ee84685654f..940f5465187ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -165,6 +165,12 @@ public function testWorkflows()
         $this->assertSame(array('workflow.definition' => array(array('name' => 'pull_request', 'type' => 'state_machine', 'marking_store' => 'single_state'))), $stateMachineDefinition->getTags());
         $this->assertCount(9, $stateMachineDefinition->getArgument(1));
         $this->assertSame('start', $stateMachineDefinition->getArgument(2));
+
+        $serviceMarkingStoreWorkflowDefinition = $container->getDefinition('workflow.service_marking_store_workflow');
+        /** @var Reference $markingStoreRef */
+        $markingStoreRef = $serviceMarkingStoreWorkflowDefinition->getArgument(1);
+        $this->assertInstanceOf(Reference::class, $markingStoreRef);
+        $this->assertEquals('workflow_service', (string) $markingStoreRef);
     }
 
     /**

From 84ad8ebe3897b47aec4292431b74b0cbba0593d0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 8 Dec 2016 16:45:56 +0100
Subject: [PATCH 59/81] [HttpKernel] Fix open_basedir compat in DataCollector

---
 .../Component/HttpKernel/DataCollector/DataCollector.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
index 9674e08bbbc05..7d35996e1babd 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -135,7 +135,7 @@ private function decorateVar($var)
                     return self::$stubsCache[$var] = new ClassStub($var);
                 }
             }
-            if (false !== strpos($var, DIRECTORY_SEPARATOR) && false === strpos($var, '://') && false === strpos($var, "\0") && is_file($var)) {
+            if (false !== strpos($var, DIRECTORY_SEPARATOR) && false === strpos($var, '://') && false === strpos($var, "\0") && @is_file($var)) {
                 return self::$stubsCache[$var] = new LinkStub($var);
             }
         }

From d052fa933c42c8f0a44efdebe41f9c9f4a48e55f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 8 Dec 2016 16:37:50 +0100
Subject: [PATCH 60/81] [WebProfilerBundle] Fix whitespace control in
 layout.html.twig

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

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index 37be3ab98da46..101a494e0a160 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -37,11 +37,11 @@
                         <ul id="menu-profiler">
                             {% for name, template in templates %}
                                 {% set menu -%}
-                                    {% if block('menu', template) is defined %}
+                                    {%- if block('menu', template) is defined -%}
                                         {% with { 'collector': profile.getcollector(name) } %}
                                             {{- block('menu', template) -}}
                                         {% endwith %}
-                                    {% endif %}
+                                    {%- endif -%}
                                 {%- endset %}
                                 {% if menu != '' %}
                                     <li class="{{ name }}{% if name == panel %} selected{% endif %}">

From 91689a7961435400e6b1db3bc5bf35c8aa48e895 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 9 Dec 2016 07:11:54 +0100
Subject: [PATCH 61/81] add dependency on Twig

Requiring a specific minimum version of the TwigBridge just to be sure
that we end up with the required Twig version does not make much sense
if can simply specify the required version instead (we do in fact depend
on Twig in the WebProfilerBundle).
---
 src/Symfony/Bundle/WebProfilerBundle/composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index a1de9a771b70b..8867a64eca35a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -19,7 +19,8 @@
         "php": ">=5.3.9",
         "symfony/http-kernel": "~2.4",
         "symfony/routing": "~2.2",
-        "symfony/twig-bridge": "~2.7"
+        "symfony/twig-bridge": "~2.7",
+        "twig/twig": "~1.28|~2.0"
     },
     "require-dev": {
         "symfony/config": "~2.2",

From 292ae7c3eb2f4afa51254629ef1e2133a5c24ef8 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 9 Dec 2016 09:38:22 +0100
Subject: [PATCH 62/81] [Config] fix dev dependencies

---
 src/Symfony/Component/Config/composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index f1633c1c80f50..47f8642ae6dbc 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -19,6 +19,9 @@
         "php": ">=5.3.9",
         "symfony/filesystem": "~2.3"
     },
+    "require-dev": {
+        "symfony/yaml": "~2.7"
+    },
     "suggest": {
         "symfony/yaml": "To use the yaml reference dumper"
     },

From d3b0044ddf91a13553693b73bc1a5d166482ab4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= <enumag@gmail.com>
Date: Fri, 9 Dec 2016 08:52:44 +0100
Subject: [PATCH 63/81] Fix upgrade notes

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

diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
index ac4127e6cc703..840ab113fa658 100644
--- a/UPGRADE-3.2.md
+++ b/UPGRADE-3.2.md
@@ -70,7 +70,6 @@ FrameworkBundle
    in TwigBundle).
  * The service `serializer.mapping.cache.doctrine.apc` is deprecated. APCu should now
    be automatically used when available.
-   ```
 
 HttpFoundation
 ---------------
@@ -111,6 +110,7 @@ HttpKernel
    After:
    ```
    Surrogate-Capability: symfony="ESI/1.0"
+   ```
 
 Serializer
 ----------

From 21925da88b8b2ad06c32ebc752b340dd835a22e5 Mon Sep 17 00:00:00 2001
From: Victor Bocharsky <bocharsky.bw@gmail.com>
Date: Fri, 9 Dec 2016 17:28:59 +0200
Subject: [PATCH 64/81] Write an exception message in a one heading line

---
 .../TwigBundle/Resources/views/Exception/exception.html.twig  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
index 546c3f262b0a5..4baf0844369f9 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
@@ -8,9 +8,7 @@
                 <img alt="" src="data:image/gif;base64,R0lGODlhHAAWAMQQANra2+bl5s3Mzevr6/Pz8+jo6O3t7fHx8c/Oz+Pj49PS093d3djX2NXV1eDf4MrJyvb29gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAcABYAQAWWICSOEDE4AamqRuAsT5yu6hA/wNrcfNysjl5PBOAJAAUDDRLoNRKDndAHnN6k058qaH2QuNelqCAYIm45MfGmIJCkAvUIPNB1td/uAyvEz/UqB0VUagQOZTEjgzx+Kk1CEAU8DAdqB4gPCHVjNwhucphKbzefamAFdlaNEGBZd1V3r1t6fE6wqrJ5XS4Ovb69MyQnv8QhADs=" />
             </div>
 
-            <h1>
-                {{ exception.message|nl2br|format_file_from_text }}
-            </h1>
+            <h1>{{ exception.message|nl2br|format_file_from_text }}</h1>
 
             <div>
                 <strong>{{ status_code }}</strong> {{ status_text }} - {{ exception.class|abbr_class }}

From ae7377d12803d02e9d5e2eaef5e738dca7f2c587 Mon Sep 17 00:00:00 2001
From: Julien Falque <julien.falque@gmail.com>
Date: Fri, 9 Dec 2016 18:49:43 +0100
Subject: [PATCH 65/81] Skip test when iconv extension is missing

---
 src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
index 65e2a90e87513..5d5c633888fa7 100755
--- a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -206,7 +206,13 @@ public function testAddContent()
         $crawler = new Crawler();
         $crawler->addContent('<html><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><span>中文</span></html>');
         $this->assertEquals('中文', $crawler->filterXPath('//span')->text(), '->addContent() guess wrong charset');
+    }
 
+    /**
+     * @requires extension iconv
+     */
+    public function testAddContentNonUtf8()
+    {
         $crawler = new Crawler();
         $crawler->addContent(iconv('UTF-8', 'SJIS', '<html><head><meta charset="Shift_JIS"></head><body>日本語</body></html>'));
         $this->assertEquals('日本語', $crawler->filterXPath('//body')->text(), '->addContent() can recognize "Shift_JIS" in html5 meta charset tag');

From 003e9b0fdf8d8c55b7ad326e0f8901e850a50c07 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 10 Dec 2016 09:21:45 +0100
Subject: [PATCH 66/81] fixed composer.json

---
 src/Symfony/Component/Config/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index 187fd88f504cf..e6d6d3615a8b0 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -20,7 +20,7 @@
         "symfony/filesystem": "~2.3|~3.0.0"
     },
     "require-dev": {
-        "symfony/yaml": "~2.7"
+        "symfony/yaml": "~2.7|~3.0.0"
     },
     "suggest": {
         "symfony/yaml": "To use the yaml reference dumper"

From 99ebb8a8a3245f8eda894a5a5f9f6a9ba97f7997 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 10 Dec 2016 09:22:22 +0100
Subject: [PATCH 67/81] fixed composer.json

---
 src/Symfony/Component/Config/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index 45246d42c119a..430418f39d393 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -20,7 +20,7 @@
         "symfony/filesystem": "~2.8|~3.0"
     },
     "require-dev": {
-        "symfony/yaml": "~2.7|~3.0.0"
+        "symfony/yaml": "~2.7|~3.0"
     },
     "suggest": {
         "symfony/yaml": "To use the yaml reference dumper"

From 1436349111cb9cd8ec0f265bba3225c5d951f63b Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Sat, 10 Dec 2016 11:07:06 +0100
Subject: [PATCH 68/81] do not trigger deprecations for valid YAML

---
 src/Symfony/Component/Yaml/Inline.php           | 4 ++--
 src/Symfony/Component/Yaml/Tests/InlineTest.php | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index c6e5830bd5480..8ad3b1e1b2fd5 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -463,8 +463,8 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                 break;
             }
 
-            if (!isset($mapping[$i + 1]) || ' ' !== $mapping[$i + 1]) {
-                @trigger_error('Omitting the space after the colon that follows a mapping key definition is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
+            if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', '[', ']', '{', '}'), true)) {
+                @trigger_error('Using a colon that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}" is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
             }
 
             // value
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 33bda676f4dec..355deb454af06 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -166,7 +166,7 @@ public function testParseInvalidMappingKeyShouldThrowException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Omitting the space after the colon that follows a mapping key definition is deprecated since version 3.2 and will throw a ParseException in 4.0.
+     * @expectedDeprecation Using a colon that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}" is deprecated since version 3.2 and will throw a ParseException in 4.0.
      * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
      */
     public function testParseMappingKeyWithColonNotFollowedBySpace()
@@ -395,6 +395,8 @@ public function getTestsForParse()
             array('[foo, {bar: foo}]', array('foo', array('bar' => 'foo'))),
             array('{ foo: {bar: foo} }', array('foo' => array('bar' => 'foo'))),
             array('{ foo: [bar, foo] }', array('foo' => array('bar', 'foo'))),
+            array('{ foo:{bar: foo} }', array('foo' => array('bar' => 'foo'))),
+            array('{ foo:[bar, foo] }', array('foo' => array('bar', 'foo'))),
 
             array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
 

From 9e73887115e482cec8694954bec1fa131c46b5a3 Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Sat, 10 Dec 2016 13:31:17 +0100
Subject: [PATCH 69/81] [Routing] Mention minor BC break about UrlGenerator &
 query strings

---
 UPGRADE-3.2.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
index 840ab113fa658..e977a845cf045 100644
--- a/UPGRADE-3.2.md
+++ b/UPGRADE-3.2.md
@@ -112,6 +112,12 @@ HttpKernel
    Surrogate-Capability: symfony="ESI/1.0"
    ```
 
+Router
+------
+
+ * `UrlGenerator` now generates URLs in compliance with [`RFC 3986`](https://www.ietf.org/rfc/rfc3986.txt),
+    which means spaces will be percent encoded (%20) inside query strings.
+
 Serializer
 ----------
 

From d9af8e9f1d866f0e488d12646aed7f345389884c Mon Sep 17 00:00:00 2001
From: Titouan Galopin <galopintitouan@gmail.com>
Date: Sat, 10 Dec 2016 18:23:49 +0100
Subject: [PATCH 70/81] Fix a web profiler form issue with fields added to the
 form after the form was built

---
 .../WebProfilerBundle/Resources/views/Collector/form.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 3b79db20a6a60..628e87dec1cb7 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -457,7 +457,7 @@
     {% import _self as tree %}
     <div class="tree-details{% if not show|default(false) %} hidden{% endif %}" {% if data.id is defined %}id="{{ data.id }}-details"{% endif %}>
         <h2 class="dump-inline">
-            {{ name|default('(no name)') }} ({{ profiler_dump(data.type_class) }})
+            {{ name|default('(no name)') }} {% if data.type_class is defined %}({{ profiler_dump(data.type_class) }}){% endif %}
         </h2>
 
         {% if data.errors is defined and data.errors|length > 0 %}

From 7bdfc84ef8c10774e08444b4747f707a77eb763a Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Sun, 11 Dec 2016 15:34:22 +0100
Subject: [PATCH 71/81] Minor fixes for 3.2

---
 .../Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php    | 1 -
 src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php  | 2 +-
 .../Tests/DependencyInjection/FrameworkExtensionTest.php      | 1 -
 .../Component/Cache/Tests/Adapter/TagAwareAdapterTest.php     | 2 +-
 src/Symfony/Component/Cache/Tests/CacheItemTest.php           | 2 +-
 .../Component/Console/Tests/Style/SymfonyStyleTest.php        | 1 -
 src/Symfony/Component/Serializer/Encoder/YamlEncoder.php      | 1 -
 src/Symfony/Component/VarDumper/Caster/StubCaster.php         | 4 ++--
 src/Symfony/Component/Workflow/Tests/StateMachineTest.php     | 1 -
 9 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
index 40604e3d809db..0287f42a8ed4d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Workflow\Dumper\GraphvizDumper;
 use Symfony\Component\Workflow\Dumper\StateMachineGraphvizDumper;
 use Symfony\Component\Workflow\Marking;
-use Symfony\Component\Workflow\Workflow;
 
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index 1dbf54b5adf9d..90daa3eeadd00 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -137,7 +137,7 @@ protected function json($data, $status = 200, $headers = array(), $context = arr
     protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
     {
         $response = new BinaryFileResponse($file);
-        $response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFileName() : $fileName);
+        $response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFilename() : $fileName);
 
         return $response;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 940f5465187ee..4388b70afed6a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -20,7 +20,6 @@
 use Symfony\Component\Cache\Adapter\ProxyAdapter;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
index 83bdd3aaf5544..20b1fd7a07fe2 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -30,7 +30,7 @@ public static function tearDownAfterClass()
     }
 
     /**
-     * @expectedException Psr\Cache\InvalidArgumentException
+     * @expectedException \Psr\Cache\InvalidArgumentException
      */
     public function testInvalidTag()
     {
diff --git a/src/Symfony/Component/Cache/Tests/CacheItemTest.php b/src/Symfony/Component/Cache/Tests/CacheItemTest.php
index 69a8ad44c3529..88488458db7e6 100644
--- a/src/Symfony/Component/Cache/Tests/CacheItemTest.php
+++ b/src/Symfony/Component/Cache/Tests/CacheItemTest.php
@@ -65,7 +65,7 @@ public function testTag()
 
     /**
      * @dataProvider provideInvalidKey
-     * @expectedException Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
      * @expectedExceptionMessage Cache tag
      */
     public function testInvalidTag($tag)
diff --git a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
index cefd485067bc3..3338f4b055cc4 100644
--- a/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
+++ b/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit_Framework_TestCase;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class SymfonyStyleTest extends PHPUnit_Framework_TestCase
diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
index 4ba76400446dd..41ac04f209105 100644
--- a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Encodes YAML data.
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
index 5674c09ef3161..f8b13afcef4cc 100644
--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -31,8 +31,8 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
             $stub->attr = $c->attr;
 
             if (Stub::TYPE_REF === $c->type && !$c->class && is_string($c->value) && !preg_match('//u', $c->value)) {
-                $stub->type = self::TYPE_STRING;
-                $stub->class = self::STRING_BINARY;
+                $stub->type = Stub::TYPE_STRING;
+                $stub->class = Stub::STRING_BINARY;
             }
 
             return array();
diff --git a/src/Symfony/Component/Workflow/Tests/StateMachineTest.php b/src/Symfony/Component/Workflow/Tests/StateMachineTest.php
index 7dca9a824d7c1..7e0a6569386a9 100644
--- a/src/Symfony/Component/Workflow/Tests/StateMachineTest.php
+++ b/src/Symfony/Component/Workflow/Tests/StateMachineTest.php
@@ -2,7 +2,6 @@
 
 namespace Symfony\Component\Workflow\Tests;
 
-use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\StateMachine;
 
 class StateMachineTest extends \PHPUnit_Framework_TestCase

From 921b646721711fbbade0976300c36975053b2c12 Mon Sep 17 00:00:00 2001
From: Thomas Royer <thomas.royer@sensiolabs.com>
Date: Mon, 12 Dec 2016 14:31:08 +0100
Subject: [PATCH 72/81] Allow simple-phpunit to be used with an HTTP proxy

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 9f846a3ecbaae..a832b68b48e6e 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -37,7 +37,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     if (file_exists("phpunit-$PHPUNIT_VERSION")) {
         passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? '(del /S /F /Q %s & rmdir %1$s) >nul': 'rm -rf %s', "phpunit-$PHPUNIT_VERSION"));
     }
-    if (extension_loaded('openssl') && ini_get('allow_url_fopen')) {
+    if (extension_loaded('openssl') && ini_get('allow_url_fopen') && !isset($_SERVER['http_proxy']) && !isset($_SERVER['https_proxy'])) {
         stream_copy_to_stream(fopen("https://github.com/sebastianbergmann/phpunit/archive/$PHPUNIT_VERSION.zip", 'rb'), fopen("$PHPUNIT_VERSION.zip", 'wb'));
     } else {
         @unlink("$PHPUNIT_VERSION.zip");

From fa82588d690b003e155702d58bc2d0227ddf6f39 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Mon, 12 Dec 2016 20:31:24 +0100
Subject: [PATCH 73/81] [TwigBridge] fix constructor args check

---
 src/Symfony/Bridge/Twig/Extension/FormExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
index d5c08038ecc46..81a8683c35b97 100644
--- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -31,7 +31,7 @@ class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRunti
 
     public function __construct($renderer = null)
     {
-        if ($this->renderer instanceof TwigRendererInterface) {
+        if ($renderer instanceof TwigRendererInterface) {
             @trigger_error(sprintf('Passing a Twig Form Renderer to the "%s" constructor is deprecated since version 3.2 and won\'t be possible in 4.0. Pass the Twig_Environment to the TwigRendererEngine constructor instead.', static::class), E_USER_DEPRECATED);
         } elseif (null !== $renderer && !(is_array($renderer) && isset($renderer[0], $renderer[1]) && $renderer[0] instanceof ContainerInterface)) {
             throw new \InvalidArgumentException(sprintf('Passing any arguments the constructor of %s is reserved for internal use.', __CLASS__));

From b6831d2ab2caf31510197aa12d6e4e7ee208358d Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@gmail.com>
Date: Mon, 12 Dec 2016 23:36:40 +0100
Subject: [PATCH 74/81] [Form] DateIntervalType: Do not try to translate
 choices

---
 .../Extension/Core/Type/DateIntervalType.php  |  1 +
 .../Core/Type/DateIntervalTypeTest.php        | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
index fb2b7d7ff3ec8..4e3f6726c5dbd 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -102,6 +102,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $childOptions[$part] = array();
                     $childOptions[$part]['error_bubbling'] = true;
                     if ('choice' === $options['widget']) {
+                        $childOptions[$part]['choice_translation_domain'] = false;
                         $childOptions[$part]['choices'] = $options[$part];
                         $childOptions[$part]['placeholder'] = $options['placeholder'][$part];
                     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
index e40c0949f6961..62e6d34c85178 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Extension\Core\Type\DateIntervalType;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 
@@ -364,4 +365,23 @@ public function testDateTypeChoiceErrorsBubbleUp()
         $this->assertSame(array(), iterator_to_array($form['years']->getErrors()));
         $this->assertSame(array($error), iterator_to_array($form->getErrors()));
     }
+    public function testTranslationsAreDisabledForChoiceWidget()
+    {
+        $form = $this->factory->create(
+            DateIntervalType::class,
+            null,
+            array(
+                'widget' => 'choice',
+                'with_hours' => true,
+                'with_minutes' => true,
+                'with_seconds' => true,
+            )
+        );
+        $this->assertFalse($form->get('years')->getConfig()->getOption('choice_translation_domain'));
+        $this->assertFalse($form->get('months')->getConfig()->getOption('choice_translation_domain'));
+        $this->assertFalse($form->get('days')->getConfig()->getOption('choice_translation_domain'));
+        $this->assertFalse($form->get('hours')->getConfig()->getOption('choice_translation_domain'));
+        $this->assertFalse($form->get('minutes')->getConfig()->getOption('choice_translation_domain'));
+        $this->assertFalse($form->get('seconds')->getConfig()->getOption('choice_translation_domain'));
+    }
 }

From b1597f17c280aecdafe062a9f21b0e0446144d03 Mon Sep 17 00:00:00 2001
From: Luis Galeas <galeaspablo@hotmail.com>
Date: Mon, 12 Dec 2016 12:57:13 +0000
Subject: [PATCH 75/81] DateIntervalType: 'invert' should not inherit the
 'required' option

---
 .../Form/Extension/Core/Type/DateIntervalType.php  | 12 +++++-------
 .../Extension/Core/Type/DateIntervalTypeTest.php   | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
index fb2b7d7ff3ec8..946d8a3159754 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -107,9 +107,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     }
                 }
             }
-            $invertOptions = array(
-                'error_bubbling' => true,
-            );
             // Append generic carry-along options
             foreach (array('required', 'translation_domain') as $passOpt) {
                 foreach ($this->timeParts as $part) {
@@ -117,9 +114,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         $childOptions[$part][$passOpt] = $options[$passOpt];
                     }
                 }
-                if ($options['with_invert']) {
-                    $invertOptions[$passOpt] = $options[$passOpt];
-                }
             }
             foreach ($this->timeParts as $part) {
                 if ($options['with_'.$part]) {
@@ -135,7 +129,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 }
             }
             if ($options['with_invert']) {
-                $builder->add('invert', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', $invertOptions);
+                $builder->add('invert', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(
+                    'error_bubbling' => true,
+                    'required' => false,
+                    'translation_domain' => $options['translation_domain'],
+                ));
             }
             $builder->addViewTransformer(new DateIntervalToArrayTransformer($parts, 'text' === $options['widget']));
         }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
index e40c0949f6961..2adf3ba5429ae 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -364,4 +364,18 @@ public function testDateTypeChoiceErrorsBubbleUp()
         $this->assertSame(array(), iterator_to_array($form['years']->getErrors()));
         $this->assertSame(array($error), iterator_to_array($form->getErrors()));
     }
+
+    public function testInvertDoesNotInheritRequiredOption()
+    {
+        $form = $this->factory->create(
+            'Symfony\Component\Form\Extension\Core\Type\DateIntervalType',
+            null,
+            array(
+                'input' => 'dateinterval',
+                'with_invert' => true,
+                'required' => true,
+            )
+        );
+        $this->assertFalse($form->get('invert')->getConfig()->getOption('required'));
+    }
 }

From 52226438c458e74199ceeae3221824b5f9fda6e3 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@mphuis.com>
Date: Mon, 12 Dec 2016 20:41:46 +0100
Subject: [PATCH 76/81] =?UTF-8?q?Don=E2=80=99t=20compile=20when=20Opcache?=
 =?UTF-8?q?=20is=20not=20enabled=20on=20CLI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Component/Cache/Adapter/PhpFilesAdapter.php       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
index d2591c1fb0214..8e09280ca47df 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -93,7 +93,7 @@ protected function doSave(array $values, $lifetime)
         $ok = true;
         $data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');
 
-        foreach ($values as $id => $value) {
+        foreach ($values as $key => $value) {
             if (null === $value || is_object($value)) {
                 $value = serialize($value);
             } elseif (is_array($value)) {
@@ -109,13 +109,16 @@ protected function doSave(array $values, $lifetime)
                     $value = serialize($value);
                 }
             } elseif (!is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Value of type "%s" is not serializable', $key, gettype($value)));
+                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
             }
 
             $data[1] = $value;
-            $file = $this->getFile($id, true);
+            $file = $this->getFile($key, true);
             $ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;
-            @opcache_compile_file($file);
+
+            if ('cli' !== PHP_SAPI || ini_get('opcache.enable_cli')) {
+                @opcache_compile_file($file);
+            }
         }
 
         return $ok;

From 5527ee3d11a5a5b3346c84e6fa62b6ad7951fb56 Mon Sep 17 00:00:00 2001
From: Karlos <onekorama@gmail.com>
Date: Fri, 2 Dec 2016 12:02:50 +0100
Subject: [PATCH 77/81] [WebProfilerBundle] Fix AJAX panel with fetch requests

---
 .../views/Profiler/base_js.html.twig          | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 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 bfbbc8a102aa8..c31fb19d4459f 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
@@ -243,16 +243,29 @@
                 var oldFetch = window.fetch;
                 window.fetch = function () {
                     var promise = oldFetch.apply(this, arguments);
-                    if (!arguments[0].match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
+                    var url = arguments[0];
+                    var params = arguments[1];
+                    var paramType = Object.prototype.toString.call(arguments[0]);
+                    if (paramType === '[object Request]') {
+                        url = arguments[0].url;
+                        params = {
+                            method: arguments[0].method,
+                            credentials: arguments[0].credentials,
+                            headers: arguments[0].headers,
+                            mode: arguments[0].mode,
+                            redirect: arguments[0].redirect
+                        };
+                    }
+                    if (!url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
                         var method = 'GET';
-                        if (arguments[1] && arguments[1].method !== undefined) {
-                            method = arguments[1].method;
+                        if (params && params.method !== undefined) {
+                            method = params.method;
                         }
 
                         var stackElement = {
                             loading: true,
                             error: false,
-                            url: arguments[0],
+                            url: url,
                             method: method,
                             type: 'fetch',
                             start: new Date()

From eeaca5c96b72bafa6da2b239c16693e702fce503 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 25 Oct 2016 12:36:47 +0200
Subject: [PATCH 78/81] Define a GitHub issue template to avoid support
 questions

---
 .github/ISSUE_TEMPLATE.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000000..6eaec7c81da9a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+| Q                | A
+| ---------------- | -----
+| Bug report?      | yes/no
+| Feature request? | yes/no
+| BC Break report? | yes/no
+| RFC?             | yes/no
+| Symfony version  | x.y.z
+
+<!--
+- Please fill in this template according to your issue.
+- For support request or how-tos, visit https://symfony.com/support
+- Otherwise, replace this comment by the description of your issue.
+-->

From 4e6086f7db7b4f793e1acabb01fca091ab5b116a Mon Sep 17 00:00:00 2001
From: Robin van der Vleuten <robin@webstronauts.co>
Date: Tue, 13 Dec 2016 12:21:30 +0100
Subject: [PATCH 79/81] Add support for REDIS_URL environment variables.

---
 .../Compiler/CachePoolPass.php                |  4 ++-
 .../Fixtures/php/cache_env_var.php            |  9 ++++++
 .../Fixtures/xml/cache_env_var.xml            | 17 +++++++++++
 .../Fixtures/yml/cache_env_var.yml            |  6 ++++
 .../FrameworkExtensionTest.php                | 28 +++++++++++++++++++
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
index 1e09b88214433..df02d65259a8d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -96,7 +96,9 @@ private function getNamespace($seed, $id)
      */
     public static function getServiceProvider(ContainerBuilder $container, $name)
     {
-        if (0 === strpos($name, 'redis://')) {
+        $container->resolveEnvPlaceholders($name, null, $usedEnvs);
+
+        if (0 === strpos($name, 'redis://') || $usedEnvs) {
             $dsn = $name;
 
             if (!$container->hasDefinition($name = md5($dsn))) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
new file mode 100644
index 0000000000000..b93ade8f4c816
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_env_var.php
@@ -0,0 +1,9 @@
+<?php
+
+$container->setParameter('env(REDIS_URL)', 'redis://paas.com');
+
+$container->loadFromExtension('framework', array(
+    'cache' => array(
+        'default_redis_provider' => '%env(REDIS_URL)%',
+    ),
+));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
new file mode 100644
index 0000000000000..8f03cb1784b35
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_env_var.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:framework="http://symfony.com/schema/dic/symfony"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <parameters>
+        <parameter key="env(REDIS_URL)">redis://paas.com</parameter>
+    </parameters>
+
+    <framework:config>
+        <framework:cache>
+            <framework:default-redis-provider>%env(REDIS_URL)%</framework:default-redis-provider>
+        </framework:cache>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml
new file mode 100644
index 0000000000000..1d9ce5f7f02f7
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_env_var.yml
@@ -0,0 +1,6 @@
+parameters:
+    env(REDIS_URL): redis://paas.com
+
+framework:
+    cache:
+        default_redis_provider: "%env(REDIS_URL)%"
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 4388b70afed6a..26792c6b1c1d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -697,6 +697,34 @@ public function testPropertyInfoEnabled()
         $this->assertTrue($container->has('property_info'));
     }
 
+    public function testCacheDefaultRedisProvider()
+    {
+        $container = $this->createContainerFromFile('cache');
+
+        $redisUrl = 'redis://localhost';
+        $providerId = md5($redisUrl);
+
+        $this->assertTrue($container->hasDefinition($providerId));
+
+        $url = $container->getDefinition($providerId)->getArgument(0);
+
+        $this->assertSame($redisUrl, $url);
+    }
+
+    public function testCacheDefaultRedisProviderWithEnvVar()
+    {
+        $container = $this->createContainerFromFile('cache_env_var');
+
+        $redisUrl = 'redis://paas.com';
+        $providerId = md5($redisUrl);
+
+        $this->assertTrue($container->hasDefinition($providerId));
+
+        $url = $container->getDefinition($providerId)->getArgument(0);
+
+        $this->assertSame($redisUrl, $url);
+    }
+
     public function testCachePoolServices()
     {
         $container = $this->createContainerFromFile('cache');

From cd99324c0e24f2a8d8001476cf34db7c709c2ff9 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 13 Dec 2016 14:19:37 +0100
Subject: [PATCH 80/81] updated CHANGELOG for 3.2.1

---
 CHANGELOG-3.2.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/CHANGELOG-3.2.md b/CHANGELOG-3.2.md
index c892ebb6755b7..39dd7fa8598f5 100644
--- a/CHANGELOG-3.2.md
+++ b/CHANGELOG-3.2.md
@@ -7,6 +7,52 @@ in 3.2 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.2.0...v3.2.1
 
+* 3.2.1 (2016-12-13)
+
+ * bug #20891 Add support for REDIS_URL environment variables. (robinvdvleuten)
+ * bug #20724 [WebProfilerBundle] Fix AJAX panel with fetch requests (OnekO)
+ * bug #20883 Don’t compile when Opcache is not enabled on CLI (ruudk)
+ * bug #20877 DateIntervalType: 'invert' should not inherit the 'required' option (galeaspablo)
+ * bug #20886 [Form] DateIntervalType: Do not try to translate choices (ogizanagi)
+ * bug #20855 [Yaml] do not trigger deprecations for valid YAML (xabbuh)
+ * bug #20714 [FrameworkBundle] Fix unresolved parameters from default configs in debug:config (chalasr)
+ * bug #20862 Allow simple-phpunit to be used with an HTTP proxy (Cydonia7)
+ * bug #20882 [TwigBridge] fix constructor args check (xabbuh)
+ * bug #20860 [WebProfilerBundle] Fix a web profiler form issue with fields added to the form after the form was built (tgalopin)
+ * bug #20442 [FrameworkBundle] Bundle commands are not available via find() (julienfalque)
+ * bug #20840 [WebProfilerBundle] add dependency on Twig (xabbuh)
+ * bug #20833 [HttpKernel] Fix open_basedir compat in DataCollector (nicolas-grekas)
+ * bug #20828 [Validator] Fix init of YamlFileLoader::$classes for empty files (nicolas-grekas)
+ * bug #20688 [FrameworkBundle] Resolve env params in debug:config command (nicolas-grekas)
+ * bug #20725 [HttpKernel] Fix annotation cache warmer with failing or missing classes (nicolas-grekas)
+ * bug #20830 [FrameworkBundle] Fix validation cache warmer with failing or missing classes (nicolas-grekas)
+ * bug #20760 [FrameworkBundle] [Workflow] Fix service marking store configuration (fduch)
+ * bug #20745 [Validator] add class name to the cache key (Simperfit)
+ * bug #20530 [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize (dunglas)
+ * bug #19141 Throw less misleading exception when property access not found (bramtweedegolf)
+ * bug #20539 Cast result to int before adding to it (alcaeus)
+ * bug #20831 [Twig] Fix deprecations with Twig 1.29 (nicolas-grekas)
+ * bug #20701 Ignore missing 'debug.file_link_formatter' service in Debug and Twig bundles (mbabker)
+ * bug #20816 [FrameworkBundle] Removed kernel.debug from the cache pool namespace seed (Sander Toonen)
+ * bug #20769 [Bridge\Twig] Trigger deprecation when using FormExtension::$renderer (nicolas-grekas)
+ * bug #20646 Maintain the selected panel when redirecting to another profile (javiereguiluz)
+ * bug #20767 [Cache] Fix dumping SplDoublyLinkedList iter mode (nicolas-grekas)
+ * bug #20690 [Serializer] Fix argument object denormalization (ogizanagi)
+ * bug #20762 [Form] Fix FormDataCollector (nicolas-grekas, Padam87)
+ * bug #20747 [HttpKernel] Fixed RequestDataCollector handling of null header values. (Gabriel Moreira)
+ * bug #20727 [TwigBundle] Inject project root path into twig filesystem loader (4rthem)
+ * bug #20736 [Console] fixed PHP7 Errors when not using Dispatcher (keradus)
+ * bug #20756 [HttpKernel] Regression test for missing controller arguments (iltar)
+ * bug #20755 [HttpKernel] Regression test for missing controller arguments (iltar)
+ * bug #20732 fix the inline level for dumped multi-line strings (xabbuh)
+ * bug #20418 [Form][DX] FileType "multiple" fixes (yceruto)
+ * bug #19902 [DependencyInjection] PhpDumper.php: hasReference() shouldn't search references in lazy service. (antanas-arvasevicius)
+ * bug #20704 [Console] Fix wrong handling of multiline arg/opt descriptions (ogizanagi)
+ * bug #20700 [WebProfilerBundle][Translator] Fix TranslationDataCollector should use cloneVar (ogizanagi)
+ * bug #20712 [TwigBundle] Fix twig loader registered twice (ogizanagi)
+ * bug #20716 [WebProfilerBundle] Fix dump block is unfairly restrained (ogizanagi)
+ * bug #20717 Fix hide button in toolbar (nicolasdewez)
+
 * 3.2.0 (2016-11-30)
 
  * bug #20687 [FrameworkBundle] Forbid env parameters in routing configuration (nicolas-grekas)

From d884a521f30e919c9f1a99e8b75eaf2adb62a925 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 13 Dec 2016 14:19:46 +0100
Subject: [PATCH 81/81] updated VERSION for 3.2.1

---
 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 eefd76b16d8f7..6581a10da970a 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '3.2.1-DEV';
+    const VERSION = '3.2.1';
     const VERSION_ID = 30201;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 2;
     const RELEASE_VERSION = 1;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '07/2017';
     const END_OF_LIFE = '01/2018';