From 56ce0628e87b7cd1746d6e7ae0b1eb88804c311a Mon Sep 17 00:00:00 2001
From: Michiel Kodde <mkodde@ibuildings.nl>
Date: Thu, 14 Mar 2024 09:21:17 +0100
Subject: [PATCH] Rename namespace of Kernel

It is no longer in App, but resides in Surf/Middleware
---
 bin/console                             |  2 +-
 ci/qa/phpunit.xml                       |  2 +-
 composer.json                           |  5 +--
 public/index.php                        |  2 +-
 src/Kernel.php                          | 55 -------------------------
 src/Surfnet/StepupMiddleware/Kernel.php | 21 ++++++++++
 6 files changed, 25 insertions(+), 62 deletions(-)
 delete mode 100644 src/Kernel.php
 create mode 100644 src/Surfnet/StepupMiddleware/Kernel.php

diff --git a/bin/console b/bin/console
index 22a216a4c..044c2d8f5 100755
--- a/bin/console
+++ b/bin/console
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-use Surfnet\AzureMfa\Infrastructure\Kernel;
+use Surfnet\StepupMiddleware\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
diff --git a/ci/qa/phpunit.xml b/ci/qa/phpunit.xml
index 660a2b6ad..47db5e90b 100644
--- a/ci/qa/phpunit.xml
+++ b/ci/qa/phpunit.xml
@@ -10,7 +10,7 @@
     <ini name="error_reporting" value="-1"/>
     <server name="APP_ENV" value="test" force="true"/>
     <server name="SHELL_VERBOSITY" value="-1"/>
-    <server name="KERNEL_CLASS" value="\App\Kernel"/>
+    <server name="KERNEL_CLASS" value="\Surfnet\StepupMiddleware\Kernel"/>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="999999"/>
   </php>
   <testsuites>
diff --git a/composer.json b/composer.json
index 29716da48..aee55b98d 100644
--- a/composer.json
+++ b/composer.json
@@ -6,10 +6,7 @@
         "psr-4": {
             "Surfnet\\Stepup\\": "src\\Surfnet\\Stepup",
             "Surfnet\\StepupMiddleware\\": "src\\Surfnet\\StepupMiddleware"
-        },
-        "classmap": [
-            "src/Kernel.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/public/index.php b/public/index.php
index a20b1e57a..0d0178f6d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,5 @@
 <?php
-use App\Kernel;
+use Surfnet\StepupMiddleware\Kernel;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 require_once dirname(__DIR__).'/config/bootstrap.php';
diff --git a/src/Kernel.php b/src/Kernel.php
deleted file mode 100644
index 94c750689..000000000
--- a/src/Kernel.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace App;
-
-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\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
-use const PHP_VERSION_ID;
-
-class Kernel extends BaseKernel
-{
-    use MicroKernelTrait;
-
-    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
-
-    public function registerBundles(): iterable
-    {
-        $contents = require $this->getProjectDir() . '/config/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
-                yield new $class();
-            }
-        }
-    }
-
-    public function getProjectDir(): string
-    {
-        return dirname(__DIR__);
-    }
-
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
-    {
-        $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug);
-        $container->setParameter('container.dumper.inline_factories', true);
-        $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');
-    }
-
-    protected function configureRoutes(RoutingConfigurator $routes): void
-    {
-        $extensions = '{php,yml,yaml}';
-
-        $routes->import('../config/{routes}/' . $this->environment . "/*.$extensions");
-        $routes->import("../config/{routes}/*.$extensions");
-        $routes->import("../config/{routes}.$extensions");
-    }
-}
diff --git a/src/Surfnet/StepupMiddleware/Kernel.php b/src/Surfnet/StepupMiddleware/Kernel.php
new file mode 100644
index 000000000..51f692d8b
--- /dev/null
+++ b/src/Surfnet/StepupMiddleware/Kernel.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Surfnet\StepupMiddleware;
+
+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\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+use const PHP_VERSION_ID;
+
+class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    public function getProjectDir(): string
+    {
+        return dirname(__DIR__, 3);
+    }
+}