Merge pull request #23 from OpenClassrooms/improve_sf6_compatibility

Improve sf6 compatibility

Author: kletord

.coveralls.yml

@@ -7,6 +7,7 @@
             <call method="setReader">
                 <argument type="service" id="annotation_reader"/>
             </call>
+            <argument type="service" id="security.authorization_checker"/>
         </service>
         <service id="openclassrooms.use_case.security_factory" class="OpenClassrooms\Bundle\UseCaseBundle\Services\Security\Impl\SecurityFactoryImpl" public="true"/>
         <service id="openclassrooms.use_case.transaction_factory" class="OpenClassrooms\Bundle\UseCaseBundle\Services\Transaction\Impl\TransactionFactoryImpl" public="true"/>

.travis.yml

@@ -48,7 +48,9 @@ class UseCaseProxyFactoryImpl implements UseCaseProxyFactory
      */
     private $builder;
 
-    public function __construct()
+    public function __construct(
+        private readonly AuthorizationCheckerInterface $authorizationChecker
+    )
     {
         $this->builder = new UseCaseProxyBuilderImpl();
     }
@@ -114,15 +116,7 @@ private function buildSecurity(array $tagParameters)
         if (isset($tagParameters['security'])) {
             $security = $this->container->get($tagParameters['security']);
         } else {
-            $defaultSecurityContextId = $this->container->getParameter(
-                'openclassrooms.use_case.default_authorization_checker'
-            );
-            if (!$this->container->has($defaultSecurityContextId)) {
-                throw new SecurityIsNotDefinedException('Default security context: \''.$defaultSecurityContextId.'\' is not defined.');
-            }
-            $security = $this->container->get(
-                $this->container->getParameter('openclassrooms.use_case.default_authorization_checker')
-            );
+            $security = $this->authorizationChecker;
         }
         if ($security instanceof AuthorizationCheckerInterface) {
             /** @var SecurityFactory $securityFactory */

Resources/config/services.xml

@@ -16,6 +16,7 @@
         <parameter key="openclassrooms.tests.use_cases.event_use_case_stub.class">OpenClassrooms\Bundle\UseCaseBundle\Tests\DependencyInjection\Fixtures\BusinessRules\UseCases\EventUseCaseStub</parameter>
     </parameters>
     <services>
+        <service id="security.authorization_checker" class="OpenClassrooms\Bundle\UseCaseBundle\Tests\DependencyInjection\Fixtures\Util\AuthorizationCheckerSpy"/>
         <service id="annotation_reader" class="Doctrine\Common\Annotations\AnnotationReader"/>
         <service id="openclassrooms.tests.util.security_stub" class="%openclassrooms.tests.util.security_stub.class%" public="true"/>
         <service id="openclassrooms.tests.util.authorization_checker_stub" class="%openclassrooms.tests.util.authorization_checker_stub.class%" public="true"/>

Services/Proxy/Impl/UseCaseProxyFactoryImpl.php

@@ -11,32 +11,6 @@
  */
 class SecurityOpenClassroomsUseCaseExtensionTest extends AbstractDependencyInjectionTestCase
 {
-    /**
-     * @test
-     */
-    public function WithSecurityConfigurationWithoutSecurityContext_SecurityUseCase_ThrowException()
-    {
-        $this->expectException(SecurityIsNotDefinedException::class);
-
-        $this->configLoader->load('SecurityConfiguration.php');
-        $this->container->compile();
-
-        $this->container->get('openclassrooms.tests.use_cases.configuration_security_use_case_stub');
-    }
-
-    /**
-     * @test
-     */
-    public function WithDefaultConfigurationWithoutSecurityContext_SecurityUseCase_ThrowException()
-    {
-        $this->expectException(SecurityIsNotDefinedException::class);
-
-        $this->configLoader->load('DefaultConfiguration.php');
-        $this->container->compile();
-
-        $this->container->get('openclassrooms.tests.use_cases.configuration_security_use_case_stub');
-    }
-
     /**
      * @test
      */