Fix Symfony 7.0 deprecations in Kernel, MockTranslator and ProvideConsent

- Remove MockTranslator::transChoice() which was removed from
  TranslatorInterface in Symfony 6 and would throw a fatal error
  if called
- Modernize Kernel::configureContainer() to the Symfony 7
  MicroKernelTrait signature (ContainerConfigurator, LoaderInterface,
  ContainerBuilder), replacing $loader->load() glob calls with
  $container->import() and dropping the now-redundant
  FileResource/addResource tracking
- Remove dead null-guard on Request::getSession() in ProvideConsent;
  Symfony 7 throws SessionNotFoundException instead of returning null

Author: johanib

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

@@ -139,9 +139,6 @@ public function serve($serviceName, Request $httpRequest)
         $authenticationState = $this->_authenticationStateHelper->getAuthenticationState();
 
         $session = $httpRequest->getSession();
-        if($session === null){
-            throw new EngineBlock_Exception('Discovery override failure: No session available.');
-        }
         $idpDiscovery = $this->discoverySelectionService->getDiscoveryFromRequest($session, $identityProvider);
 
 

src/Kernel.php

@@ -20,8 +20,8 @@
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use function dirname;
@@ -47,16 +47,14 @@ public function getProjectDir(): string
         return dirname(__DIR__);
     }
 
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
+    protected function configureContainer(ContainerConfigurator $container, LoaderInterface $loader, ContainerBuilder $builder): void
     {
-        $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
-
         $confDir = $this->getProjectDir().'/config';
 
-        $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
+        $container->import($confDir.'/{packages}/*'.self::CONFIG_EXTS);
+        $container->import($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS);
+        $container->import($confDir.'/{services}'.self::CONFIG_EXTS);
+        $container->import($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS);
     }
 
     protected function configureRoutes(RoutingConfigurator $routes): void

src/OpenConext/EngineBlockFunctionalTestingBundle/Mock/MockTranslator.php

@@ -64,12 +64,6 @@ public function trans(string $id, array $parameters = [], ?string $domain = null
         return $this->translator->trans($id, $parameters, $domain, $locale);
     }
 
-    public function transChoice($id, $number, array $parameters = [], $domain = null, $locale = null)
-    {
-        $this->translator->getCatalogue($locale)->add($this->translations);
-        return $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
-    }
-
     public function setLocale(string $locale): void
     {
         $this->translator->setLocale($locale);