updated php-di to v7 by changing annotations to attributes

SkautDevs · Sep 9, 2023 · 32c9fce · 32c9fce
1 parent 14f314c
commit 32c9fce
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 99 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,6 @@
         "middlewares/negotiation": "^2.0",
         "middlewares/trailing-slash": "^2.0",
         "monolog/monolog": "^1.25",
-        "php-di/php-di": "^6.0",
         "php-di/slim-bridge": "^3",
         "phpmailer/phpmailer": "^6.0",
         "robmorgan/phinx": "^0.12.5",

diff --git a/composer.lock b/composer.lock
diff --git a/src/AbstractController.php b/src/AbstractController.php
@@ -4,7 +4,7 @@
 
 namespace kissj;
 
-use DI\Annotation\Inject;
+use DI\Attribute\Inject;
 use kissj\Event\Event;
 use kissj\FileHandler\FileHandler;
 use kissj\FlashMessages\FlashMessagesBySession;
@@ -15,32 +15,23 @@
 use Slim\Routing\RouteContext;
 use Slim\Views\Twig;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use Psr\Log\LoggerInterface;
 
 abstract class AbstractController
 {
-    /**
-     * @Inject()
-     */
+    #[Inject]
     protected FlashMessagesBySession $flashMessages;
 
-    /**
-     * @Inject("Psr\Log\LoggerInterface")
-     */
+    #[Inject(LoggerInterface::class)]
     protected Logger $logger;
 
-    /**
-     * @Inject()
-     */
+    #[Inject]
     protected Twig $view;
 
-    /**
-     * @Inject()
-     */
+    #[Inject]
     protected TranslatorInterface $translator;
 
-    /**
-     * @Inject()
-     */
+    #[Inject]
     protected FileHandler $fileHandler;
 
     /**

diff --git a/src/Application/ApplicationGetter.php b/src/Application/ApplicationGetter.php
@@ -14,7 +14,7 @@ public function getApp(
             $envPath,
             $envFilename,
         ));
-        $containerBuilder->useAnnotations(true); // used in AbstractController
+        $containerBuilder->useAttributes(true); // used in AbstractController
         if ($_ENV['DEBUG'] === 'false') {
             // TODO add autowired definitions into container to get more performace
             // https://php-di.org/doc/performances.html#optimizing-for-compilation

diff --git a/src/User/UserController.php b/src/User/UserController.php
@@ -117,7 +117,7 @@ public function getDashboard(User $user, Request $request, Response $response):
             UserRole::ContingentAdminPl,
             UserRole::ContingentAdminHu,
             UserRole::ContingentAdminEu,
-            UserRole::ContingentAdminRo,
+            UserRole::ContingentAdminRo
                 => $this->redirect($request, $response, 'admin-dashboard', $routerEventSlug),
         };
     }