Merge branch 'composer-update'

Author: codedmonkey

composer.json

@@ -63,7 +63,7 @@
         "dama/doctrine-test-bundle": "^8.3",
         "friendsofphp/php-cs-fixer": "^3.75",
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^11.5",
+        "phpunit/phpunit": "^12.4",
         "symfony/browser-kit": "^7.3",
         "symfony/css-selector": "^7.3",
         "symfony/debug-bundle": "^7.3",

composer.lock

@@ -5,7 +5,7 @@
 use CodedMonkey\Dirigent\Doctrine\Entity\AccessToken;
 use CodedMonkey\Dirigent\Doctrine\Entity\User;
 use Doctrine\ORM\QueryBuilder;
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminCrud;
+use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminRoute;
 use EasyCorp\Bundle\EasyAdminBundle\Collection\FieldCollection;
 use EasyCorp\Bundle\EasyAdminBundle\Collection\FilterCollection;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
@@ -20,7 +20,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Orm\EntityRepository;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-#[AdminCrud(routePath: '/access-tokens', routeName: 'access_tokens')]
+#[AdminRoute(path: '/access-tokens', name: 'access_tokens')]
 class DashboardAccessTokenController extends AbstractCrudController implements EventSubscriberInterface
 {
     public static function getEntityFqcn(): string

src/Controller/Dashboard/DashboardAccessTokenController.php

@@ -4,14 +4,14 @@
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Credentials;
 use CodedMonkey\Dirigent\Doctrine\Entity\CredentialsType;
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminCrud;
+use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminRoute;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
 use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextareaField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 
-#[AdminCrud(routePath: '/credentials', routeName: 'credentials')]
+#[AdminRoute(path: '/credentials', name: 'credentials')]
 class DashboardCredentialsController extends AbstractCrudController
 {
     public static function getEntityFqcn(): string

src/Controller/Dashboard/DashboardCredentialsController.php

@@ -6,8 +6,7 @@
 use CodedMonkey\Dirigent\Doctrine\Entity\RegistryPackageMirroring;
 use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
 use CodedMonkey\Dirigent\EasyAdmin\DateIntervalField;
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminAction;
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminCrud;
+use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminRoute;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -21,7 +20,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
-#[AdminCrud(routePath: '/registries', routeName: 'registries')]
+#[AdminRoute(path: '/registries', name: 'registries')]
 class DashboardRegistryController extends AbstractCrudController
 {
     public static function getEntityFqcn(): string
@@ -87,7 +86,7 @@ public function configureFields(string $pageName): iterable
             ->onlyOnForms();
     }
 
-    #[AdminAction(routePath: '/{entityId}/move-up', routeName: 'moveUp')]
+    #[AdminRoute(path: '/{entityId}/move-up', name: 'moveUp')]
     public function moveUp(AdminContext $context, RegistryRepository $registryRepository): RedirectResponse
     {
         $registry = $context->getEntity()->getInstance();
@@ -99,7 +98,7 @@ public function moveUp(AdminContext $context, RegistryRepository $registryReposi
         return $this->redirect($url);
     }
 
-    #[AdminAction(routePath: '/{entityId}/move-down', routeName: 'moveDown')]
+    #[AdminRoute(path: '/{entityId}/move-down', name: 'moveDown')]
     public function moveDown(AdminContext $context, RegistryRepository $registryRepository): RedirectResponse
     {
         $registry = $context->getEntity()->getInstance();

src/Controller/Dashboard/DashboardRegistryController.php

@@ -4,7 +4,7 @@
 
 use CodedMonkey\Dirigent\Doctrine\Entity\User;
 use CodedMonkey\Dirigent\Form\NewPasswordType;
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminCrud;
+use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminRoute;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -15,7 +15,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 
-#[AdminCrud(routePath: '/users', routeName: 'users')]
+#[AdminRoute(path: '/users', name: 'users')]
 class DashboardUserController extends AbstractCrudController
 {
     public static function getEntityFqcn(): string

src/Controller/Dashboard/DashboardUserController.php

@@ -10,7 +10,7 @@ class DateIntervalField implements FieldInterface
 {
     use FieldTrait;
 
-    public static function new(string $propertyName, ?string $label = null)
+    public static function new(string $propertyName, ?string $label = null): self
     {
         return (new self())
             ->setProperty($propertyName)

src/EasyAdmin/DateIntervalField.php

@@ -1,7 +1,7 @@
 {# template override to limit flash messages to Boostrap color types #}
 
-{# @var ea \EasyCorp\Bundle\EasyAdminBundle\Provider\AdminContextProvider #}
-{% trans_default_domain ea.hasContext ? ea.i18n.translationDomain : (translation_domain is defined ? translation_domain ?? 'messages') %}
+{# @var ea \EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext #}
+{% trans_default_domain ea.i18n.translationDomain %}
 
 {% set flash_messages = app.flashes(['primary', 'secondary', 'danger', 'info', 'success', 'warning']) %}