[AdminBundle] Fix remaining usages of deprecated admin_exception_excl…

…udes config
Kunstmaan · Jul 20, 2021 · d598482 · d598482
1 parent 96ae88c
commit d598482
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php b/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php
@@ -60,7 +60,8 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('kunstmaan_admin.admin_prefix', $this->normalizeUrlSlice($config['admin_prefix']));
 
-        $container->setParameter('kunstmaan_admin.admin_exception_excludes', $config['admin_exception_excludes']);
+        $exceptionExcludes = !empty($config['exception_logging']['exclude_patterns']) ? $config['exception_logging']['exclude_patterns'] : $config['admin_exception_excludes'];
+        $container->setParameter('kunstmaan_admin.admin_exception_excludes', $exceptionExcludes);
 
         $container->setParameter('kunstmaan_admin.google_signin.enabled', $config['google_signin']['enabled']);
         $container->setParameter('kunstmaan_admin.google_signin.client_id', $config['google_signin']['client_id']);

diff --git a/src/Kunstmaan/AdminBundle/Tests/DependencyInjection/KunstmaanAdminExtensionTest.php b/src/Kunstmaan/AdminBundle/Tests/DependencyInjection/KunstmaanAdminExtensionTest.php
@@ -180,6 +180,51 @@ public function testLegacyParameters()
         $this->assertContainerBuilderHasParameter('kunstmaan_admin.default_locale', '');
     }
 
+    /**
+     * @group legacy
+     */
+    public function testDeprecatedExceptionExcludes()
+    {
+        $this->load(array_merge($this->getRequiredConfig(), [
+            'authentication' => [
+                'enable_new_authentication' => true,
+            ],
+            'admin_exception_excludes' => [
+                'test_exclude',
+            ],
+        ]));
+
+        $this->assertContainerBuilderHasParameter('kunstmaan_admin.admin_exception_excludes', ['test_exclude']);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testDeprecatedExceptionExcludesWithNewConfig()
+    {
+        $this->load(array_merge($this->getRequiredConfig(), [
+            'admin_exception_excludes' => [
+                'test_exclude',
+            ],
+            'exception_logging' => [
+                'exclude_patterns' => ['test_exclude_new_config'],
+            ],
+        ]));
+
+        $this->assertContainerBuilderHasParameter('kunstmaan_admin.admin_exception_excludes', ['test_exclude_new_config']);
+    }
+
+    public function testExceptionExcludesFromExceptionLoggingConfig()
+    {
+        $this->load(array_merge($this->getRequiredConfig(), [
+            'exception_logging' => [
+                'exclude_patterns' => ['test_exclude_new_config'],
+            ],
+        ]));
+
+        $this->assertContainerBuilderHasParameter('kunstmaan_admin.admin_exception_excludes', ['test_exclude_new_config']);
+    }
+
     protected function setUp(): void
     {
         parent::setUp();