From 63f1ded0567698c933c65594daec806c373f15e3 Mon Sep 17 00:00:00 2001 From: Tobias Feijten Date: Tue, 26 May 2026 23:14:36 +0200 Subject: [PATCH 1/2] Rework calls to deprecated request->get method --- .../CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig | 4 ++-- .../CommonAdmin/ListAction/ListBuilderAction.php.twig | 1 + .../views/templates/CommonAdmin/ListAction/filters.php.twig | 4 ++-- .../views/templates/CommonAdmin/ListAction/scopes.php.twig | 3 ++- Resources/views/templates/EmptyBuilderAction.php.twig | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig index 49c0848..3e5c095 100644 --- a/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig @@ -40,8 +40,8 @@ class ActionsController extends BaseController public function batchAction(Request $request) { $this->request = $request; - $action = $request->get('action'); - $selected = $request->get('selected'); + $action = $request->request->get('action'); + $selected = $request->request->all('selected'); if (!$selected || !$action) { $this->addFlash( diff --git a/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig index f5e0bc2..b699865 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig @@ -15,6 +15,7 @@ namespace Admingenerated\{{ namespace_prefix }}{{ bundle_name }}\{{ builder.gene use {{ builder.generator.baseController }} as BaseController; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Pagerfanta\Pagerfanta; diff --git a/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig b/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig index a749394..8a680f4 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig @@ -10,8 +10,8 @@ public function filtersAction(Request $request) { $this->request = $request; - if ($this->request->get('reset')) { - $this->setFilters(array()); + if ($this->request->query->has('reset') || $this->request->request->has('reset')) { + $this->setFilters([]); // Remove scopes and re-apply default ones $this->setScopes(null); diff --git a/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig b/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig index 2023fdc..40e8838 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig @@ -2,7 +2,8 @@ public function scopesAction(Request $request) { $this->request = $request; - $this->setScope($this->request->get('group'), $this->request->get('scope')); + $routeParams = $this->request->attributes->get('_route_params'); + $this->setScope($routeParams['group'], $routeParams['scope']); return $this->redirect($this->getListUrl()); } diff --git a/Resources/views/templates/EmptyBuilderAction.php.twig b/Resources/views/templates/EmptyBuilderAction.php.twig index 4f8f29d..2b63cd1 100644 --- a/Resources/views/templates/EmptyBuilderAction.php.twig +++ b/Resources/views/templates/EmptyBuilderAction.php.twig @@ -14,7 +14,7 @@ class {{ controllerName }} extends AbstractController { public function indexAction(Request $request{% if require_pk %}, $pk{% endif %}) { - if ($request->get('stop_loop')) { + if ($request->query->has('stop_loop')) { {% if generateBaseInProjectDir|default(false) -%} throw new CantGenerateException('Make sure to run the `admin:generate-base-classes` command if you are seeing this!'); {%- else -%} From 12b4a976ce018a33e18ba7fc357dd33352986508 Mon Sep 17 00:00:00 2001 From: Tobias Feijten Date: Tue, 26 May 2026 23:21:52 +0200 Subject: [PATCH 2/2] Rework array() calls to [] syntax --- Builder/Admin/BaseBuilder.php | 22 +++++++++---------- Builder/Admin/ExcelBuilder.php | 2 +- Builder/Admin/ListBuilder.php | 2 +- Builder/BaseBuilder.php | 4 ++-- ClassLoader/AdmingeneratedClassLoader.php | 4 ++-- Command/AssetsInstallCommand.php | 4 ++-- Composer/ScriptHandler.php | 2 +- Generator/Action.php | 2 +- Generator/Action/Object/EditAction.php | 4 ++-- Generator/Action/Object/ShowAction.php | 4 ++-- Generator/DoctrineGenerator.php | 2 +- Generator/DoctrineODMGenerator.php | 2 +- Generator/PropelGenerator.php | 2 +- Guesser/DoctrineFieldGuesser.php | 14 ++++++------ Guesser/PropelORMFieldGuesser.php | 6 ++--- Maker/MakeAdmin.php | 2 +- Menu/AdmingeneratorMenuBuilder.php | 8 +++---- Menu/DefaultMenuBuilder.php | 2 +- Pagerfanta/View/AdmingeneratorView.php | 2 +- QueryFilter/DoctrineQueryFilter.php | 2 +- .../ActionsBuilderAction.php.twig | 6 ++--- .../ActionsAction/batch_action.php.twig | 6 ++--- .../ActionsAction/batch_delete.php.twig | 4 ++-- .../ActionsAction/object_action.php.twig | 12 +++++----- .../ActionsAction/object_delete.php.twig | 14 ++++++------ .../EditAction/EditBuilderAction.php.twig | 14 ++++++------ .../CommonAdmin/EditAction/index.php.twig | 4 ++-- .../CommonAdmin/EditAction/update.php.twig | 18 +++++++-------- .../CommonAdmin/EditType/type.php.twig | 2 +- .../ExcelAction/ExcelBuilderAction.php.twig | 14 ++++++------ .../CommonAdmin/FiltersType/type.php.twig | 2 +- .../ListAction/ListBuilderAction.php.twig | 2 +- .../CommonAdmin/ListAction/filters.php.twig | 6 ++--- .../CommonAdmin/ListAction/index.php.twig | 4 ++-- .../CommonAdmin/ListAction/scopes.php.twig | 8 +++---- .../NestedListBuilderAction.php.twig | 2 +- .../NestedListAction/index.php.twig | 4 ++-- .../NewAction/NewBuilderAction.php.twig | 8 +++---- .../CommonAdmin/NewAction/create.php.twig | 12 +++++----- .../CommonAdmin/NewAction/index.php.twig | 4 ++-- .../ShowAction/ShowBuilderAction.php.twig | 2 +- .../CommonAdmin/ShowAction/index.php.twig | 4 ++-- .../Doctrine/ActionsBuilderAction.php.twig | 4 ++-- .../Doctrine/ListBuilderAction.php.twig | 6 ++--- .../DoctrineODM/ActionsBuilderAction.php.twig | 4 ++-- .../DoctrineODM/ListBuilderAction.php.twig | 4 ++-- .../Propel/ActionsBuilderAction.php.twig | 2 +- Routing/NestedRoutingLoader.php | 10 ++++----- .../DependencyInjection/ConfigurationTest.php | 2 +- Tests/Mocks/Doctrine/ConnectionMock.php | 2 +- Tests/Mocks/Doctrine/EntityManagerMock.php | 2 +- Tests/TestCase.php | 4 ++-- Tests/Twig/Extension/ArrayExtensionTest.php | 4 ++-- Tests/Twig/Extension/TestObject.php | 4 ++-- Tests/autoload.php.dist | 10 ++++----- Twig/Extension/EchoExtension.php | 4 ++-- 56 files changed, 153 insertions(+), 153 deletions(-) diff --git a/Builder/Admin/BaseBuilder.php b/Builder/Admin/BaseBuilder.php index 556ef42..cbc367a 100644 --- a/Builder/Admin/BaseBuilder.php +++ b/Builder/Admin/BaseBuilder.php @@ -313,7 +313,7 @@ protected function getRowsFromFieldset(array $rows_or_fields): array public function getColumnsFor(mixed $input): array { if (!is_array($input)) { - $input = array($input); + $input = [$input]; } $it = new RecursiveIteratorIterator(new RecursiveArrayIterator($input)); @@ -541,10 +541,10 @@ public function getStylesheets(): array $parse_stylesheets = function ($params, $stylesheets) { foreach ($params as $css) { if (is_string($css)) { - $css = array( + $css = [ 'path' => $css, 'media' => 'all', - ); + ]; } $stylesheets[] = $css; @@ -555,12 +555,12 @@ public function getStylesheets(): array // From config.yml $stylesheets = $parse_stylesheets( - $this->getGenerator()->getFromBundleConfig('stylesheets', array()), array() + $this->getGenerator()->getFromBundleConfig('stylesheets', []), [] ); // From generator.yml return $parse_stylesheets( - $this->getVariable('stylesheets', array()), $stylesheets + $this->getVariable('stylesheets', []), $stylesheets ); } @@ -579,15 +579,15 @@ public function getJavascripts(): array $parse_javascripts = function ($params, $javascripts) use ($self) { foreach ($params as $js) { if (is_string($js)) { - $js = array( + $js = [ 'path' => $js, - ); + ]; } elseif (isset($js['route'])) { - $js = array( + $js = [ 'path' => $self->getGenerator() ->getRouter() ->generate($js['route'], $js['routeparams']), - ); + ]; } $javascripts[] = $js; @@ -598,12 +598,12 @@ public function getJavascripts(): array // From config.yml $javascripts = $parse_javascripts( - $this->getGenerator()->getFromBundleConfig('javascripts', array()), array() + $this->getGenerator()->getFromBundleConfig('javascripts', []), [] ); // From generator.yml return $parse_javascripts( - $this->getVariable('javascripts', array()), $javascripts + $this->getVariable('javascripts', []), $javascripts ); } diff --git a/Builder/Admin/ExcelBuilder.php b/Builder/Admin/ExcelBuilder.php index 4fd9e22..311ab0e 100644 --- a/Builder/Admin/ExcelBuilder.php +++ b/Builder/Admin/ExcelBuilder.php @@ -91,7 +91,7 @@ protected function setUserExcelColumnConfiguration(Column $column, array $option if (!count($optionsFields)) return; $options = array_key_exists($column->getName(), $optionsFields) ? - $optionsFields[$column->getName()] : array(); + $optionsFields[$column->getName()] : []; foreach ($options as $option => $value) { $column->setProperty($option, $value); diff --git a/Builder/Admin/ListBuilder.php b/Builder/Admin/ListBuilder.php index 527c3e4..00de804 100644 --- a/Builder/Admin/ListBuilder.php +++ b/Builder/Admin/ListBuilder.php @@ -199,7 +199,7 @@ protected function findBatchActions(): void public function getExcelActions(): array { if (null === $this->excelActions) { - $this->excelActions = array(); + $this->excelActions = []; $this->fillExportActions(); } diff --git a/Builder/BaseBuilder.php b/Builder/BaseBuilder.php index 7789cd0..282308a 100644 --- a/Builder/BaseBuilder.php +++ b/Builder/BaseBuilder.php @@ -80,12 +80,12 @@ protected function getTwigEnvironment(): Environment return $this->environment; } $loader = new FilesystemLoader($this->getTemplateDirs()); - $twig = new Environment($loader, array( + $twig = new Environment($loader, [ 'autoescape' => false, 'strict_variables' => true, 'debug' => true, 'cache' => $this->getGenerator()->getTempDir(), - )); + ]); $this->loadTwigExtensions($twig); $this->loadTwigFilters($twig); diff --git a/ClassLoader/AdmingeneratedClassLoader.php b/ClassLoader/AdmingeneratedClassLoader.php index 1585023..b57c810 100644 --- a/ClassLoader/AdmingeneratedClassLoader.php +++ b/ClassLoader/AdmingeneratedClassLoader.php @@ -60,11 +60,11 @@ protected function generateEmptyController(string $class): void $generator->addBuilder($builder); $builder->setOutputName($fileName.'.php'); - $builder->setVariables(array( + $builder->setVariables([ 'controllerName' => $controllerName, 'namespace' => $namespace, 'require_pk' => 'ListController' != $controllerName // We don't care about ActionsController and filters - )); + ]); $generator->writeOnDisk($this->basePath); } diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php index 6ad7d7c..53e561b 100644 --- a/Command/AssetsInstallCommand.php +++ b/Command/AssetsInstallCommand.php @@ -28,10 +28,10 @@ protected function configure(): void $this ->setDescription('Fetch bower declared dependencies and push them into web root directory') ->setHelp('The admin:assets-install command fetch bower dependencies (CSS and JS files) to the web root dir.') - ->setDefinition(array( + ->setDefinition([ new InputOption('mode', 'm', InputOption::VALUE_OPTIONAL, 'Mode to fetch dependencies', 'install'), new InputOption('bower-bin', 'b', InputOption::VALUE_REQUIRED, 'Path to the bower binary', 'bower') - )) + ]) ; } diff --git a/Composer/ScriptHandler.php b/Composer/ScriptHandler.php index 3b6d721..cc28679 100644 --- a/Composer/ScriptHandler.php +++ b/Composer/ScriptHandler.php @@ -92,7 +92,7 @@ protected static function getPhp($includeArgs = true) protected static function getPhpArguments() { - $arguments = array(); + $arguments = []; $phpFinder = new PhpExecutableFinder(); if (method_exists($phpFinder, 'findArguments')) { $arguments = $phpFinder->findArguments(); diff --git a/Generator/Action.php b/Generator/Action.php index 7e70e4a..a3ebed7 100644 --- a/Generator/Action.php +++ b/Generator/Action.php @@ -43,7 +43,7 @@ public function __construct(protected readonly string $name, protected readonly public function setProperty($option, $value): void { $option = InflectorFactory::create()->build()->classify($option); - call_user_func_array(array($this, 'set'.$option), array($value)); + call_user_func_array([$this, 'set'.$option], [$value]); } public function getName(): string diff --git a/Generator/Action/Object/EditAction.php b/Generator/Action/Object/EditAction.php index 030c124..31d68f6 100644 --- a/Generator/Action/Object/EditAction.php +++ b/Generator/Action/Object/EditAction.php @@ -21,8 +21,8 @@ public function __construct($name, BaseBuilder $builder) $this->setRoute($builder->getBaseActionsRoute().'_edit'); - $this->setParams(array( + $this->setParams([ 'pk' => '{{ '.$builder->getModelClass().'.'.$builder->getModelPrimaryKeyName().' }}', - )); + ]); } } diff --git a/Generator/Action/Object/ShowAction.php b/Generator/Action/Object/ShowAction.php index 521411e..1a90794 100644 --- a/Generator/Action/Object/ShowAction.php +++ b/Generator/Action/Object/ShowAction.php @@ -21,8 +21,8 @@ public function __construct($name, BaseBuilder $builder) $this->setRoute($builder->getBaseActionsRoute().'_show'); - $this->setParams(array( + $this->setParams([ 'pk' => '{{ '.$builder->getModelClass().'.'.$builder->getModelPrimaryKeyName().' }}', - )); + ]); } } diff --git a/Generator/DoctrineGenerator.php b/Generator/DoctrineGenerator.php index bcc54af..a5a765b 100644 --- a/Generator/DoctrineGenerator.php +++ b/Generator/DoctrineGenerator.php @@ -46,7 +46,7 @@ protected function doBuild(): void ); $generator->setBaseGeneratorName($this->getBaseGeneratorName()); - $builders = $generator->getFromYaml('builders', array()); + $builders = $generator->getFromYaml('builders', []); if (array_key_exists('list', $builders)) { $generator->addBuilder(new ListBuilderAction($this->twig)); diff --git a/Generator/DoctrineODMGenerator.php b/Generator/DoctrineODMGenerator.php index 82a2384..f3d0279 100644 --- a/Generator/DoctrineODMGenerator.php +++ b/Generator/DoctrineODMGenerator.php @@ -44,7 +44,7 @@ protected function doBuild(): void ); $generator->setBaseGeneratorName($this->getBaseGeneratorName()); - $builders = $generator->getFromYaml('builders', array()); + $builders = $generator->getFromYaml('builders', []); if (array_key_exists('list', $builders)) { $generator->addBuilder(new ListBuilderAction($this->twig)); diff --git a/Generator/PropelGenerator.php b/Generator/PropelGenerator.php index 50b389b..674e37e 100644 --- a/Generator/PropelGenerator.php +++ b/Generator/PropelGenerator.php @@ -50,7 +50,7 @@ protected function doBuild(): void $generator->setColumnClass('Admingenerator\GeneratorBundle\Generator\PropelColumn'); $generator->setBaseGeneratorName($this->getBaseGeneratorName()); - $builders = $generator->getFromYaml('builders', array()); + $builders = $generator->getFromYaml('builders', []); if (array_key_exists('list', $builders)) { $generator->addBuilder(new ListBuilderAction($this->twig)); diff --git a/Guesser/DoctrineFieldGuesser.php b/Guesser/DoctrineFieldGuesser.php index 43a94fc..780695c 100644 --- a/Guesser/DoctrineFieldGuesser.php +++ b/Guesser/DoctrineFieldGuesser.php @@ -20,7 +20,7 @@ public function __construct( private readonly bool $guessRequired, private readonly bool $defaultRequired) { - if (!in_array($objectModel = strtolower($objectModel), array('document', 'entity'))) { + if (!in_array($objectModel = strtolower($objectModel), ['document', 'entity'])) { throw new \InvalidArgumentException('$objectModel must be Document or Entity'); } @@ -214,21 +214,21 @@ protected function getOptions(string $type, string $dbType, string $model, strin if (preg_match(sprintf('/%sType$/i', ucfirst($this->objectModel)), $type)) { $mapping = $this->getMetadatas($class)->getAssociationMapping($columnName); - return array( + return [ 'multiple' => ($mapping['type'] === ORMClassMetadata::MANY_TO_MANY || $mapping['type'] === ORMClassMetadata::ONE_TO_MANY), 'em' => $this->getObjectManagerName($mapping['target'.ucfirst($this->objectModel)]), 'class' => $mapping['target'.ucfirst($this->objectModel)], 'required' => !$filter && $this->isRequired($class, $columnName), - ); + ]; } if (preg_match("/CollectionType$/i", $type)) { - $options = array( + $options = [ 'allow_add' => true, 'allow_delete' => true, 'by_reference' => false, 'entry_type' => $filter ? $this->filterTypes[$this->objectModel] : $this->formTypes[$this->objectModel], - ); + ]; if ($this->getMetadatas($class)->hasAssociation($columnName)) { $mapping = $this->getMetadatas($class)->getAssociationMapping($columnName); @@ -240,9 +240,9 @@ protected function getOptions(string $type, string $dbType, string $model, strin return $options; } - return array( + return [ 'required' => !$filter && $this->isRequired($class, $columnName) - ); + ]; } protected function isRequired(string $class, string $fieldName): bool diff --git a/Guesser/PropelORMFieldGuesser.php b/Guesser/PropelORMFieldGuesser.php index b36cfee..64108ad 100644 --- a/Guesser/PropelORMFieldGuesser.php +++ b/Guesser/PropelORMFieldGuesser.php @@ -26,7 +26,7 @@ protected function getMetadatas(string $class): mixed public function getAllFields(string $class): array { - $return = array(); + $return = []; foreach ($this->getMetadatas($class)->getColumns() as $column) { $return[] = InflectorFactory::create()->build()->tableize($column->getPhpName()); @@ -137,7 +137,7 @@ public function getSortType(string $dbType): string public function getFormType(string $dbType, string $class, string $columnName): string { - $formTypes = array(); + $formTypes = []; foreach ($this->formTypes as $key => $value) { // if config is all uppercase use it to retrieve \PropelColumnTypes @@ -165,7 +165,7 @@ public function getFormType(string $dbType, string $class, string $columnName): public function getFilterType(string $dbType, string $class, string $columnName): string { - $filterTypes = array(); + $filterTypes = []; foreach ($this->filterTypes as $key => $value) { // if config is all uppercase use it to retrieve \PropelColumnTypes diff --git a/Maker/MakeAdmin.php b/Maker/MakeAdmin.php index 94eaf36..0271411 100644 --- a/Maker/MakeAdmin.php +++ b/Maker/MakeAdmin.php @@ -155,7 +155,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen $namespaceParts = explode('\\', $namespace); $prefix = $input->getArgument('prefix'); $bundledNamespace = count($namespaceParts) > 1; - $bundleName = strtr($namespace, array('\\' => '')); + $bundleName = strtr($namespace, ['\\' => '']); $parameters = [ 'bundle' => $bundleName, 'bundleName' => $bundledNamespace ? end($namespaceParts) : $namespace, diff --git a/Menu/AdmingeneratorMenuBuilder.php b/Menu/AdmingeneratorMenuBuilder.php index bc29c58..e613fb9 100644 --- a/Menu/AdmingeneratorMenuBuilder.php +++ b/Menu/AdmingeneratorMenuBuilder.php @@ -25,7 +25,7 @@ public function __construct( */ protected function addLinkURI(ItemInterface $menu, string $label, string $uri): ItemInterface { - $item = $menu->addChild($label, array('uri' => $uri)); + $item = $menu->addChild($label, ['uri' => $uri]); $item->setExtra('translation_domain', $this->translation_domain); if ($this->isCurrentUri($item->getUri())) { @@ -40,7 +40,7 @@ protected function addLinkURI(ItemInterface $menu, string $label, string $uri): */ protected function addLinkRoute(ItemInterface $menu, string $label, string $route, array $routeParameters = []): ItemInterface { - $item = $menu->addChild($label, array('route' => $route, 'routeParameters' => $routeParameters, 'routeAbsolute' => UrlGeneratorInterface::ABSOLUTE_PATH)); + $item = $menu->addChild($label, ['route' => $route, 'routeParameters' => $routeParameters, 'routeAbsolute' => UrlGeneratorInterface::ABSOLUTE_PATH]); $item->setExtra('translation_domain', $this->translation_domain); if ($this->isCurrentUri($item->getUri())) { @@ -67,8 +67,8 @@ protected function setActive(?ItemInterface $item = null): void protected function addDropdown(ItemInterface $menu, string $label, bool $caret = true): ItemInterface { $item = $this->addLinkURI($menu, $label, '#'); - $item->setChildrenAttributes(array('class' => 'treeview-menu')); - $item->setAttributes(array('class' => 'treeview')); + $item->setChildrenAttributes(['class' => 'treeview-menu']); + $item->setAttributes(['class' => 'treeview']); $item->setExtra('caret', $caret); return $item; diff --git a/Menu/DefaultMenuBuilder.php b/Menu/DefaultMenuBuilder.php index 905966a..26a584e 100644 --- a/Menu/DefaultMenuBuilder.php +++ b/Menu/DefaultMenuBuilder.php @@ -7,7 +7,7 @@ class DefaultMenuBuilder extends AdmingeneratorMenuBuilder public function sidebarMenu(array $options): mixed { $menu = $this->factory->createItem('root'); - $menu->setChildrenAttributes(array('class' => 'sidebar-menu')); + $menu->setChildrenAttributes(['class' => 'sidebar-menu']); if ($dashboardRoute = $this->dashboardRoute) { $this diff --git a/Pagerfanta/View/AdmingeneratorView.php b/Pagerfanta/View/AdmingeneratorView.php index 4dfe402..a61af59 100644 --- a/Pagerfanta/View/AdmingeneratorView.php +++ b/Pagerfanta/View/AdmingeneratorView.php @@ -12,7 +12,7 @@ public function __construct(protected readonly TranslatorInterface $translator) { } - public function render(PagerfantaInterface $pagerfanta, callable $routeGenerator, array $options = array()): string + public function render(PagerfantaInterface $pagerfanta, callable $routeGenerator, array $options = []): string { $options = array_merge([ 'proximity' => 2, diff --git a/QueryFilter/DoctrineQueryFilter.php b/QueryFilter/DoctrineQueryFilter.php index 6c0857f..132c2ef 100644 --- a/QueryFilter/DoctrineQueryFilter.php +++ b/QueryFilter/DoctrineQueryFilter.php @@ -151,6 +151,6 @@ protected function addTablePathToField(string $field): array $parentTableAlias = $joinAlias; } - return array($parentTableAlias, $filteredField); + return [$parentTableAlias, $filteredField]; } } diff --git a/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig index 3e5c095..5ff0d25 100644 --- a/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/ActionsAction/ActionsBuilderAction.php.twig @@ -48,7 +48,7 @@ class ActionsController extends BaseController 'warning', $this->getTranslator()->trans( "action.batch.warning", - array(), + [], 'Admingenerator' ) ); @@ -129,7 +129,7 @@ class ActionsController extends BaseController */ protected function getAdditionalRenderParameters(\{{ model }} ${{ builder.ModelClass }}, $action) { - return array(); + return []; } /** @@ -156,7 +156,7 @@ class ActionsController extends BaseController if (count($exception->getErrors()) > 0) { $html = '
'; foreach ($exception->getErrors() as $error) { - $label = $this->getTranslator()->trans(ucfirst($error->getPropertyPath()), array(), $translationDomain); + $label = $this->getTranslator()->trans(ucfirst($error->getPropertyPath()), [], $translationDomain); $html .= '
'.$label.'
'.$error->getMessage().'
'; } diff --git a/Resources/views/templates/CommonAdmin/ActionsAction/batch_action.php.twig b/Resources/views/templates/CommonAdmin/ActionsAction/batch_action.php.twig index 1ea757c..16ba3b6 100644 --- a/Resources/views/templates/CommonAdmin/ActionsAction/batch_action.php.twig +++ b/Resources/views/templates/CommonAdmin/ActionsAction/batch_action.php.twig @@ -61,7 +61,7 @@ 'success', $this->getTranslator()->trans( '{{ action.options.success|default("action.custom.success") }}', - array('%name%' => '{{ action.name }}'), + ['%name%' => '{{ action.name }}'], '{{ action.options.i18n|default('Admingenerator') }}' ) ); @@ -92,7 +92,7 @@ 'error', $this->getTranslator()->trans( '{{ action.options.error|default("action.custom.error") }}', - array('%name%' => '{{ action.name }}'), + ['%name%' => '{{ action.name }}'], '{{ action.options.i18n|default('Admingenerator') }}' ) ); @@ -113,7 +113,7 @@ 'error', $this->getTranslator()->trans( 'action.batch.none', - array(), + [], 'Admingenerator' ) ); diff --git a/Resources/views/templates/CommonAdmin/ActionsAction/batch_delete.php.twig b/Resources/views/templates/CommonAdmin/ActionsAction/batch_delete.php.twig index 8e5cc90..5b07578 100644 --- a/Resources/views/templates/CommonAdmin/ActionsAction/batch_delete.php.twig +++ b/Resources/views/templates/CommonAdmin/ActionsAction/batch_delete.php.twig @@ -58,7 +58,7 @@ 'success', $this->getTranslator()->trans( '{{ action.options.success|default('action.batch.delete.success') }}', - array(), + [], '{{ action.options.i18n|default('Admingenerator') }}' ) ); @@ -89,7 +89,7 @@ 'error', $this->getTranslator()->trans( '{{ action.options.error|default('action.batch.delete.error') }}', - array(), + [], '{{ action.options.i18n|default('Admingenerator') }}' ) ); diff --git a/Resources/views/templates/CommonAdmin/ActionsAction/object_action.php.twig b/Resources/views/templates/CommonAdmin/ActionsAction/object_action.php.twig index d061421..d7bda30 100644 --- a/Resources/views/templates/CommonAdmin/ActionsAction/object_action.php.twig +++ b/Resources/views/templates/CommonAdmin/ActionsAction/object_action.php.twig @@ -39,16 +39,16 @@ return $this->render( '{{ namespace_prefix }}{{ bundle_name }}:{{ builder.BaseGeneratorName }}Actions:index.html.twig', - $this->getAdditionalRenderParameters(${{ builder.ModelClass }}, '{{ action.name }}') + array( + $this->getAdditionalRenderParameters(${{ builder.ModelClass }}, '{{ action.name }}') + [ "{{ builder.ModelClass }}" => ${{ builder.ModelClass }}, "title" => $this->getTranslator()->trans( "{{ action.options.title|default("action.custom.title") }}", - array('%name%' => '{{ action.name }}'), + ['%name%' => '{{ action.name }}'], '{{ action.options.title|default is empty ? "Admingenerator" : i18n_catalog|default("Admin") }}' ), "actionRoute" => "{{ builder.objectActionsRoute }}", - "actionParams" => array("pk" => $pk, "action" => "{{ action.name }}") - ) + "actionParams" => ["pk" => $pk, "action" => "{{ action.name }}"] + ] ); } @@ -82,7 +82,7 @@ 'success', $this->getTranslator()->trans( "{{ action.options.success|default("action.custom.success") }}", - array('%name%' => '{{ action.label }}'), + ['%name%' => '{{ action.label }}'], '{{ action.options.success is defined ? i18n_catalog|default("Admin") : 'Admingenerator' }}' ) ); @@ -112,7 +112,7 @@ $header = $this->getTranslator()->trans( "{{ action.options.error|default("action.custom.error") }}", - array('%name%' => '{{ action.label }}'), + ['%name%' => '{{ action.label }}'], '{{ action.options.error is defined ? i18n_catalog|default("Admin") : 'Admingenerator' }}' ); diff --git a/Resources/views/templates/CommonAdmin/ActionsAction/object_delete.php.twig b/Resources/views/templates/CommonAdmin/ActionsAction/object_delete.php.twig index a3f1740..3a0c51c 100644 --- a/Resources/views/templates/CommonAdmin/ActionsAction/object_delete.php.twig +++ b/Resources/views/templates/CommonAdmin/ActionsAction/object_delete.php.twig @@ -37,16 +37,16 @@ return $this->render( '@{{ namespace_prefix }}{{ bundle_name|slice(0, -6) }}/{{ builder.BaseGeneratorName }}Actions/index.html.twig', - $this->getAdditionalRenderParameters(${{ builder.ModelClass }}, '{{ action.name }}') + array( + $this->getAdditionalRenderParameters(${{ builder.ModelClass }}, '{{ action.name }}') + [ "{{ builder.ModelClass }}" => ${{ builder.ModelClass }}, "title" => $this->getTranslator()->trans( "{{ action.options.title|default('action.object.delete.confirm') }}", - array(), + [], '{{ action.options.i18n|default('Admingenerator') }}' ), "actionRoute" => "{{ builder.objectActionsRoute }}", - "actionParams" => array("pk" => $pk, "action" => "delete") - ) + "actionParams" => ["pk" => $pk, "action" => "delete"] + ] ); } @@ -79,7 +79,7 @@ 'success', $this->getTranslator()->trans( '{{ action.options.success|default('action.object.delete.success') }}', - array('%name%' => '{{ action.name }}'), + ['%name%' => '{{ action.name }}'], '{{ action.options.i18n|default('Admingenerator') }}' ) ); @@ -111,7 +111,7 @@ 'error', $this->getTranslator()->trans( "{{ action.options.error|default('action.object.delete') }}", - array(), + [], '{{ action.options.i18n|default('Admingenerator') }}' ) ); @@ -135,7 +135,7 @@ 'error', $this->getTranslator()->trans( "{{ action.options.notfound|default('action.object.delete.notfound') }}", - array(), + [], '{{ action.options.i18n|default('Admingenerator') }}' ) ); diff --git a/Resources/views/templates/CommonAdmin/EditAction/EditBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/EditAction/EditBuilderAction.php.twig index 6b92100..58a7e37 100644 --- a/Resources/views/templates/CommonAdmin/EditAction/EditBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/EditAction/EditBuilderAction.php.twig @@ -65,7 +65,7 @@ class EditController extends BaseController */ protected function getEditUrl($pk) { - return $this->generateUrl("{{ builder.baseActionsRoute }}_edit", array('pk' => $pk) ); + return $this->generateUrl("{{ builder.baseActionsRoute }}_edit", ['pk' => $pk] ); } /** @@ -75,7 +75,7 @@ class EditController extends BaseController */ protected function getShowUrl($pk) { - return $this->generateUrl("{{ builder.baseActionsRoute }}_show", array('pk' => $pk) ); + return $this->generateUrl("{{ builder.baseActionsRoute }}_show", ['pk' => $pk] ); } /** @@ -85,7 +85,7 @@ class EditController extends BaseController */ protected function getUpdateUrl($pk) { - return $this->generateUrl("{{ builder.baseActionsRoute }}_update", array('pk' => $pk) ); + return $this->generateUrl("{{ builder.baseActionsRoute }}_update", ['pk' => $pk] ); } /** @@ -96,7 +96,7 @@ class EditController extends BaseController */ protected function getAdditionalRenderParameters(\{{ model }} ${{ builder.ModelClass }}) { - return array(); + return []; } /** @@ -107,7 +107,7 @@ class EditController extends BaseController */ protected function getFormOptions(\{{ model }} ${{ builder.ModelClass }}) { - return array(); + return []; } {% block getObject -%} @@ -134,12 +134,12 @@ class EditController extends BaseController {% block getVersions %} protected function getVersions() { - return $this->getSession()->get('{{ namespace_prefix }}\{{ bundle_name }}\{{ builder.BaseGeneratorName }}Edit\Versions', array()); + return $this->getSession()->get('{{ namespace_prefix }}\{{ bundle_name }}\{{ builder.BaseGeneratorName }}Edit\Versions', []); } {% endblock %} {% block setVersions %} - protected function setVersions($versions = array()) + protected function setVersions($versions = []) { $this->getSession()->set('{{ namespace_prefix }}\{{ bundle_name }}\{{ builder.BaseGeneratorName }}Edit\Versions', $versions); } diff --git a/Resources/views/templates/CommonAdmin/EditAction/index.php.twig b/Resources/views/templates/CommonAdmin/EditAction/index.php.twig index 2a3d1e7..215839c 100644 --- a/Resources/views/templates/CommonAdmin/EditAction/index.php.twig +++ b/Resources/views/templates/CommonAdmin/EditAction/index.php.twig @@ -25,10 +25,10 @@ use {{ builder.namespacePrefixWithSubfolder }}\{{ bundle_name }}\Form\Type\{{ bu $this->preBindRequest(${{ builder.ModelClass }}); $form = $this->getEditForm(${{ builder.ModelClass }}); - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}Edit/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}Edit/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + [ "{{ builder.ModelClass }}" => ${{ builder.ModelClass }}, 'updateUrl' => $this->getUpdateUrl($pk), "form" => $form->createView() - )); + ]); } {% endblock %} diff --git a/Resources/views/templates/CommonAdmin/EditAction/update.php.twig b/Resources/views/templates/CommonAdmin/EditAction/update.php.twig index ef77f66..982775a 100644 --- a/Resources/views/templates/CommonAdmin/EditAction/update.php.twig +++ b/Resources/views/templates/CommonAdmin/EditAction/update.php.twig @@ -33,7 +33,7 @@ $this->saveObject(${{ builder.ModelClass }}); $this->postSave($form, ${{ builder.ModelClass }}); - $this->addFlash('success', $this->getTranslator()->trans("{{ messages.success|default("action.object.edit.success") }}", array(), 'Admingenerator') ); + $this->addFlash('success', $this->getTranslator()->trans("{{ messages.success|default("action.object.edit.success") }}", [], 'Admingenerator') ); {% set defaultActionAfterSave = builder.generator.bundleConfig.default_action_after_save %} $actionAfterSave = "{{ actionAfterSave|default(defaultActionAfterSave) }}"; @@ -46,7 +46,7 @@ } else { if (('edit' != $actionAfterSave) && method_exists($this,'get{{ builder.actionAfterSave|default(defaultActionAfterSave)|title }}Url')) { - return $this->redirect(call_user_func(array($this, 'get{{ builder.actionAfterSave|default(defaultActionAfterSave)|title }}Url'), $pk)); + return $this->redirect(call_user_func([$this, 'get{{ builder.actionAfterSave|default(defaultActionAfterSave)|title }}Url'], $pk)); } return $this->redirect($this->getEditUrl($pk)); @@ -57,9 +57,9 @@ 'warning', $this->getTranslator()->trans( "{{ messages.locked|default("action.object.edit.locked") }}", - array( - '%path%' => $this->generateUrl("{{ builder.baseActionsRoute }}_show", array('pk' => $pk) ) - ), + [ + '%path%' => $this->generateUrl("{{ builder.baseActionsRoute }}_show", ['pk' => $pk] ) + ], 'Admingenerator' ) ); @@ -68,19 +68,19 @@ {% endif %} } catch (\Exception $e) { $logger = $this->getLogger()->error($e->getMessage()); - $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", array(), 'Admingenerator') ); + $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", [], 'Admingenerator') ); $this->onException($e, $form, ${{ builder.ModelClass }}); } } else { - $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", array(), 'Admingenerator') ); + $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", [], 'Admingenerator') ); } - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}Edit/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}Edit/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + [ "{{ builder.ModelClass }}" => ${{ builder.ModelClass }}, 'updateUrl' => $this->getUpdateUrl($pk), "form" => $form->createView() - )); + ]); } /** diff --git a/Resources/views/templates/CommonAdmin/EditType/type.php.twig b/Resources/views/templates/CommonAdmin/EditType/type.php.twig index 33fe75d..e2d9d53 100644 --- a/Resources/views/templates/CommonAdmin/EditType/type.php.twig +++ b/Resources/views/templates/CommonAdmin/EditType/type.php.twig @@ -55,7 +55,7 @@ class {{ builder.YamlKey|ucfirst }}Type extends BaseType * @param array $builderOptions The builder options. * @return array Field options. */ - protected function getOptions{{ column.name|classify|php_name }}(array $builderOptions = array()) + protected function getOptions{{ column.name|classify|php_name }}(array $builderOptions = []) { $optionsClass = '{{ builder.namespacePrefixWithSubfolder }}\{{ bundle_name }}\Form\Type\{{ builder.BaseGeneratorName }}\Options'; $options = class_exists($optionsClass) ? new $optionsClass() : null; diff --git a/Resources/views/templates/CommonAdmin/ExcelAction/ExcelBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/ExcelAction/ExcelBuilderAction.php.twig index e566599..d77f7d5 100644 --- a/Resources/views/templates/CommonAdmin/ExcelAction/ExcelBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/ExcelAction/ExcelBuilderAction.php.twig @@ -56,12 +56,12 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll } // Create the first bold row in the Excel spreadsheet - call_user_func(array($this,"createSpreadsheetHeader$suffix"), $sheet); + call_user_func([$this,"createSpreadsheetHeader$suffix"], $sheet); // Print the data - call_user_func(array($this,"createSpreadsheetData$suffix"), $sheet, $results); + call_user_func([$this,"createSpreadsheetData$suffix"], $sheet, $results); - $fileType = call_user_func(array($this,"getSpreadsheetFileType$suffix")); - $fileName = call_user_func(array($this,"getSpreadsheetFileName$suffix"), $fileType); + $fileType = call_user_func([$this,"getSpreadsheetFileType$suffix"]); + $fileName = call_user_func([$this,"getSpreadsheetFileName$suffix"], $fileType); $mimeType = $this->getSpreadsheetMimeType($fileType); // Create the Writer, Response and add header @@ -74,7 +74,7 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll readfile($tempFile); unlink($tempFile); }, - 200, array() + 200, [] ); $response->headers->set('Content-Type', $mimeType.'; charset=utf-8'); $response->headers->set('Content-Disposition', 'attachment;filename='.$fileName); @@ -148,7 +148,7 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll if ($this->validateCredentials('{{ credentials }}')) { {% endif %} $coordinate = \PhpOffice\PhpSpreadsheet\Cell\CellAddress::fromColumnAndRow($colNum, 1); - $sheet->setCellValue($coordinate, $translator->trans("{{ column.label }}", array(), '{{ i18n_catalog|default("Admin") }}')); + $sheet->setCellValue($coordinate, $translator->trans("{{ column.label }}", [], '{{ i18n_catalog|default("Admin") }}')); $sheet->getStyle($coordinate)->getFont()->setBold(true); $sheet->getColumnDimension($coordinate->columnName())->setAutoSize(true); @@ -215,7 +215,7 @@ class ExcelController extends \{{ namespace_prefix }}\{{ bundle_name }}\Controll if ($this->validateCredentials('{{ credentials }}')) { {% endif %} $coordinate = \PhpOffice\PhpSpreadsheet\Cell\CellAddress::fromColumnAndRow($colNum, 1); - $sheet->setCellValue($coordinate, $translator->trans("{{ column.label }}", array(), '{{ i18n_catalog|default("Admin") }}'), true); + $sheet->setCellValue($coordinate, $translator->trans("{{ column.label }}", [], '{{ i18n_catalog|default("Admin") }}'), true); $sheet->getStyle($coordinate)->getFont()->setBold(true); $sheet->getColumnDimension($coordinate->columnName())->setAutoSize(true); diff --git a/Resources/views/templates/CommonAdmin/FiltersType/type.php.twig b/Resources/views/templates/CommonAdmin/FiltersType/type.php.twig index bc072dd..5db5156 100644 --- a/Resources/views/templates/CommonAdmin/FiltersType/type.php.twig +++ b/Resources/views/templates/CommonAdmin/FiltersType/type.php.twig @@ -39,7 +39,7 @@ class FiltersType extends BaseType * @param array $builderOptions The builder options. * @return array Field options. */ - protected function getOptions{{ column.name|classify|php_name }}(array $builderOptions = array()) + protected function getOptions{{ column.name|classify|php_name }}(array $builderOptions = []) { $optionsClass = '{{ namespace_prefix }}\{{ bundle_name }}\Form\Type\{{ builder.BaseGeneratorName }}\Options'; $options = class_exists($optionsClass) ? new $optionsClass() : null; diff --git a/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig index b699865..4d201d2 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/ListBuilderAction.php.twig @@ -76,7 +76,7 @@ class ListController extends BaseController */ protected function getAdditionalRenderParameters() { - return array(); + return []; } /** diff --git a/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig b/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig index 8a680f4..eef169b 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/filters.php.twig @@ -41,7 +41,7 @@ if (isset($filters)) { // Set no active scope - $this->setScopes(array()); + $this->setScopes([]); $this->setFilters($filters); } @@ -61,7 +61,7 @@ */ protected function getFilters() { - return $this->getSession()->get($this->getSessionPrefix().'List\Filters', array()); + return $this->getSession()->get($this->getSessionPrefix().'List\Filters', []); } {% endblock %} @@ -106,7 +106,7 @@ */ protected function getFiltersOptions() { - return array(); + return []; } /** diff --git a/Resources/views/templates/CommonAdmin/ListAction/index.php.twig b/Resources/views/templates/CommonAdmin/ListAction/index.php.twig index b593225..9b3c18e 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/index.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/index.php.twig @@ -18,7 +18,7 @@ use {{ builder.namespacePrefixWithSubfolder }}\{{ bundle_name }}\Form\Type\{{ bu $scopes = $this->getScopes(); $form = $this->getFilterForm(); - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}List/index.html.twig', $this->getAdditionalRenderParameters() + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}List/index.html.twig', $this->getAdditionalRenderParameters() + [ '{{ builder.ModelClass }}s' => $this->getPager(), 'listRoute' => $this->getListRoute(), 'filtersUrl' => $this->getFiltersUrl(), @@ -27,6 +27,6 @@ use {{ builder.namespacePrefixWithSubfolder }}\{{ bundle_name }}\Form\Type\{{ bu 'sortOrder' => $this->getSortOrder(), 'scopes' => $scopes, 'perPageChoices' => $this->getPerPageChoices(), - )); + ]); } {% endblock %} diff --git a/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig b/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig index 40e8838..0406525 100644 --- a/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig +++ b/Resources/views/templates/CommonAdmin/ListAction/scopes.php.twig @@ -36,7 +36,7 @@ $scopes[strtolower($groupName)] = strtolower($scopeName); $this->setScopes($scopes); - $filters = array(); + $filters = []; foreach ($scopes as $scopeGroupName => $scopeName) { $filters += $this->getScopeFilters($scopeGroupName); } @@ -59,7 +59,7 @@ protected function getDefaultScopes() { - $scopes = array(); + $scopes = []; {% if scopes is defined -%} {%- for groupName, group in scopes %} @@ -93,11 +93,11 @@ protected function getScopeFilters($groupName) { if (!$scope = $this->getScope($groupName)) { - return array(); + return []; } $groupName = strtolower($groupName); - $filters = array(); + $filters = []; {% if scopes is defined -%} {% for groupName, group in scopes -%} diff --git a/Resources/views/templates/CommonAdmin/NestedListAction/NestedListBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/NestedListAction/NestedListBuilderAction.php.twig index fa3c111..36185ed 100644 --- a/Resources/views/templates/CommonAdmin/NestedListAction/NestedListBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/NestedListAction/NestedListBuilderAction.php.twig @@ -35,7 +35,7 @@ class ListController extends BaseController **/ protected function getAdditionalRenderParameters() { - return array(); + return []; } {% block getQuery -%} diff --git a/Resources/views/templates/CommonAdmin/NestedListAction/index.php.twig b/Resources/views/templates/CommonAdmin/NestedListAction/index.php.twig index 38fab27..14404cb 100644 --- a/Resources/views/templates/CommonAdmin/NestedListAction/index.php.twig +++ b/Resources/views/templates/CommonAdmin/NestedListAction/index.php.twig @@ -9,8 +9,8 @@ use {{ builder.namespacePrefixWithSubfolder }}\{{ bundle_name }}\Form\Type\{{ bu $this->request = $request; {{ block('security_action') }} - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}List/index.html.twig', $this->getAdditionalRenderParameters() + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}List/index.html.twig', $this->getAdditionalRenderParameters() + [ '{{ builder.ModelClass }}s' => $this->getTree(), - )); + ]); } {% endblock %} diff --git a/Resources/views/templates/CommonAdmin/NewAction/NewBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/NewAction/NewBuilderAction.php.twig index 70a2842..09f26b7 100644 --- a/Resources/views/templates/CommonAdmin/NewAction/NewBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/NewAction/NewBuilderAction.php.twig @@ -59,7 +59,7 @@ class NewController extends BaseController */ protected function getEditUrl($pk) { - return $this->generateUrl("{{ builder.baseActionsRoute }}_edit", array('pk' => $pk) ); + return $this->generateUrl("{{ builder.baseActionsRoute }}_edit", ['pk' => $pk] ); } /** @@ -69,7 +69,7 @@ class NewController extends BaseController */ protected function getShowUrl($pk) { - return $this->generateUrl("{{ builder.baseActionsRoute }}_show", array('pk' => $pk) ); + return $this->generateUrl("{{ builder.baseActionsRoute }}_show", ['pk' => $pk] ); } /** @@ -80,7 +80,7 @@ class NewController extends BaseController */ protected function getAdditionalRenderParameters(\{{ model }} ${{ builder.ModelClass }}) { - return array(); + return []; } /** @@ -91,7 +91,7 @@ class NewController extends BaseController */ protected function getFormOptions(\{{ model }} ${{ builder.ModelClass }}) { - return array(); + return []; } protected function getNewForm(\{{ model }} ${{ builder.ModelClass }}) diff --git a/Resources/views/templates/CommonAdmin/NewAction/create.php.twig b/Resources/views/templates/CommonAdmin/NewAction/create.php.twig index c7b8581..e25a3c2 100644 --- a/Resources/views/templates/CommonAdmin/NewAction/create.php.twig +++ b/Resources/views/templates/CommonAdmin/NewAction/create.php.twig @@ -21,7 +21,7 @@ $this->saveObject(${{ builder.ModelClass }}); $this->postSave($form, ${{ builder.ModelClass }}); - $this->addFlash('success', $this->getTranslator()->trans("{{ messages.success|default("action.object.edit.success") }}", array(), 'Admingenerator') ); + $this->addFlash('success', $this->getTranslator()->trans("{{ messages.success|default("action.object.edit.success") }}", [], 'Admingenerator') ); {% set defaultActionAfterSave = builder.generator.bundleConfig.default_action_after_save %} $actionAfterSave = "{{ actionAfterSave|default(defaultActionAfterSave) }}"; @@ -35,26 +35,26 @@ } else { if (('edit' != $actionAfterSave) && method_exists($this,'get{{ builder.actionAfterSave|default(defaultActionAfterSave)|title }}Url')) { - return $this->redirect(call_user_func(array($this, 'get{{ builder.actionAfterSave|default(defaultActionAfterSave)|title }}Url'), $pk)); + return $this->redirect(call_user_func([$this, 'get{{ builder.actionAfterSave|default(defaultActionAfterSave)|title }}Url'], $pk)); } return $this->redirect($this->getEditUrl($pk)); } } catch (\Exception $e) { $logger = $this->getLogger()->error($e->getMessage()); - $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", array(), 'Admingenerator') ); + $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", [], 'Admingenerator') ); $this->onException($e, $form, ${{ builder.ModelClass }}); } } else { - $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", array(), 'Admingenerator') ); + $this->addFlash('error', $this->getTranslator()->trans("{{ messages.error|default("action.object.edit.error") }}", [], 'Admingenerator') ); } - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}New/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}New/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + [ '{{ builder.ModelClass }}' => ${{ builder.ModelClass }}, 'createUrl' => $this->getCreateUrl(), 'form' => $form->createView(), - )); + ]); } /** diff --git a/Resources/views/templates/CommonAdmin/NewAction/index.php.twig b/Resources/views/templates/CommonAdmin/NewAction/index.php.twig index 00e4470..5923756 100644 --- a/Resources/views/templates/CommonAdmin/NewAction/index.php.twig +++ b/Resources/views/templates/CommonAdmin/NewAction/index.php.twig @@ -15,10 +15,10 @@ use {{ builder.namespacePrefixWithSubfolder }}\{{ bundle_name }}\Form\Type\{{ bu $this->preBindRequest(${{ builder.ModelClass }}); $form = $this->getNewForm(${{ builder.ModelClass }}); - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}New/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}New/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + [ '{{ builder.ModelClass }}' => ${{ builder.ModelClass }}, 'createUrl' => $this->getCreateUrl(), 'form' => $form->createView(), - )); + ]); } {% endblock %} diff --git a/Resources/views/templates/CommonAdmin/ShowAction/ShowBuilderAction.php.twig b/Resources/views/templates/CommonAdmin/ShowAction/ShowBuilderAction.php.twig index 91679d3..5a9764a 100644 --- a/Resources/views/templates/CommonAdmin/ShowAction/ShowBuilderAction.php.twig +++ b/Resources/views/templates/CommonAdmin/ShowAction/ShowBuilderAction.php.twig @@ -25,7 +25,7 @@ class ShowController extends BaseController */ protected function getAdditionalRenderParameters(\{{ model }} ${{ builder.ModelClass }}) { - return array(); + return []; } {% block getObject -%} diff --git a/Resources/views/templates/CommonAdmin/ShowAction/index.php.twig b/Resources/views/templates/CommonAdmin/ShowAction/index.php.twig index 8d24412..f5f696b 100644 --- a/Resources/views/templates/CommonAdmin/ShowAction/index.php.twig +++ b/Resources/views/templates/CommonAdmin/ShowAction/index.php.twig @@ -16,8 +16,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; {{ block('security_action_with_object') }} - return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}Show/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + array( + return $this->render('{% if builder.bundleContext %}@{{ builder.namespacePrefixForTemplate }}{{ bundle_name|slice(0, -6) }}/{% endif %}{{ builder.BaseGeneratorName }}Show/index.html.twig', $this->getAdditionalRenderParameters(${{ builder.ModelClass }}) + [ '{{ builder.ModelClass }}' => ${{ builder.ModelClass }}, - )); + ]); } {% endblock %} diff --git a/Resources/views/templates/Doctrine/ActionsBuilderAction.php.twig b/Resources/views/templates/Doctrine/ActionsBuilderAction.php.twig index af15c32..d9fcaaa 100644 --- a/Resources/views/templates/Doctrine/ActionsBuilderAction.php.twig +++ b/Resources/views/templates/Doctrine/ActionsBuilderAction.php.twig @@ -69,7 +69,7 @@ {% if admingenerator_config('use_doctrine_orm_batch_remove') %} $em = $this->doctrine->getManagerForClass('{{ model }}'); $objects = $em->getRepository('{{ model }}') - ->findBy(array('{{ builder.getFieldGuesser().getModelPrimaryKeyName(model) }}' => $selected)); + ->findBy(['{{ builder.getFieldGuesser().getModelPrimaryKeyName(model) }}' => $selected]); foreach ($objects as $object) { $em->remove($object); } @@ -87,7 +87,7 @@ {% block saveObject %} - protected function saveObject(\{{ model }} ${{ builder.ModelClass }}, array $validationGroups = array(), $debug = true) + protected function saveObject(\{{ model }} ${{ builder.ModelClass }}, array $validationGroups = [], $debug = true) { $validator = $this->getValidator(); $errors = $validator->validate(${{ builder.ModelClass }}, $validationGroups, false, true); diff --git a/Resources/views/templates/Doctrine/ListBuilderAction.php.twig b/Resources/views/templates/Doctrine/ListBuilderAction.php.twig index 7248cea..579b737 100644 --- a/Resources/views/templates/Doctrine/ListBuilderAction.php.twig +++ b/Resources/views/templates/Doctrine/ListBuilderAction.php.twig @@ -29,7 +29,7 @@ */ protected function getFilters() { - $filters = $this->getSession()->get($this->getSessionPrefix().'List\Filters', array()); + $filters = $this->getSession()->get($this->getSessionPrefix().'List\Filters', []); {%- for filter,column in builder.filterColumns -%} {%- if 'entity' == builder.getFieldGuesser().getDbType(model, column.filterOn) or 'collection' == builder.getFieldGuesser().getDbType(model, column.filterOn) -%} @@ -96,7 +96,7 @@ $this->doctrine ->getManagerForClass(get_class($filters['{{ filter }}'])) ->getUnitOfWork() - ->registerManaged($filters['{{ filter }}'], array('{{ builder.getFieldGuesser().getModelPrimaryKeyName(filterModel) }}' => $filters['{{ filter }}']->get{{ builder.getFieldGuesser().getModelPrimaryKeyName(filterModel)|capitalize }}()), array()); + ->registerManaged($filters['{{ filter }}'], ['{{ builder.getFieldGuesser().getModelPrimaryKeyName(filterModel) }}' => $filters['{{ filter }}']->get{{ builder.getFieldGuesser().getModelPrimaryKeyName(filterModel)|capitalize }}()], []); } {%- endif %} @@ -120,7 +120,7 @@ $tables = explode('.', $table); $previousTable = 'q'; foreach (array_slice($tables, 0, -1) as $table) { - $query->leftJoin(implode('.', array($previousTable, $table)), 'sort_' . $table); + $query->leftJoin(implode('.', [$previousTable, $table]), 'sort_' . $table); $previousTable = 'sort_' . $table; } return 'sort_' . $table . '.' . end($tables); diff --git a/Resources/views/templates/DoctrineODM/ActionsBuilderAction.php.twig b/Resources/views/templates/DoctrineODM/ActionsBuilderAction.php.twig index b203028..eceb3c5 100644 --- a/Resources/views/templates/DoctrineODM/ActionsBuilderAction.php.twig +++ b/Resources/views/templates/DoctrineODM/ActionsBuilderAction.php.twig @@ -69,7 +69,7 @@ $dm = $this->getDocumentManager(); {% if admingenerator_config('use_doctrine_odm_batch_remove') %} $objects = $dm->getRepository('{{ model }}') - ->findBy(array('_id' => $selected)); + ->findBy(['_id' => $selected]); foreach ($objects as $object) { $em->remove($object); @@ -91,7 +91,7 @@ {% block saveObject %} - protected function saveObject(\{{ model }} ${{ builder.ModelClass }}, array $validationGroups = array(), $debug = true) + protected function saveObject(\{{ model }} ${{ builder.ModelClass }}, array $validationGroups = [], $debug = true) { $validator = $this->getValidator(); $errors = $validator->validate(${{ builder.ModelClass }}, $validationGroups, false, true); diff --git a/Resources/views/templates/DoctrineODM/ListBuilderAction.php.twig b/Resources/views/templates/DoctrineODM/ListBuilderAction.php.twig index a79c859..c7a43f1 100644 --- a/Resources/views/templates/DoctrineODM/ListBuilderAction.php.twig +++ b/Resources/views/templates/DoctrineODM/ListBuilderAction.php.twig @@ -32,7 +32,7 @@ use Pagerfanta\Doctrine\MongoDBODM\QueryAdapter as PagerAdapter; */ protected function getFilters() { - $filters = $this->getSession()->get($this->getSessionPrefix().'List\Filters', array()); + $filters = $this->getSession()->get($this->getSessionPrefix().'List\Filters', []); {%- for filter,column in builder.filterColumns -%} {%- if 'document' == builder.getFieldGuesser().getDbType(model, column.filterOn) or 'collection' == builder.getFieldGuesser().getDbType(model, column.filterOn) -%} @@ -88,7 +88,7 @@ use Pagerfanta\Doctrine\MongoDBODM\QueryAdapter as PagerAdapter; {%- if 'document' == builder.getFieldGuesser().getDbType(model, column.filterOn) or 'collection' == builder.getFieldGuesser().getDbType(model, column.filterOn) -%} {% set filterModel = builder.getFieldGuesser().getModelType(model, column.filterOn) %} if (isset($filters['{{ filter }}'])) { - $this->getDocumentManager()->getUnitOfWork()->registerManaged($filters['{{ filter }}'], $filters['{{ filter }}']->get{{ builder.getFieldGuesser().getModelPrimaryKeyName(filterModel)|capitalize }}(), array()); + $this->getDocumentManager()->getUnitOfWork()->registerManaged($filters['{{ filter }}'], $filters['{{ filter }}']->get{{ builder.getFieldGuesser().getModelPrimaryKeyName(filterModel)|capitalize }}(), []); } {%- endif %} {% endfor -%} diff --git a/Resources/views/templates/Propel/ActionsBuilderAction.php.twig b/Resources/views/templates/Propel/ActionsBuilderAction.php.twig index 9cecbcc..c19c1aa 100644 --- a/Resources/views/templates/Propel/ActionsBuilderAction.php.twig +++ b/Resources/views/templates/Propel/ActionsBuilderAction.php.twig @@ -55,7 +55,7 @@ {% block saveObject %} - protected function saveObject(\{{ model }} ${{ builder.ModelClass }}, array $validationGroups = array(), $debug = true) + protected function saveObject(\{{ model }} ${{ builder.ModelClass }}, array $validationGroups = [], $debug = true) { $validator = $this->getValidator(); $errors = $validator->validate(${{ builder.ModelClass }}, $validationGroups, false, true); diff --git a/Routing/NestedRoutingLoader.php b/Routing/NestedRoutingLoader.php index cbaaa0e..26aa265 100644 --- a/Routing/NestedRoutingLoader.php +++ b/Routing/NestedRoutingLoader.php @@ -8,13 +8,13 @@ class NestedRoutingLoader extends RoutingLoader { public function load(mixed $resource, ?string $type = null): RouteCollection { - $this->actions['nested_move'] = array( + $this->actions['nested_move'] = [ 'path' => '/nested-move/{dragged}/{action}/{dropped}', - 'defaults' => array(), - 'requirements' => array(), - 'methods' => array('GET'), + 'defaults' => [], + 'requirements' => [], + 'methods' => ['GET'], 'controller' => 'list', - ); + ]; return parent::load($resource, $type); } diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php index c777315..33c6b69 100755 --- a/Tests/DependencyInjection/ConfigurationTest.php +++ b/Tests/DependencyInjection/ConfigurationTest.php @@ -14,7 +14,7 @@ class ConfigurationTest extends TestCase public function testDefaultConfig(): void { $processor = new Processor(); - $config = $processor->processConfiguration(new Configuration('admingen_generator'), array()); + $config = $processor->processConfiguration(new Configuration('admingen_generator'), []); $this->assertEquals($this->getBundleDefaultConfig(), $config); } diff --git a/Tests/Mocks/Doctrine/ConnectionMock.php b/Tests/Mocks/Doctrine/ConnectionMock.php index 625eac8..26548b7 100755 --- a/Tests/Mocks/Doctrine/ConnectionMock.php +++ b/Tests/Mocks/Doctrine/ConnectionMock.php @@ -31,7 +31,7 @@ public function getDatabasePlatform(): AbstractPlatform } #[Override] - public function insert($table, array $data, array $types = array()): int + public function insert($table, array $data, array $types = []): int { $this->_inserts[$table][] = $data; return $this->_lastInsertId++; diff --git a/Tests/Mocks/Doctrine/EntityManagerMock.php b/Tests/Mocks/Doctrine/EntityManagerMock.php index b334790..cf3e690 100755 --- a/Tests/Mocks/Doctrine/EntityManagerMock.php +++ b/Tests/Mocks/Doctrine/EntityManagerMock.php @@ -50,7 +50,7 @@ public static function create(Connection $conn, ?\Doctrine\ORM\Configuration $co $config = new \Doctrine\ORM\Configuration(); $config->setProxyDir(__DIR__ . '/../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true)); + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true)); } if (is_null($eventManager)) { $eventManager = new \Doctrine\Common\EventManager(); diff --git a/Tests/TestCase.php b/Tests/TestCase.php index 5d50b80..04fbec2 100755 --- a/Tests/TestCase.php +++ b/Tests/TestCase.php @@ -10,8 +10,8 @@ class TestCase extends PHPUnitTestCase { protected function getContainer(): ContainerBuilder { - return new ContainerBuilder(new ParameterBag(array( + return new ContainerBuilder(new ParameterBag([ 'kernel.debug' => false, - ))); + ])); } } diff --git a/Tests/Twig/Extension/ArrayExtensionTest.php b/Tests/Twig/Extension/ArrayExtensionTest.php index b274ed9..11fbc4d 100755 --- a/Tests/Twig/Extension/ArrayExtensionTest.php +++ b/Tests/Twig/Extension/ArrayExtensionTest.php @@ -21,10 +21,10 @@ public function setUp(): void public function testMapByWithNumericKey(): void { - $source = array( + $source = [ ['val0FromArray1', 'val1FromArray1'], ['val0FromArray2', 'val1FromArray2'] - ); + ]; $this->assertEquals( ['val0FromArray1', 'val0FromArray2'], diff --git a/Tests/Twig/Extension/TestObject.php b/Tests/Twig/Extension/TestObject.php index 6b2283a..b550cfa 100644 --- a/Tests/Twig/Extension/TestObject.php +++ b/Tests/Twig/Extension/TestObject.php @@ -6,11 +6,11 @@ */ class TestObject { - public static array $called = array( + public static array $called = [ '__toString' => 0, 'foo' => 0, 'getFooBar' => 0, - ); + ]; public function __construct($bar = 'bar') { diff --git a/Tests/autoload.php.dist b/Tests/autoload.php.dist index 94b0b2c..36f2dcc 100755 --- a/Tests/autoload.php.dist +++ b/Tests/autoload.php.dist @@ -14,7 +14,7 @@ require_once $vendorDir.'/symfony/src/Symfony/Component/ClassLoader/UniversalCla use Symfony\Component\ClassLoader\UniversalClassLoader; $loader = new UniversalClassLoader(); -$loader->registerNamespaces(array( +$loader->registerNamespaces([ 'Symfony' => $vendorDir.'/symfony/src', 'BabDev\PagerfantaBundle' => $vendorDir, 'Pagerfanta' => $vendorDir.'/src', @@ -23,10 +23,10 @@ $loader->registerNamespaces(array( 'Doctrine\DBAL' => $vendorDir.'/../vendor/doctrine-dbal/lib', 'Doctrine\Tests' => $vendorDir.'/doctrine/tests', 'Doctrine' => $vendorDir.'/doctrine/lib', -)); -$loader->registerPrefixes(array( - 'Twig_' => array($vendorDir.'/twig/lib', $vendorDir.'/twig-extensions/lib'), -)); +]); +$loader->registerPrefixes([ + 'Twig_' => [$vendorDir.'/twig/lib', $vendorDir.'/twig-extensions/lib'], +]); $loader->register(); spl_autoload_register(function($class) { diff --git a/Twig/Extension/EchoExtension.php b/Twig/Extension/EchoExtension.php index 4ceb6c7..8866567 100644 --- a/Twig/Extension/EchoExtension.php +++ b/Twig/Extension/EchoExtension.php @@ -323,12 +323,12 @@ private function getParameterBag(string $subject): array|false */ private function getTwigAssociativeArray(array $hashmap): string { - $contents = array(); + $contents = []; foreach ($hashmap as $key => $value) { if (!str_contains($value, '{{') || !str_contains($value, '}}')) { $value = "'$value'"; } else { - $value = trim(str_replace(array('{{', '}}'), '', $value)); + $value = trim(str_replace(['{{', '}}'], '', $value)); } $contents[] = "$key: $value";