From 3d28e82275060d6ccce39f00fa20f051b7a15de7 Mon Sep 17 00:00:00 2001
From: Paul Rijke <paul@ibuildings.nl>
Date: Wed, 12 Jun 2024 15:44:26 +0200
Subject: [PATCH] Process review feedback

---
 bin/console                                                   | 3 ++-
 composer.json                                                 | 2 +-
 config/routes/controllers.yaml                                | 2 +-
 public/index.php                                              | 3 +--
 src/{ => Surfnet/StepupRa}/Kernel.php                         | 4 ++--
 .../RaBundle/EventListener/AuthenticatedUserListener.php      | 4 +---
 .../RaBundle/EventListener/ExplicitSessionTimeoutListener.php | 2 --
 7 files changed, 8 insertions(+), 12 deletions(-)
 rename src/{ => Surfnet/StepupRa}/Kernel.php (93%)

diff --git a/bin/console b/bin/console
index 44e1fdbd..0691a73a 100755
--- a/bin/console
+++ b/bin/console
@@ -1,7 +1,8 @@
 #!/usr/bin/env php
 <?php
 
-use src\Kernel;
+
+use Surfnet\StepupRa\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 if (!is_file(dirname(__DIR__).'/vendor/autoload.php')) {
diff --git a/composer.json b/composer.json
index ff87bdba..3857bc78 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
             "Surfnet\\": "src\\Surfnet"
         },
         "classmap": [
-            "src/Kernel.php"
+            "src/Surfnet/StepupRa/Kernel.php"
         ]
     },
     "minimum-stability": "stable",
diff --git a/config/routes/controllers.yaml b/config/routes/controllers.yaml
index d9df70f6..58b25fde 100644
--- a/config/routes/controllers.yaml
+++ b/config/routes/controllers.yaml
@@ -3,5 +3,5 @@ controllers:
     type: attribute
 
 kernel:
-    resource: ../../src/Kernel.php
+    resource: ../../src/Surfnet/StepupRa/Kernel.php
     type: attribute
diff --git a/public/index.php b/public/index.php
index 388bb325..ef151cf3 100644
--- a/public/index.php
+++ b/public/index.php
@@ -18,8 +18,7 @@
  * limitations under the License.
  */
 
-
-use src\Kernel;
+use Surfnet\StepupRa\Kernel;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 require_once dirname(__DIR__).'/config/bootstrap.php';
diff --git a/src/Kernel.php b/src/Surfnet/StepupRa/Kernel.php
similarity index 93%
rename from src/Kernel.php
rename to src/Surfnet/StepupRa/Kernel.php
index 4d35f233..32664ffd 100755
--- a/src/Kernel.php
+++ b/src/Surfnet/StepupRa/Kernel.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace src;
+namespace Surfnet\StepupRa;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
@@ -30,6 +30,6 @@ class Kernel extends BaseKernel
     // see https://symfony.com/doc/current/reference/configuration/kernel.html#kernel-project-dir
     public function getProjectDir(): string
     {
-        return dirname(__DIR__);
+        return dirname(__DIR__, 3);
     }
 }
diff --git a/src/Surfnet/StepupRa/RaBundle/EventListener/AuthenticatedUserListener.php b/src/Surfnet/StepupRa/RaBundle/EventListener/AuthenticatedUserListener.php
index 2b19a320..21351d5e 100644
--- a/src/Surfnet/StepupRa/RaBundle/EventListener/AuthenticatedUserListener.php
+++ b/src/Surfnet/StepupRa/RaBundle/EventListener/AuthenticatedUserListener.php
@@ -3,7 +3,7 @@
 declare(strict_types = 1);
 
 /**
- * Copyright 2016 SURFnet bv
+ * Copyright 2024 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,8 +42,6 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            // The firewall, which makes the token available, listens at P8
-            // We must jump in after the firewall, forcing us to overwrite the translator locale.
             KernelEvents::REQUEST => ['updateLastInteractionMoment', 6],
         ];
     }
diff --git a/src/Surfnet/StepupRa/RaBundle/EventListener/ExplicitSessionTimeoutListener.php b/src/Surfnet/StepupRa/RaBundle/EventListener/ExplicitSessionTimeoutListener.php
index 569e2fbe..78a34060 100644
--- a/src/Surfnet/StepupRa/RaBundle/EventListener/ExplicitSessionTimeoutListener.php
+++ b/src/Surfnet/StepupRa/RaBundle/EventListener/ExplicitSessionTimeoutListener.php
@@ -49,8 +49,6 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            // The firewall, which makes the token available, listens at P8
-            // We must jump in after the firewall, forcing us to overwrite the translator locale.
             KernelEvents::REQUEST => ['checkSessionTimeout', 5],
         ];
     }