Merge branch '2.7' into 2.8

* 2.7:
  [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer
  [VarDumper] Fix dump output for better readability
  [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy

Author: nicolas-grekas

Resources/config/form.xml

@@ -55,8 +55,10 @@
         </service>
 
         <!-- CoreExtension -->
+        <service id="form.property_accessor" alias="property_accessor" public="false" />
+
         <service id="form.type.form" class="Symfony\Component\Form\Extension\Core\Type\FormType">
-            <argument type="service" id="property_accessor"/>
+            <argument type="service" id="form.property_accessor" />
             <tag name="form.type" alias="form" />
         </service>
         <service id="form.type.birthday" class="Symfony\Component\Form\Extension\Core\Type\BirthdayType">

Resources/config/serializer.xml

@@ -17,9 +17,13 @@
             <argument type="collection" />
         </service>
 
+        <service id="serializer.property_accessor" alias="property_accessor" public="false" />
+
         <!-- Normalizer -->
         <service id="serializer.normalizer.object" class="Symfony\Component\Serializer\Normalizer\ObjectNormalizer" public="false">
             <argument type="service" id="serializer.mapping.class_metadata_factory" />
+            <argument>null</argument>
+            <argument type="service" id="serializer.property_accessor" />
 
             <!-- Run after all custom serializers -->
             <tag name="serializer.normalizer" priority="-1000" />

Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -72,15 +72,11 @@ public function getDescribeContainerBuilderTestData()
      */
     public function testLegacyDescribeSynchronizedServiceDefinition(Definition $definition, $expectedDescription)
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->assertDescription($expectedDescription, $definition);
     }
 
     public function provideLegacySynchronizedServiceDefinitionTestData()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         return $this->getDescriptionTestData(ObjectsProvider::getLegacyContainerDefinitions());
     }
 

Tests/DependencyInjection/Compiler/LegacyFragmentRendererPassTest.php

@@ -20,11 +20,6 @@
  */
 class LegacyFragmentRendererPassTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     /**
      * Tests that content rendering not implementing FragmentRendererInterface
      * trigger an exception.

Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php

@@ -21,11 +21,6 @@
  */
 class LegacyTemplatingAssetHelperPassTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     public function getScopesTests()
     {
         return array(

Tests/DependencyInjection/ConfigurationTest.php

@@ -93,8 +93,6 @@ public function testInvalidValueTrustedProxies()
      */
     public function testLegacyInvalidValueAssets()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $processor = new Processor();
         $configuration = new Configuration(true);
         $processor->processConfiguration($configuration, array(

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -208,8 +208,6 @@ public function testTemplating()
      */
     public function testLegacyTemplatingAssets()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->checkAssetsPackages($this->createContainerFromFile('legacy_templating_assets'), true);
     }
 
@@ -301,8 +299,6 @@ public function testValidation()
      */
     public function testLegacyFullyConfiguredValidationService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         if (!extension_loaded('apc')) {
             $this->markTestSkipped('The apc extension is not available.');
         }
@@ -404,8 +400,6 @@ public function testFormsCanBeEnabledWithoutCsrfProtection()
      */
     public function testLegacyFormCsrfFieldNameCanBeSetUnderCsrfSettings()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = $this->createContainerFromFile('form_csrf_sets_field_name');
 
         $this->assertTrue($container->getParameter('form.type_extension.csrf.enabled'));
@@ -417,8 +411,6 @@ public function testLegacyFormCsrfFieldNameCanBeSetUnderCsrfSettings()
      */
     public function testLegacyFormCsrfFieldNameUnderFormSettingsTakesPrecedence()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = $this->createContainerFromFile('form_csrf_under_form_sets_field_name');
 
         $this->assertTrue($container->getParameter('form.type_extension.csrf.enabled'));

Tests/Fragment/LegacyContainerAwareHIncludeFragmentRendererTest.php

@@ -22,8 +22,6 @@ class LegacyContainerAwareHIncludeFragmentRendererTest extends TestCase
 {
     public function testRender()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container->expects($this->once())
             ->method('get')

Tests/Templating/GlobalVariablesTest.php

@@ -31,8 +31,6 @@ protected function setUp()
      */
     public function testLegacyGetSecurity()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $securityContext = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
 
         $this->assertNull($this->globals->getSecurity());

Tests/Templating/Helper/AssetsHelperTest.php

@@ -23,8 +23,6 @@ class AssetsHelperTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGetUrl()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $package = new Package(new StaticVersionStrategy('22', '%s?version=%s'));
         $packages = new Packages($package);
         $helper = new AssetsHelper($packages);
@@ -37,8 +35,6 @@ public function testLegacyGetUrl()
      */
     public function testLegacyGetVersion()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $package = new Package(new StaticVersionStrategy('22'));
         $imagePackage = new Package(new StaticVersionStrategy('42'));
         $packages = new Packages($package, array('images' => $imagePackage));