#40 - upgrade to EA 5

Author: xaviermarchegay

composer.json

@@ -46,7 +46,7 @@
     "doctrine/doctrine-migrations-bundle": "^3.7 || ^4",
     "doctrine/orm": "^2.20 || ^3.5",
     "dragonmantank/cron-expression": "^3.6",
-    "easycorp/easyadmin-bundle": "^4.27",
+    "easycorp/easyadmin-bundle": "^5",
     "symfony/doctrine-messenger": "^6.4 || ^7.4 || ^8",
     "symfony/dotenv": "^6.4 || ^7.4 || ^8",
     "symfony/messenger":"^6.4 || ^7.4 || ^8",

src/Admin/Field/ContextField.php

@@ -15,12 +15,13 @@
 
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+use Symfony\Contracts\Translation\TranslatableInterface;
 
 class ContextField implements FieldInterface
 {
     use FieldTrait;
 
-    public static function new(string $propertyName, ?string $label = null): self
+    public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
         return (new self())
             ->setProperty($propertyName)

src/Admin/Field/EnumField.php

@@ -15,12 +15,13 @@
 
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+use Symfony\Contracts\Translation\TranslatableInterface;
 
 class EnumField implements FieldInterface
 {
     use FieldTrait;
 
-    public static function new(string $propertyName, ?string $label = null): self
+    public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
         return (new self())
             ->setProperty($propertyName)

src/Admin/Field/LogLevelField.php

@@ -15,12 +15,13 @@
 
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+use Symfony\Contracts\Translation\TranslatableInterface;
 
 class LogLevelField implements FieldInterface
 {
     use FieldTrait;
 
-    public static function new(string $propertyName, ?string $label = null): self
+    public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
         return (new self())
             ->setProperty($propertyName)

src/Controller/Admin/ProcessDashboardController.php

@@ -13,21 +13,19 @@
 
 namespace CleverAge\UiProcessBundle\Controller\Admin;
 
-use CleverAge\UiProcessBundle\Entity\LogRecord;
-use CleverAge\UiProcessBundle\Entity\ProcessExecution;
-use CleverAge\UiProcessBundle\Entity\ProcessSchedule;
 use CleverAge\UiProcessBundle\Entity\User;
+use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminDashboard;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Dashboard;
 use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractDashboardController;
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Component\Translation\LocaleSwitcher;
 
 #[IsGranted('ROLE_USER')]
+#[AdminDashboard(routePath: '/process', routeName: 'process')]
 class ProcessDashboardController extends AbstractDashboardController
 {
     public function __construct(
@@ -36,7 +34,6 @@ public function __construct(
     ) {
     }
 
-    #[Route('/process', name: 'process')]
     public function index(): Response
     {
         $adminUrlGenerator = $this->container->get(AdminUrlGenerator::class);
@@ -57,15 +54,15 @@ public function configureMenuItems(): iterable
         yield MenuItem::subMenu('Process', 'fas fa-gear')->setSubItems(
             [
                 MenuItem::linkToRoute('Process list', 'fas fa-list', 'process_list'),
-                MenuItem::linkToCrud('Executions', 'fas fa-rocket', ProcessExecution::class),
-                MenuItem::linkToCrud('Logs', 'fas fa-pen', LogRecord::class),
-                MenuItem::linkToCrud('Scheduler', 'fas fa-solid fa-clock', ProcessSchedule::class),
+                MenuItem::linkTo(ProcessExecutionCrudController::class, 'Executions', 'fas fa-rocket'),
+                MenuItem::linkTo(LogRecordCrudController::class, 'Logs', 'fas fa-pen'),
+                MenuItem::linkTo(ProcessScheduleCrudController::class, 'Scheduler', 'fas fa-solid fa-clock'),
             ]
         );
         if ($this->isGranted('ROLE_ADMIN')) {
             yield MenuItem::subMenu('Users', 'fas fa-user')->setSubItems(
                 [
-                    MenuItem::linkToCrud('User List', 'fas fa-user', User::class),
+                    MenuItem::linkTo(UserCrudController::class, 'User List', 'fas fa-user'),
                 ]
             );
         }

src/Controller/Admin/ProcessExecutionCrudController.php

@@ -135,7 +135,7 @@ public function showLogs(): RedirectResponse
     public function downloadLogFile(): Response
     {
         /** @var ProcessExecution $processExecution */
-        $processExecution = $this->getContext()->getEntity()->getInstance();
+        $processExecution = $this->getContext()?->getEntity()->getInstance();
         $filepath = $this->getLogFilePath($processExecution);
         $basename = basename($filepath);
         $content = file_get_contents($filepath);

src/Controller/Admin/UserCrudController.php

@@ -108,11 +108,11 @@ public function generateToken(): Response
     {
         $adminContext = $this->getContext();
         /** @var User $user */
-        $user = $adminContext->getEntity()->getInstance();
+        $user = $adminContext?->getEntity()->getInstance();
         $token = md5(uniqid(date('YmdHis')));
         $user->setToken((new Pbkdf2PasswordHasher())->hash($token));
         $this->persistEntity(
-            $this->container->get('doctrine')->getManagerForClass($adminContext->getEntity()->getFqcn()),
+            $this->container->get('doctrine')->getManagerForClass($adminContext?->getEntity()->getFqcn()),
             $user
         );
         $this->addFlash('success', 'New token generated '.$token.' (keep it in secured area. This token will never be displayed anymore)');