only add method call if there is none already

sonata-project · Apr 29, 2021 · 5fda8dc · 5fda8dc
1 parent fcb0ce2
commit 5fda8dc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php
@@ -386,8 +386,12 @@ public function applyDefaults(ContainerBuilder $container, $serviceId, array $at
             $definition->addMethodCall('setSecurityInformation', ['%sonata.admin.configuration.security.information%']);
         }
 
-        $definition->addMethodCall('setFormTheme', [$overwriteAdminConfiguration['templates']['form'] ?? []]);
-        $definition->addMethodCall('setFilterTheme', [$overwriteAdminConfiguration['templates']['filter'] ?? []]);
+        if (!$definition->hasMethodCall('setFormTheme')) {
+            $definition->addMethodCall('setFormTheme', [$overwriteAdminConfiguration['templates']['form'] ?? []]);
+        }
+        if (!$definition->hasMethodCall('setFilterTheme')) {
+            $definition->addMethodCall('setFilterTheme', [$overwriteAdminConfiguration['templates']['filter'] ?? []]);
+        }
 
         return $definition;
     }

diff --git a/tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php b/tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
@@ -202,17 +202,29 @@ public function testProcessResultingConfig(): void
         );
 
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sonata_article_admin',
+            'sonata_news_admin',
             'setFormTheme',
             [[]]
         );
 
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sonata_article_admin',
+            'sonata_news_admin',
             'setFilterTheme',
             [[]]
         );
 
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
+            'sonata_article_admin',
+            'setFormTheme',
+            [['custom_form_theme.twig']]
+        );
+
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
+            'sonata_article_admin',
+            'setFilterTheme',
+            [['custom_filter_theme.twig']]
+        );
+
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
             'sonata_post_admin',
             'setFormTheme',
@@ -626,6 +638,12 @@ protected function getConfig()
                         'view' => ['user_block' => 'foo.twig.html'],
                     ],
                 ],
+                'sonata_article_admin' => [
+                    'templates' => [
+                        'form' => ['some_form_template.twig'],
+                        'filter' => ['some_filter_template.twig'],
+                    ],
+                ],
             ],
         ];
     }
@@ -662,7 +680,9 @@ private function setUpContainer(): void
             ->setPublic(true)
             ->setClass(MockAdmin::class)
             ->setArguments(['', Article::class, CRUDController::class])
-            ->addTag('sonata.admin', ['group' => 'sonata_group_one', 'label' => '1 Entry', 'manager_type' => 'doctrine_phpcr']);
+            ->addTag('sonata.admin', ['group' => 'sonata_group_one', 'label' => '1 Entry', 'manager_type' => 'doctrine_phpcr'])
+            ->addMethodCall('setFormTheme', [['custom_form_theme.twig']])
+            ->addMethodCall('setFilterTheme', [['custom_filter_theme.twig']]);
         $this->container
             ->register('sonata_report_admin')
             ->setPublic(true)