diff --git a/DependencyInjection/AdmingeneratorGeneratorExtension.php b/DependencyInjection/AdmingeneratorGeneratorExtension.php index 741b718..c525ab6 100644 --- a/DependencyInjection/AdmingeneratorGeneratorExtension.php +++ b/DependencyInjection/AdmingeneratorGeneratorExtension.php @@ -95,7 +95,7 @@ private function replaceGenerationDir(ContainerBuilder $container, string $defin { $container ->getDefinition($definition) - ->replaceArgument(0, param('admingenerator.generate_base_in_project_dir_directory')->__toString()); + ->replaceArgument('$outputDir', param('admingenerator.generate_base_in_project_dir_directory')->__toString()); } /** @@ -120,10 +120,10 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde } $container->getDefinition('admingenerator.fieldguesser.doctrine') - ->addArgument($config['form_types']['doctrine_orm']) - ->addArgument($config['filter_types']['doctrine_orm']) - ->addArgument($config['guess_required']) - ->addArgument($config['default_required']); + ->setArgument('$formTypes', $config['form_types']['doctrine_orm']) + ->setArgument('$filterTypes', $config['filter_types']['doctrine_orm']) + ->setArgument('$guessRequired', $config['guess_required']) + ->setArgument('$defaultRequired', $config['default_required']); } if ($config['use_doctrine_odm']) { @@ -136,10 +136,10 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde } $container->getDefinition('admingenerator.generator.doctrine_odm') - ->addArgument($config['form_types']['doctrine_odm']) - ->addArgument($config['filter_types']['doctrine_odm']) - ->addArgument($config['guess_required']) - ->addArgument($config['default_required']); + ->setArgument('$formTypes', $config['form_types']['doctrine_odm']) + ->setArgument('$filterTypes', $config['filter_types']['doctrine_odm']) + ->setArgument('$guessRequired', $config['guess_required']) + ->setArgument('$defaultRequired', $config['default_required']); } if ($config['use_propel']) { @@ -152,10 +152,10 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde } $container->getDefinition('admingenerator.fieldguesser.propel') - ->addArgument($config['form_types']['propel']) - ->addArgument($config['filter_types']['propel']) - ->addArgument($config['guess_required']) - ->addArgument($config['default_required']); + ->setArgument('$formTypes', $config['form_types']['propel']) + ->setArgument('$filterTypes', $config['filter_types']['propel']) + ->setArgument('$guessRequired', $config['guess_required']) + ->setArgument('$defaultRequired', $config['default_required']); } } @@ -190,10 +190,10 @@ private function processCacheConfiguration(array $config, ContainerBuilder $cont $container ->getDefinition('admingenerator.generator.listener') - ->addMethodCall('setCacheProvider', array( + ->addMethodCall('setCacheProvider', [ new Reference($config['generator_cache']), $container->getParameter('kernel.environment'), - )); + ]); if ($config['use_doctrine_orm']) { $this->addCacheProviderToGenerator($config['generator_cache'], $container->getDefinition('admingenerator.generator.doctrine'), $container); @@ -211,10 +211,10 @@ private function processCacheConfiguration(array $config, ContainerBuilder $cont private function addCacheProviderToGenerator($cacheProviderServiceName, Definition $serviceDefinition, ContainerBuilder $container): void { $serviceDefinition - ->addMethodCall('setCacheProvider', array( + ->addMethodCall('setCacheProvider', [ new Reference($cacheProviderServiceName), $container->getParameter('kernel.environment'), - )); + ]); } /** diff --git a/Resources/config/services.php b/Resources/config/services.php index 872876a..f76d236 100644 --- a/Resources/config/services.php +++ b/Resources/config/services.php @@ -56,7 +56,7 @@ $configureTwigExtension('twig.extension.admingenerator.localized_money', LocalizedMoneyExtension::class); $configureTwigExtension('twig.extension.admingenerator.extends', ExtendsAdmingeneratedExtension::class); $configureTwigExtension('twig.extension.admingenerator.security', SecurityExtension::class) - ->arg('$authorizationChecker', AuthorizationCheckerInterface::class); + ->arg('$authorizationChecker', service(AuthorizationCheckerInterface::class)); $services->set('admingenerator.generator.listener', ControllerListener::class) ->tag('kernel.event_listener', ['event' => 'kernel.request', 'method' => 'onKernelRequest'])