From b2d5f6503b62418569c788e41a8d121f58e49aaa Mon Sep 17 00:00:00 2001 From: cezarystepkowski Date: Fri, 17 Apr 2026 14:42:10 +0200 Subject: [PATCH] Upgrade supported EasyAdmin version to >= 4.29.3 --- composer.json | 2 +- src/Controller/BaseCrudController.php | 6 +++--- src/Field/Configurator/EntityConfigurator.php | 4 ++-- src/Resources/config/services.php | 7 ------- src/Router/AutocompleteActionAdminUrlGenerator.php | 4 ++-- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index dbb0a25..481d1ec 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "require": { "php": "~8.4.0 || ~8.5.0", "ext-dom": "*", - "easycorp/easyadmin-bundle": "~4.29.1", + "easycorp/easyadmin-bundle": "~4.29.3", "php-standard-library/php-standard-library": "^2.9.1 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "symfony/asset": "^6.4 || ^7.4", "symfony/cache": "^6.4 || ^7.4", diff --git a/src/Controller/BaseCrudController.php b/src/Controller/BaseCrudController.php index 6b6c07c..7bd1524 100644 --- a/src/Controller/BaseCrudController.php +++ b/src/Controller/BaseCrudController.php @@ -10,7 +10,7 @@ use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController; use EasyCorp\Bundle\EasyAdminBundle\Dto\ActionDto; use EasyCorp\Bundle\EasyAdminBundle\Dto\ActionGroupDto; -use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator; +use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface; use EasyCorp\Bundle\EasyAdminBundle\Twig\Component\Option\AlertVariant; use Override; use Psl\Dict; @@ -144,9 +144,9 @@ protected function translator(): TranslatorInterface return $this->container->get(TranslatorInterface::class); } - protected function adminUrlGenerator(): AdminUrlGenerator + protected function adminUrlGenerator(): AdminUrlGeneratorInterface { - return $this->container->get(AdminUrlGenerator::class); + return $this->container->get(AdminUrlGeneratorInterface::class); } /** diff --git a/src/Field/Configurator/EntityConfigurator.php b/src/Field/Configurator/EntityConfigurator.php index b82602f..9506a9d 100644 --- a/src/Field/Configurator/EntityConfigurator.php +++ b/src/Field/Configurator/EntityConfigurator.php @@ -17,7 +17,7 @@ use EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto; use EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto; use EasyCorp\Bundle\EasyAdminBundle\Factory\EntityFactory; -use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator; +use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface; use Override; use Protung\EasyAdminPlusBundle\Field\Configurator\EntityConfigurator\EntityMetadata; use Protung\EasyAdminPlusBundle\Field\EntityField; @@ -40,7 +40,7 @@ { public function __construct( private EntityFactory $entityFactory, - private AdminUrlGenerator $adminUrlGenerator, + private AdminUrlGeneratorInterface $adminUrlGenerator, private AutocompleteActionAdminUrlGenerator $autocompleteActionAdminUrlGenerator, private TranslatorInterface $translator, private Environment $twig, diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php index 52fdabd..5431207 100644 --- a/src/Resources/config/services.php +++ b/src/Resources/config/services.php @@ -7,12 +7,8 @@ use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldConfiguratorInterface; use EasyCorp\Bundle\EasyAdminBundle\Contracts\Menu\MenuItemMatcherInterface; use EasyCorp\Bundle\EasyAdminBundle\Contracts\Orm\EntityPaginatorInterface; -use EasyCorp\Bundle\EasyAdminBundle\Contracts\Provider\AdminContextProviderInterface; use EasyCorp\Bundle\EasyAdminBundle\DependencyInjection\EasyAdminExtension; use EasyCorp\Bundle\EasyAdminBundle\Menu\MenuItemMatcher; -use EasyCorp\Bundle\EasyAdminBundle\Provider\AdminContextProvider; -use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator; -use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface; use Protung\EasyAdminPlusBundle\Field\Configurator\CallbackConfigurableConfigurator; use Protung\EasyAdminPlusBundle\Field\Configurator\CallbackConfigurableConfiguratorAfterCommonPostConfigurator; use Protung\EasyAdminPlusBundle\Field\Configurator\CallbackConfigurableConfiguratorBeforeCommonPreConfigurator; @@ -32,9 +28,6 @@ ->load('Protung\\EasyAdminPlusBundle\\', '../../../src/*') ->exclude(['../../../src/Resources/**/*', '../../../src/Test/**/*']); - $services->alias(AdminContextProviderInterface::class, AdminContextProvider::class); - $services->alias(AdminUrlGeneratorInterface::class, AdminUrlGenerator::class); - $services->set(EntityConfigurator::class) ->autowire() ->autoconfigure() diff --git a/src/Router/AutocompleteActionAdminUrlGenerator.php b/src/Router/AutocompleteActionAdminUrlGenerator.php index c387305..370e39f 100644 --- a/src/Router/AutocompleteActionAdminUrlGenerator.php +++ b/src/Router/AutocompleteActionAdminUrlGenerator.php @@ -5,7 +5,7 @@ namespace Protung\EasyAdminPlusBundle\Router; use EasyCorp\Bundle\EasyAdminBundle\Config\Option\EA; -use EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext; +use EasyCorp\Bundle\EasyAdminBundle\Contracts\Context\AdminContextInterface; use EasyCorp\Bundle\EasyAdminBundle\Contracts\Controller\CrudControllerInterface; use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface; use Protung\EasyAdminPlusBundle\Field\EntityField; @@ -21,7 +21,7 @@ public function __construct( * @param class-string $targetCrudControllerFqcn */ public function generate( - AdminContext $context, + AdminContextInterface $context, string $targetCrudControllerFqcn, string $propertyName, string $originatingPage,