Merge branch '4.2'

* 4.2:
  [Routing] dont redirect routes with greedy trailing vars with no explicit slash
  skip native serialize among child and parent serializable objects
  [Routing] backport tests from 4.1
  [MonologBridge] Remove unused local variable
  Remove unreachable code
  Add PackageNameTest to ConfigurationTest also add in the changelog the corresponding entry to this PR
  Support use of hyphen in asset package name
  Fix format strings for deprecation notices
  Remove a harmless duplicate array key from VarDumper
  [VarDumper] Fixed search bar
  Remove gendered pronouns
  Replace gender by eye color in tests
  [Security] dont do nested calls to serialize()

Author: nicolas-grekas

DependencyInjection/Configuration.php

@@ -648,6 +648,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('package')
                     ->children()
                         ->arrayNode('packages')
+                            ->normalizeKeys(false)
                             ->useAttributeAsKey('name')
                             ->prototype('array')
                                 ->fixXmlConfig('base_url')

Templating/Helper/TranslatorHelper.php

@@ -58,7 +58,7 @@ public function trans($id, array $parameters = [], $domain = 'messages', $locale
      */
     public function transChoice($id, $number, array $parameters = [], $domain = 'messages', $locale = null)
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2, use the trans() one instead with a "%count%" parameter.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2, use the trans() one instead with a "%%count%%" parameter.', __METHOD__), E_USER_DEPRECATED);
 
         if (null === $this->translator) {
             return $this->doTrans($id, ['%count%' => $number] + $parameters, $domain, $locale);

Tests/DependencyInjection/ConfigurationTest.php

@@ -101,6 +101,35 @@ public function testAssetsCanBeEnabled()
         $this->assertEquals($defaultConfig, $config['assets']);
     }
 
+    /**
+     * @dataProvider provideValidAssetsPackageNameConfigurationTests
+     */
+    public function testValidAssetsPackageNameConfiguration($packageName)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [
+            [
+                'assets' => [
+                    'packages' => [
+                        $packageName => [],
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertArrayHasKey($packageName, $config['assets']['packages']);
+    }
+
+    public function provideValidAssetsPackageNameConfigurationTests()
+    {
+        return [
+            ['foobar'],
+            ['foo-bar'],
+            ['foo_bar'],
+        ];
+    }
+
     /**
      * @dataProvider provideInvalidAssetConfigurationTests
      */

Tests/Fixtures/Serialization/Author.php

@@ -4,5 +4,5 @@
 
 class Author
 {
-    public $gender;
+    public $eyeColor;
 }

Tests/Fixtures/Serialization/Person.php

@@ -4,5 +4,5 @@
 
 class Person
 {
-    public $gender;
+    public $eyeColor;
 }

Tests/Fixtures/Serialization/Resources/author.yml

@@ -1,4 +1,4 @@
 Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization\Author:
     attributes:
-        gender:
+        eyeColor:
             groups: ['group1', 'group2']

Tests/Fixtures/Serialization/Resources/person.xml

@@ -5,7 +5,7 @@
         http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
 >
     <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization\Person">
-        <attribute name="gender">
+        <attribute name="eyeColor">
             <group>group1</group>
             <group>group2</group>
         </attribute>

Tests/Fixtures/Validation/Author.php

@@ -4,5 +4,5 @@
 
 class Author
 {
-    public $gender;
+    public $eyeColor;
 }

Tests/Fixtures/Validation/Person.php

@@ -4,5 +4,5 @@
 
 class Person
 {
-    public $gender;
+    public $eyeColor;
 }

Tests/Fixtures/Validation/Resources/author.yml

@@ -1,4 +1,4 @@
 Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Author:
     properties:
-        gender:
-            - Choice: { choices: [male, female, other], message: Choose a valid gender. }
+        eyeColor:
+            - Choice: { choices: [brown, green, blue], message: Choose a valid eye color. }

Tests/Fixtures/Validation/Resources/person.xml

@@ -4,14 +4,14 @@
                     xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
     <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\Person">
-        <property name="gender">
+        <property name="eyeColor">
             <constraint name="Choice">
                 <option name="choices">
-                    <value>male</value>
-                    <value>female</value>
-                    <value>other</value>
+                    <value>brown</value>
+                    <value>green</value>
+                    <value>blue</value>
                 </option>
-                <option name="message">Choose a valid gender.</option>
+                <option name="message">Choose a valid eye color.</option>
             </constraint>
         </property>
     </class>