Merge branch '3.4' into 4.1

* 3.4: skip native serialize among child and parent serializable objects [Routing] backport tests from 4.1 Add PackageNameTest to ConfigurationTest also add in the changelog the corresponding entry to this PR Support use of hyphen in asset package name Remove gendered pronouns Replace gender by eye color in tests [Security] dont do nested calls to serialize()
symfony · Jan 29, 2019 · 7bcfcb8 · 7bcfcb8
2 parents 1afa727 + 20e35d7
commit 7bcfcb8
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 13 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -644,6 +644,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('package')
                     ->children()
                         ->arrayNode('packages')
+                            ->normalizeKeys(false)
                             ->useAttributeAsKey('name')
                             ->prototype('array')
                                 ->fixXmlConfig('base_url')

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -100,6 +100,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
      */

diff --git a/Tests/Fixtures/Serialization/Author.php b/Tests/Fixtures/Serialization/Author.php
@@ -4,5 +4,5 @@
 
 class Author
 {
-    public $gender;
+    public $eyeColor;
 }
diff --git a/Tests/Fixtures/Serialization/Person.php b/Tests/Fixtures/Serialization/Person.php
@@ -4,5 +4,5 @@
 
 class Person
 {
-    public $gender;
+    public $eyeColor;
 }
diff --git a/Tests/Fixtures/Serialization/Resources/author.yml b/Tests/Fixtures/Serialization/Resources/author.yml
@@ -1,4 +1,4 @@
 Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serialization\Author:
     attributes:
-        gender:
+        eyeColor:
             groups: ['group1', 'group2']
diff --git a/Tests/Fixtures/Serialization/Resources/person.xml b/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>

diff --git a/Tests/Fixtures/Validation/Author.php b/Tests/Fixtures/Validation/Author.php
@@ -4,5 +4,5 @@
 
 class Author
 {
-    public $gender;
+    public $eyeColor;
 }
diff --git a/Tests/Fixtures/Validation/Person.php b/Tests/Fixtures/Validation/Person.php
@@ -4,5 +4,5 @@
 
 class Person
 {
-    public $gender;
+    public $eyeColor;
 }
diff --git a/Tests/Fixtures/Validation/Resources/author.yml b/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. }
diff --git a/Tests/Fixtures/Validation/Resources/person.xml b/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>