Call Di-Container once

Author: kayjoosten

library/EngineBlock/Corto/Module/Service/SingleSignOn.php

@@ -200,11 +200,11 @@ public function serve($serviceName, Request $httpRequest)
         }
 
         // Multiple IdPs found...
-
+        $container = $application->getDiContainer();
         // Auto-select IdP when 'feature_enable_sso_notification' is enabled and send AuthenticationRequest on success
-        if ($application->getDiContainer()->getFeatureConfiguration()->isEnabled("eb.enable_sso_notification")) {
-            $idpEntityId = $application->getDiContainer()->getSsoNotificationService()->
-                handleSsoNotification($application->getDiContainer()->getSymfonyRequest()->cookies, $this->_server);
+        if ($container->getFeatureConfiguration()->isEnabled("eb.enable_sso_notification")) {
+            $idpEntityId = $container->getSsoNotificationService()
+                ->handleSsoNotification($container->getSymfonyRequest()->cookies, $this->_server);
 
             if (!empty($idpEntityId)) {
                 try {
@@ -220,8 +220,8 @@ public function serve($serviceName, Request $httpRequest)
         }
 
         // Auto-select IdP when 'wayf.rememberChoice' feature is enabled and is allowed for the current request
-        if (($application->getDiContainer()->getRememberChoice() === true) && !($request->getForceAuthn() || $request->isDebugRequest())) {
-            $cookies = $application->getDiContainer()->getSymfonyRequest()->cookies->all();
+        if (($container->getRememberChoice() === true) && !($request->getForceAuthn() || $request->isDebugRequest())) {
+            $cookies = $container->getSymfonyRequest()->cookies->all();
             if (array_key_exists('rememberchoice', $cookies)) {
                 $remembered = json_decode($cookies['rememberchoice']);
                 if (array_search($remembered, $candidateIDPs) !== false) {
@@ -240,10 +240,10 @@ public function serve($serviceName, Request $httpRequest)
             return;
         }
 
-        $authnRequestRepository = $application->getDiContainer()->getAuthnRequestSessionRepository();
+        $authnRequestRepository = $container->getAuthnRequestSessionRepository();
         $authnRequestRepository->store($request);
 
-        $correlationIdRepository = $application->getDiContainer()->getCorrelationIdRepository();
+        $correlationIdRepository = $container->getCorrelationIdRepository();
         $correlationIdRepository->mint($request->getId());
         $correlationIdRepository->resolve($request->getId());
 

library/EngineBlock/Corto/ProxyServer.php

@@ -470,9 +470,7 @@ public function sendAuthenticationRequest(
         $authnRequestRepository->store($spRequest);
         $authnRequestRepository->link($ebRequest, $spRequest);
 
-        $correlationIdRepository = EngineBlock_ApplicationSingleton::getInstance()
-            ->getDiContainer()
-            ->getCorrelationIdRepository();
+        $correlationIdRepository = $diContainer->getCorrelationIdRepository();
         $correlationIdRepository->mint($spRequest->getId());
         $correlationIdRepository->link($ebRequest->getId(), $spRequest->getId());
         $correlationIdRepository->resolve($spRequest->getId());
@@ -561,9 +559,7 @@ public function sendStepupAuthenticationRequest(
         $authnRequestRepository->store($spRequest);
         $authnRequestRepository->link($ebRequest, $spRequest);
 
-        $correlationIdRepository = EngineBlock_ApplicationSingleton::getInstance()
-            ->getDiContainer()
-            ->getCorrelationIdRepository();
+        $correlationIdRepository = $container->getCorrelationIdRepository();
         $correlationIdRepository->mint($spRequest->getId());
         $correlationIdRepository->link($ebRequest->getId(), $spRequest->getId());
         $correlationIdRepository->resolve($spRequest->getId());

tests/bootstrap.php

@@ -21,30 +21,6 @@
 define('TEST_RESOURCES_DIR', __DIR__ . '/resources');
 
 require_once realpath(__DIR__) . '/../vendor/autoload.php';
-
-$worktreeRoot   = (string) realpath(__DIR__ . '/..');
-$vendorRealPath = (string) realpath(__DIR__ . '/../vendor');
-if (!str_starts_with($vendorRealPath, $worktreeRoot . DIRECTORY_SEPARATOR)) {
-    $worktreeLibrary = $worktreeRoot . '/library';
-    $worktreeSrc     = $worktreeRoot . '/src';
-    spl_autoload_register(static function (string $class) use ($worktreeLibrary, $worktreeSrc): bool {
-        $psr0File = $worktreeLibrary . '/' . str_replace('_', '/', $class) . '.php';
-        if (file_exists($psr0File)) {
-            require $psr0File;
-            return true;
-        }
-        if (str_starts_with($class, 'OpenConext\\')) {
-            $relative = substr($class, strlen('OpenConext\\'));
-            $psr4File = $worktreeSrc . '/OpenConext/' . str_replace('\\', '/', $relative) . '.php';
-            if (file_exists($psr4File)) {
-                require $psr4File;
-                return true;
-            }
-        }
-        return false;
-    }, true, true);
-}
-
 require_once realpath(__DIR__) . '/../src/Kernel.php';
 
 $kernel = new Kernel('test', true);