Remove some things from sf4.4 (#1741)

sonata-project · Apr 21, 2023 · 348f945 · 348f945
1 parent 5067e22
commit 348f945
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 34 deletions.
diff --git a/src/Resources/config/security.php b/src/Resources/config/security.php
@@ -22,7 +22,7 @@
 
     $containerConfigurator->services()
 
-        ->set('sonata.admin.manipulator.acl.object.orm', '%sonata.admin.manipulator.acl.object.orm.class%')
+        ->set('sonata.admin.manipulator.acl.object.orm', (string) param('sonata.admin.manipulator.acl.object.orm.class'))
             ->public()
             ->args([
                 service('doctrine'),

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -34,7 +34,6 @@
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
-use Symfony\Component\Security\Http\Authentication\AuthenticatorManager;
 
 final class AppKernel extends Kernel
 {
@@ -89,12 +88,8 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
 
         $loader->load(__DIR__.'/config/config.yml');
 
-        if (class_exists(IsGranted::class)) {
-            $loader->load(__DIR__.'/config/config_symfony_v6.yml');
-        } elseif (class_exists(AuthenticatorManager::class)) {
+        if (!class_exists(IsGranted::class)) {
             $loader->load(__DIR__.'/config/config_symfony_v5.yml');
-        } else {
-            $loader->load(__DIR__.'/config/config_symfony_v4.yml');
         }
 
         if (class_exists(HttpCacheHandler::class)) {

diff --git a/tests/App/config/config.yml b/tests/App/config/config.yml
@@ -8,6 +8,15 @@ framework:
     test: true
     translator:
         enabled: true
+    session:
+        storage_factory_id: session.storage.factory.mock_file
+    router:
+        utf8: true
+
+security:
+    firewalls:
+        main:
+            lazy: true
 
 twig:
     exception_controller: null

diff --git a/tests/App/config/config_symfony_v4.yml b/tests/App/config/config_symfony_v4.yml
diff --git a/tests/App/config/config_symfony_v5.yml b/tests/App/config/config_symfony_v5.yml
@@ -1,11 +1,2 @@
-framework:
-    session:
-        storage_factory_id: session.storage.factory.mock_file
-    router:
-        utf8: true
-
 security:
     enable_authenticator_manager: true
-    firewalls:
-        main:
-            lazy: true
diff --git a/tests/App/config/config_symfony_v6.yml b/tests/App/config/config_symfony_v6.yml