From 71bba33ad6cc2b812436116b543090a350d24c6d Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Mon, 11 May 2020 14:37:23 +0200 Subject: [PATCH] Add symplify/parameter-name-guard --- composer.json | 3 +- config/config.yaml | 1 + config/parameters/parameter_name_guard.yaml | 54 +++++++++++++++++++++ config/services.yaml | 53 -------------------- src/HttpKernel/RectorKernel.php | 3 +- 5 files changed, 59 insertions(+), 55 deletions(-) create mode 100644 config/parameters/parameter_name_guard.yaml diff --git a/composer.json b/composer.json index 385193da4870..c883cbebe5c4 100644 --- a/composer.json +++ b/composer.json @@ -33,9 +33,10 @@ "symfony/process": "^4.4.6|^5.0.6", "symplify/auto-bind-parameter": "^7.3.10", "symplify/autowire-array-parameter": "^7.3.10", + "symplify/console-color-diff": "^7.3.10", "symplify/package-builder": "^7.3.10", + "symplify/parameter-name-guard": "@dev", "symplify/set-config-resolver": "^7.3.10", - "symplify/console-color-diff": "^7.3.10", "tracy/tracy": "^2.7" }, "require-dev": { diff --git a/config/config.yaml b/config/config.yaml index 561b954da393..a80b3e085c5b 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -2,6 +2,7 @@ imports: - { resource: '../packages/**/config/config.yaml' } - { resource: '../rules/**/config/config.yaml' } - { resource: 'services.yaml' } + - { resource: 'parameters/parameter_name_guard.yaml' } # only in local repository # ignore errors, because utils are not part of composer package nor rector.phar - { resource: '../utils/**/config/config.yaml', ignore_errors: true } diff --git a/config/parameters/parameter_name_guard.yaml b/config/parameters/parameter_name_guard.yaml new file mode 100644 index 000000000000..4e0cd933b0b5 --- /dev/null +++ b/config/parameters/parameter_name_guard.yaml @@ -0,0 +1,54 @@ +# see https://github.com/symplify/parameter-name-guard +parameters: + correct_to_typos: + # keep "exclude_" explicit, to get typos to the correct key + exclude_paths: + - 'exclude' + - 'excluded' + - 'exclude_path' + - 'excluded_path' + - 'exclude_dir' + - 'excluded_dir' + - 'exclude_dirs' + - 'excluded_dirs' + - 'exclude_file' + - 'excluded_file' + - 'exclude_files' + - 'excluded_files' + - 'ignore_path' + - 'ignored_path' + - 'ignore_paths' + - 'ignored_paths' + - 'ignore_dir' + - 'ignored_dir' + - 'ignore_dirs' + - 'ignored_dirs' + - 'ignore_file' + - 'ignored_file' + - 'ignore_files' + - 'ignored_files' + - 'skip_path' + - 'skip_paths' + - 'skip_dir' + - 'skip_dirs' + - 'skip_file' + - 'skip_files' + exclude_rectors: + - 'exclude_rector' + - 'excluded_rector' + - 'excluded_rectors' + - 'skip_rector' + - 'skip_rectors' + autoload_paths: + # https://regex101.com/r/aXEZYk/1 + - '#(autolaod|autoload|include|bootstrap)((ed)?_(path(s)?|dir(s)?|file(s)?))?#' + auto_import_names: + - 'auto_imort_names' + - 'auto_import_name' + - 'auto_imports_names' + - 'auto_imports_name' + - 'auto_names' + - 'import_name(space)?(s)?' + paths: + - path + - source diff --git a/config/services.yaml b/config/services.yaml index d8bff01edd9c..cdb982e8ca87 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -37,57 +37,4 @@ services: Symplify\PackageBuilder\Reflection\PrivatesCaller: null Symplify\PackageBuilder\Strings\StringFormatConverter: null - # alises - Symfony\Contracts\EventDispatcher\EventDispatcherInterface: '@Rector\Core\EventDispatcher\AutowiredEventDispatcher' - OndraM\CiDetector\CiDetector: null - - # see https://github.com/symplify/packagebuilder#prevent-parameter-typos - Symplify\PackageBuilder\EventSubscriber\ParameterTypoProofreaderEventSubscriber: null - Symplify\PackageBuilder\Parameter\ParameterTypoProofreader: - $correctToTypos: - # keep "exclude_" explicit, to get typos to the correct key - exclude_paths: - - 'exclude' - - 'excluded' - - 'exclude_path' - - 'excluded_path' - - 'exclude_dir' - - 'excluded_dir' - - 'exclude_dirs' - - 'excluded_dirs' - - 'exclude_file' - - 'excluded_file' - - 'exclude_files' - - 'excluded_files' - - 'ignore_path' - - 'ignored_path' - - 'ignore_paths' - - 'ignored_paths' - - 'ignore_dir' - - 'ignored_dir' - - 'ignore_dirs' - - 'ignored_dirs' - - 'ignore_file' - - 'ignored_file' - - 'ignore_files' - - 'ignored_files' - - 'skip_path' - - 'skip_paths' - - 'skip_dir' - - 'skip_dirs' - - 'skip_file' - - 'skip_files' - exclude_rectors: - - 'exclude_rector' - - 'excluded_rector' - - 'excluded_rectors' - - 'skip_rector' - - 'skip_rectors' - autoload_paths: - # https://regex101.com/r/aXEZYk/1 - - '#(autolaod|autoload|include|bootstrap)((ed)?_(path(s)?|dir(s)?|file(s)?))?#' - auto_import_names: - - 'auto_imort_names' - - 'auto_names' - - 'import_name(space)?(s)?' diff --git a/src/HttpKernel/RectorKernel.php b/src/HttpKernel/RectorKernel.php index 7bb065e959a3..3bf317864d72 100644 --- a/src/HttpKernel/RectorKernel.php +++ b/src/HttpKernel/RectorKernel.php @@ -24,6 +24,7 @@ use Symplify\PackageBuilder\Contract\HttpKernel\ExtraConfigAwareKernelInterface; use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutoReturnFactoryCompilerPass; use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass; +use Symplify\ParameterNameGuard\ParameterNameGuardBundle; final class RectorKernel extends Kernel implements ExtraConfigAwareKernelInterface { @@ -78,7 +79,7 @@ public function setConfigs(array $configs): void */ public function registerBundles(): array { - return [new ConsoleColorDiffBundle()]; + return [new ConsoleColorDiffBundle(), new ParameterNameGuardBundle()]; } protected function build(ContainerBuilder $containerBuilder): void