tests: fix tests

Add missing binding and reorganize constructor parameters
ecphp · Mar 1, 2023 · 1dc9838 · 1dc9838
1 parent 87109f6
commit 1dc9838
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 39 deletions.
diff --git a/spec/EcPhp/CasBundle/Security/CasAuthenticatorSpec.php b/spec/EcPhp/CasBundle/Security/CasAuthenticatorSpec.php
@@ -22,7 +22,6 @@
 use EcPhp\CasLib\Response\Factory\ProxyFailureFactory;
 use EcPhp\CasLib\Response\Factory\ServiceValidateFactory;
 use loophp\psr17\Psr17;
-use loophp\UnalteredPsrHttpMessageBridgeBundle\Factory\UnalteredPsrHttpFactory;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Response;
 use Nyholm\Psr7\ServerRequest;
@@ -42,29 +41,6 @@ class CasAuthenticatorSpec extends ObjectBehavior
 {
     public function it_can_check_if_authentication_is_supported_when_a_user_is_logged_in()
     {
-        $cas = $this->getCas();
-
-        $psr17Factory = new Psr17Factory();
-
-        $psrHttpMessageFactory = new PsrHttpFactory(
-            $psr17Factory,
-            $psr17Factory,
-            $psr17Factory,
-            $psr17Factory
-        );
-
-        $casResponseBuilder = new CasResponseBuilder(
-            new AuthenticationFailureFactory(),
-            new ProxyFactory(),
-            new ProxyFailureFactory(),
-            new ServiceValidateFactory()
-        );
-
-        $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
-
-        $this
-            ->beConstructedWith($cas, $casUserProvider);
-
         $this
             ->supports(Request::create('http://app'))
             ->shouldReturn(false);
@@ -101,7 +77,7 @@ public function it_can_check_if_authentication_is_supported_when_url_contains_a_
 
         $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
 
-        $this->beConstructedWith($cas, $casUserProvider);
+        $this->beConstructedWith($cas, $casUserProvider, new HttpFoundationFactory());
 
         $this
             ->supports($requestOk)
@@ -134,7 +110,7 @@ public function it_can_check_if_authentication_is_supported_when_url_does_not_co
 
         $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
 
-        $this->beConstructedWith($cas, $casUserProvider);
+        $this->beConstructedWith($cas, $casUserProvider, new HttpFoundationFactory());
 
         $this
             ->supports($requestNotOk)
@@ -181,7 +157,7 @@ public function it_can_check_the_credentials_when_service_and_ticket_parameters_
 
         $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
 
-        $this->beConstructedWith($cas, $casUserProvider);
+        $this->beConstructedWith($cas, $casUserProvider, new HttpFoundationFactory());
 
         $this
             ->authenticate($request)
@@ -255,7 +231,7 @@ public function it_can_get_the_user_from_the_response(
 
         $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
 
-        $this->beConstructedWith($cas, $casUserProvider);
+        $this->beConstructedWith($cas, $casUserProvider, new HttpFoundationFactory());
 
         $passport = $this
             ->authenticate($request);
@@ -343,7 +319,7 @@ public function it_cannot_check_the_credentials_when_ticket_is_missing(
 
         $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
 
-        $this->beConstructedWith($cas, $casUserProvider);
+        $this->beConstructedWith($cas, $casUserProvider, new HttpFoundationFactory());
 
         $this
             ->shouldThrow(AuthenticationException::class)
@@ -391,12 +367,9 @@ public function let()
             new ServiceValidateFactory()
         );
 
-        $unalteredPsrHttpMessageFactory = new UnalteredPsrHttpFactory($psrHttpMessageFactory, $psr17Factory);
-
         $casUserProvider = new CasUserProvider($casResponseBuilder, $psrHttpMessageFactory);
 
-        $this
-            ->beConstructedWith($cas, $casUserProvider);
+        $this->beConstructedWith($cas, $casUserProvider, new HttpFoundationFactory());
     }
 
     private function getCas(): SymfonyCasInterface

diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -21,7 +21,6 @@
 use EcPhp\CasBundle\Controller\Logout;
 use EcPhp\CasBundle\Controller\ProxyCallback;
 use EcPhp\CasBundle\Security\CasAuthenticator;
-use EcPhp\CasBundle\Security\CasEntryPoint;
 use EcPhp\CasBundle\Security\Core\User\CasUserProvider;
 use EcPhp\CasBundle\Security\Core\User\CasUserProviderInterface;
 use EcPhp\CasLib\Cas;
@@ -105,7 +104,4 @@
     $services
         ->set(ProxyCallback::class)
         ->tag('controller.service_arguments');
-
-    $services
-        ->set(CasEntryPoint::class);
 };
diff --git a/src/Security/CasAuthenticator.php b/src/Security/CasAuthenticator.php
@@ -31,9 +31,9 @@
 final class CasAuthenticator extends AbstractAuthenticator implements AuthenticationEntryPointInterface
 {
     public function __construct(
+        private readonly SymfonyCasInterface $cas,
         private readonly CasUserProviderInterface $userProvider,
-        private readonly HttpFoundationFactoryInterface $httpFoundationFactory,
-        private readonly SymfonyCasInterface $cas
+        private readonly HttpFoundationFactoryInterface $httpFoundationFactory
     ) {
     }