Small cleanup after review

DoctrineEncryptBundle · Feb 26, 2024 · a1189b2 · a1189b2
1 parent f58810f
commit a1189b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/DependencyInjection/DoctrineEncryptExtension.php b/src/DependencyInjection/DoctrineEncryptExtension.php
@@ -59,17 +59,20 @@ public function load(array $configs, ContainerBuilder $container): void
             $loader->load('services_with_secret.yml');
         }
 
-        // Symfony 1-3
-        if (Kernel::MAJOR_VERSION < 5) {
-            throw new \RuntimeException('doctrineencryptbundle/doctrine-encrypt-bundle expects symfony-version >= 4.1!');
-        // Symfony 4-6
-        } elseif (Kernel::MAJOR_VERSION < 7) {
+        // Symfony 1-4
+        // Sanity-check since this should be blocked by composer.json
+        if (Kernel::MAJOR_VERSION < 5 || (Kernel::MAJOR_VERSION === 5 && Kernel::MINOR_VERSION < 4)) {
+            throw new \RuntimeException('doctrineencryptbundle/doctrine-encrypt-bundle expects symfony-version >= 5.4!');
+        }
+
+        // Symfony 5-6
+        if (Kernel::MAJOR_VERSION < 7) {
             // PHP 7.x (no attributes)
             if (PHP_VERSION_ID < 80000) {
-                $loader->load('services_subscriber_sf4_php7.yml');
+                $loader->load('services_subscriber_with_annotations.yml');
             // PHP 8.x (annotations and attributes)
             } else {
-                $loader->load('services_subscriber_sf4_php8.yml');
+                $loader->load('services_subscriber_with_annotations_and_attributes.yml');
             }
         // Symfony 7 (only attributes)
         } else {

diff --git a/...ources/config/services_subscriber_sf7.yml → ...fig/service_listeners_with_attributes.yml b/...ources/config/services_subscriber_sf7.yml → ...fig/service_listeners_with_attributes.yml
diff --git a/...s/config/services_subscriber_sf4_php7.yml → .../services_subscriber_with_annotations.yml b/...s/config/services_subscriber_sf4_php7.yml → .../services_subscriber_with_annotations.yml
diff --git a/...s/config/services_subscriber_sf4_php8.yml → ...riber_with_annotations_and_attributes.yml b/...s/config/services_subscriber_sf4_php8.yml → ...riber_with_annotations_and_attributes.yml