Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/Controller/BaseCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Field/Configurator/EntityConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions src/Resources/config/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions src/Router/AutocompleteActionAdminUrlGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -21,7 +21,7 @@ public function __construct(
* @param class-string<CrudControllerInterface> $targetCrudControllerFqcn
*/
public function generate(
AdminContext $context,
AdminContextInterface $context,
string $targetCrudControllerFqcn,
string $propertyName,
string $originatingPage,
Expand Down
Loading