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
34 changes: 17 additions & 17 deletions DependencyInjection/AdmingeneratorGeneratorExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand All @@ -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']) {
Expand All @@ -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']) {
Expand All @@ -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']);
}
}

Expand Down Expand Up @@ -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);
Expand All @@ -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'),
));
]);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down