Merge branch '3.2'

* 3.2: (51 commits)
  [FrameworkBundle] [Workflow] Fix service marking store configuration
  Fix merge
  [Validator] add class name to the cache key
  [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize
  Throw less misleading exception when property access not found
  [Twig] Fix deprecations with Twig 1.29
  [FrameworkBundle] Fix validation cache warmer with failing or missing classes
  Fixed typo
  [FrameworkBundle] Removed the kernel.debug parameter from the cache pool namespace seed
  Fix email address
  fix the docblock in regard to the role argument
  [Bridge\Twig] Trigger deprecation when using FormExtension::$renderer
  Don't use the "app" global variable in the profiler
  [VarDumper] fix tests when xdebug is enabled
  Fix merge
  FIXED NON EXISTING TYPE DECLARATION
  [Form] Add failing test for data collector bug
  [Cache] Fix dumping SplDoublyLinkedList iter mode
  [Form] Fix FormDataCollector
  Ignore missing 'debug.file_link_formatter' service in Debug and Twig bundles
  ...

Author: nicolas-grekas

CHANGELOG-3.2.md

@@ -7,6 +7,17 @@ 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.0 (2016-11-30)
+
+ * bug #20687 [FrameworkBundle] Forbid env parameters in routing configuration (nicolas-grekas)
+ * bug #20607 [Validator] Bring egulias/email-validator ~2.0 to parity with ~1.2 (Lctrs)
+ * bug #20671 [Config] ConfigCache::isFresh() should return false when unserialize() fails (nicolas-grekas)
+ * bug #20679 [VarDumper] Use default color for ellipsed namespaces/paths (nicolas-grekas)
+ * bug #20676 [ClassLoader] Use only forward slashes in generated class map (nicolas-grekas)
+ * bug #20664 [Validator] ensure the proper context for nested validations (xabbuh)
+ * bug #20661 bug #20653 [WebProfilerBundle] Profiler includes ghost panels (jzawadzki)
+ * bug #20652 Fixed getRouteParams() when no parameters are available (wouterj)
+
 * 3.2.0-RC2 (2016-11-27)
 
  * bug #20601 [FrameworkBundle] Don't rely on any parent definition for "cache.annotations" (nicolas-grekas)

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
 -----------
 

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,30 @@ 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"
+
+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
 ----------
 

UPGRADE-4.0.md

@@ -182,6 +182,10 @@ 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
 -----------
@@ -194,6 +198,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
 ----
 
@@ -285,39 +325,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`.

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}
      */

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;
+        }
     }
 
     /**

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;

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 -->