Merge branch 'b-7.0.x-fix_activation_dependency-OXDEV-7659' into b-7.…

…0.x-prototype-OXDEV-7325
OXID-eSales · Dec 7, 2023 · b38427e · b38427e
2 parents 16c6b6e + 6a8fd41
commit b38427e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 71 deletions.
diff --git a/services.yaml b/services.yaml
@@ -1,6 +1,5 @@
 imports:
   - { resource: src/Setting/services.yaml }
-  - { resource: src/Shared/services.yaml }
 
 parameters:
   oxidesales.graphqlconfigurationaccess.depends_on_modules: [ 'oe_graphql_base' ]
@@ -19,11 +18,13 @@ services:
     class: OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\PermissionProvider
     tags: [ 'graphql_permission_provider' ]
 
-  OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\Authorization:
-    class: OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\Authorization
+  OxidEsales\GraphQL\ConfigurationAccess\DependencyCheckTrigger:
+    alias: OxidEsales\GraphQL\Base\Framework\GraphQLQueryHandler
+    public: true
 
   OxidEsales\GraphQL\ConfigurationAccess\Shared\Subscriber\BeforeModuleDeactivation:
     class: OxidEsales\GraphQL\ConfigurationAccess\Shared\Subscriber\BeforeModuleDeactivation
-    arguments: [ '%oxidesales.graphqlconfigurationaccess.depends_on_modules%' ]
+    arguments:
+      $dependencies: '%oxidesales.graphqlconfigurationaccess.depends_on_modules%'
     tags: [ 'kernel.event_subscriber' ]
     public: true
diff --git a/src/Shared/Exception/GraphQLServiceNotFound.php b/src/Shared/Exception/GraphQLServiceNotFound.php
diff --git a/src/Shared/Service/Authorization.php b/src/Shared/Service/Authorization.php
diff --git a/src/Shared/Subscriber/BeforeModuleDeactivation.php b/src/Shared/Subscriber/BeforeModuleDeactivation.php
@@ -16,11 +16,9 @@
 
 final class BeforeModuleDeactivation implements EventSubscriberInterface
 {
-    private array $dependencies;
-
-    public function __construct(array $dependencies)
-    {
-        $this->dependencies = $dependencies;
+    public function __construct(
+        private array $dependencies
+    ) {
     }
 
     public function handle(OriginalEvent $event): OriginalEvent

diff --git a/src/Shared/services.yaml b/src/Shared/services.yaml