Support for Symfony 6

based on lightSAML#97

Author: escopecz

composer.json

@@ -19,16 +19,16 @@
         }
     },
     "require": {
-        "php": ">=5.6",
-        "symfony/framework-bundle": "~2.7|~3.0|~4.0|~5.0",
-        "symfony/security-bundle": "~2.7|~3.0|~4.0|~5.0",
-        "lightsaml/symfony-bridge": "dev-symfony5"
+        "php": ">=7.2.5",
+        "symfony/framework-bundle": "~5.0|~6.0",
+        "symfony/security-bundle": "~5.0|~6.0",
+        "lightsaml/symfony-bridge": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "sebastian/comparator": "^1.2.4|~2.0|~3.0",
-        "symfony/symfony": "~2.7|~3.0|~4.0",
-        "symfony/monolog-bundle": "~2.7|~3.0|~4.0"
+        "phpunit/phpunit": "~8.4|~9.5",
+        "sebastian/comparator": "^4.0",
+        "symfony/symfony": "~5.0|~6.0",
+        "symfony/monolog-bundle": "~3.0"
     },
     "config": {
         "bin-dir": "bin"

src/LightSaml/SpBundle/Controller/DefaultController.php

@@ -11,39 +11,43 @@
 
 namespace LightSaml\SpBundle\Controller;
 
-use LightSaml\Builder\Profile\Metadata\MetadataProfileBuilder;
+use LightSaml\SymfonyBridgeBundle\Bridge\Container\BuildContainer;
 use LightSaml\Builder\Profile\WebBrowserSso\Sp\SsoSpSendAuthnRequestProfileBuilderFactory;
-use LightSaml\SymfonyBridgeBundle\Bridge\Container\PartyContainer;
-use LightSaml\SymfonyBridgeBundle\Bridge\Container\StoreContainer;
+use LightSaml\Builder\Profile\Metadata\MetadataProfileBuilder;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 
 class DefaultController extends AbstractController
 {
-    private MetadataProfileBuilder $metadataProfileBuilder;
-    private SsoSpSendAuthnRequestProfileBuilderFactory $profileLoginFactory;
-    private StoreContainer $storeContainer;
-    private PartyContainer $partyContainer;
-    private string $discoveryRoute;
-
-    public function __construct(
-        MetadataProfileBuilder $metadataProfileBuilder,
-        SsoSpSendAuthnRequestProfileBuilderFactory $profileLoginFactory,
-        StoreContainer $storeContainer,
-        PartyContainer $partyContainer,
-        string $discoveryRoute
-    ) {
+    /**
+     * @var BuildContainer $buildContainer
+     */
+    protected BuildContainer $buildContainer;
+    /**
+     * @var SsoSpSendAuthnRequestProfileBuilderFactory $ssoSpSendAuthnRequestProfileBuilderFactory
+     */
+    protected SsoSpSendAuthnRequestProfileBuilderFactory $ssoSpSendAuthnRequestProfileBuilderFactory;
+    /**
+     * @var MetadataProfileBuilder $metadataProfileBuilder
+     */
+    protected MetadataProfileBuilder $metadataProfileBuilder;
+    /**
+     * @var string $samlSpDiscoveryRoute
+     */
+    protected string $samlSpDiscoveryRoute;
+
+    public function __construct(BuildContainer $buildContainer, SsoSpSendAuthnRequestProfileBuilderFactory $ssoSpSendAuthnRequestProfileBuilderFactory, MetadataProfileBuilder $metadataProfileBuilder, string $samlSpDiscoveryRoute)
+    {
+        $this->buildContainer = $buildContainer;
+        $this->ssoSpSendAuthnRequestProfileBuilderFactory = $ssoSpSendAuthnRequestProfileBuilderFactory;
         $this->metadataProfileBuilder = $metadataProfileBuilder;
-        $this->profileLoginFactory = $profileLoginFactory;
-        $this->storeContainer = $storeContainer;
-        $this->discoveryRoute = $discoveryRoute;
-        $this->partyContainer = $partyContainer;
+        $this->samlSpDiscoveryRoute = $samlSpDiscoveryRoute;
     }
-
     public function metadataAction()
     {
-        $context = $this->metadataProfileBuilder->buildContext();
-        $action = $this->metadataProfileBuilder->buildAction();
+        $profile = $this->metadataProfileBuilder;
+        $context = $profile->buildContext();
+        $action = $profile->buildAction();
 
         $action->execute($context);
 
@@ -52,7 +56,7 @@ public function metadataAction()
 
     public function discoveryAction()
     {
-        $parties = $this->partyContainer->getIdpEntityDescriptorStore()->all();
+        $parties = $this->buildContainer->getPartyContainer()->getIdpEntityDescriptorStore()->all();
 
         if (1 == count($parties)) {
             return $this->redirect($this->generateUrl('lightsaml_sp.login', ['idp' => $parties[0]->getEntityID()]));
@@ -67,10 +71,10 @@ public function loginAction(Request $request)
     {
         $idpEntityId = $request->get('idp');
         if (null === $idpEntityId) {
-            return $this->redirect($this->generateUrl($this->discoveryRoute));
+            return $this->redirect($this->generateUrl($this->samlSpDiscoveryRoute));
         }
 
-        $profile = $this->profileLoginFactory->get($idpEntityId);
+        $profile = $this->ssoSpSendAuthnRequestProfileBuilderFactory->get($idpEntityId);
         $context = $profile->buildContext();
         $action = $profile->buildAction();
 
@@ -81,7 +85,7 @@ public function loginAction(Request $request)
 
     public function sessionsAction()
     {
-        $ssoState = $this->storeContainer->getSsoStateStore()->get();
+        $ssoState = $this->buildContainer->getStoreContainer()->getSsoStateStore()->get();
 
         return $this->render('@LightSamlSp/sessions.html.twig', [
             'sessions' => $ssoState->getSsoSessions(),

src/LightSaml/SpBundle/Resources/config/services.yml

@@ -5,15 +5,14 @@ parameters:
 services:
     LightSaml\SpBundle\Controller\DefaultController:
         public: true
-        tags: [ 'controller.service_arguments' ]
+        tags: ['controller.service_arguments']
         calls:
             - [ setContainer, [ "@service_container" ] ]
         arguments:
-            $metadataProfileBuilder: '@ligthsaml.profile.metadata'
-            $profileLoginFactory: '@ligthsaml.profile.login_factory'
-            $storeContainer: "@lightsaml.container.store"
-            $partyContainer: "@lightsaml.container.party"
-            $discoveryRoute: "%lightsaml_sp.route.discovery%"
+            - "@lightsaml.container.build"
+            - "@ligthsaml.profile.login_factory"
+            - "@ligthsaml.profile.metadata"
+            - "%lightsaml_sp.route.discovery%"
 
     lightsaml_sp.username_mapper.simple:
         class: LightSaml\SpBundle\Security\User\SimpleUsernameMapper