Merge pull request #17 from mpdude/override-transformations

Allow overriding transformation definitions in later config files
jbouzekri · Jan 4, 2021 · 5cccddc · 5cccddc
2 parents b999650 + fdb2d66
commit 5cccddc
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -64,7 +64,9 @@ private function addTransformationSection(ArrayNodeDefinition $rootNode)
         $rootNode
             ->children()
                 ->arrayNode('transformations')
-                    ->prototype('array')
+                    ->useAttributeAsKey('id')
+                    ->arrayPrototype()
+                        ->performNoDeepMerging()
                         // Filter key is a prototype array. Remove it if empty array
                         ->validate()
                             ->always(function ($val) {

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -45,6 +45,41 @@ public function testServerConfiguration()
         $this->assertEquals($config['server']['secret'], '123456789');
     }
 
+    public function testTransformationMerging()
+    {
+        // When a transformation is re-defined (overridden) in a later config file,
+        // the newer definition entirely replaces the older one.
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), array(
+            // Values from first config file
+            array(
+                'transformations' => array(
+                    'test_not_overridden' => array(
+                        'resize' => array('width' => 100, 'height' => 100),
+                    ),
+                    'test_overridden' => array(
+                        'filters' => array(array('name' => 'quality', 'arguments' => array(60))),
+                        'resize' => array('width' => 100, 'height' => 100),
+                    ),
+                )
+            ),
+            // Values from second config file, should win
+            array(
+                'transformations' => array(
+                    'test_overridden' => array(
+                        'resize' => array('width' => 200, 'height' => 200),
+                    ),
+                )
+            ),
+        ));
+
+        $this->assertEquals(array(
+            'test_overridden' => array('resize' => array('width'=>200, 'height'=>200)),
+            'test_not_overridden' => array('resize' => array('width'=>100, 'height'=>100)),
+        ), $config['transformations']);
+    }
+
     /**
      * @dataProvider getTransformationData
      */