From 8d92c466fdd6a002ea89b5356ca99def77998bfe Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 12 Apr 2022 13:46:07 +0200 Subject: [PATCH] [DX] Use RectorConfig in configs (#2063) * use RectorConfig in configs * update variable name * remove extra spaces * apply on configs * apply on e2e * update markdown files * remove extra spaces --- build/config/config-downgrade-parallel.php | 9 +- build/config/config-downgrade.php | 8 +- build/target-repository/README.md | 23 ++- .../docs/beyond_php_file_processors.md | 52 ++--- .../target-repository/docs/create_own_rule.md | 12 +- build/target-repository/docs/how_it_works.md | 25 +-- .../docs/how_to_configure_rules.md | 18 +- .../how_to_create_custom_fileprocessor.md | 24 +-- .../docs/how_to_ignore_rule_or_paths.md | 15 +- ...how_to_register_custom_setlist_constant.md | 26 +-- ..._to_use_prefixed_service_in_custom_rule.md | 41 ---- build/target-repository/docs/init_command.md | 31 ++- .../docs/rector_rules_overview.md | 186 +++++++++--------- .../docs/static_reflection_and_autoload.md | 15 +- .../e2e/attributes/rector.php | 8 +- .../e2e/define-constant/rector.php | 6 +- .../e2e/dont-execute-code/rector.php | 8 +- .../target-repository/e2e/finalize/rector.php | 6 +- .../e2e/global-install/rector.php | 8 +- .../e2e/parse-match-class-on-php74/rector.php | 7 +- .../e2e/parse-php7-code/rector.php | 7 +- .../e2e/parse-php8-code/rector.php | 8 +- config/config.php | 16 +- config/parameters.php | 11 +- config/services-packages.php | 9 +- config/services-rules.php | 6 +- config/services.php | 6 +- ...ion-injection-to-constructor-injection.php | 6 +- config/set/code-quality.php | 7 +- config/set/coding-style.php | 7 +- config/set/dead-code.php | 7 +- config/set/defluent.php | 4 +- config/set/downgrade-php53.php | 8 +- config/set/downgrade-php54.php | 8 +- config/set/downgrade-php55.php | 8 +- config/set/downgrade-php56.php | 8 +- config/set/downgrade-php70.php | 8 +- config/set/downgrade-php71.php | 8 +- config/set/downgrade-php72.php | 8 +- config/set/downgrade-php73.php | 9 +- config/set/downgrade-php74.php | 9 +- config/set/downgrade-php80.php | 9 +- config/set/downgrade-php81.php | 8 +- config/set/early-return.php | 6 +- config/set/flysystem-20.php | 6 +- config/set/framework-extra-bundle-40.php | 6 +- config/set/framework-extra-bundle-50.php | 6 +- config/set/gmagick_to_imagick.php | 6 +- config/set/guzzle50.php | 6 +- config/set/level/down-to-php52.php | 8 +- config/set/level/down-to-php53.php | 8 +- config/set/level/down-to-php54.php | 8 +- config/set/level/down-to-php55.php | 8 +- config/set/level/down-to-php56.php | 8 +- config/set/level/down-to-php70.php | 8 +- config/set/level/down-to-php71.php | 8 +- config/set/level/down-to-php72.php | 8 +- config/set/level/down-to-php73.php | 8 +- config/set/level/down-to-php74.php | 8 +- config/set/level/down-to-php80.php | 6 +- config/set/level/up-to-php54.php | 10 +- config/set/level/up-to-php55.php | 10 +- config/set/level/up-to-php56.php | 10 +- config/set/level/up-to-php70.php | 10 +- config/set/level/up-to-php71.php | 10 +- config/set/level/up-to-php72.php | 10 +- config/set/level/up-to-php73.php | 10 +- config/set/level/up-to-php74.php | 10 +- config/set/level/up-to-php80.php | 10 +- config/set/level/up-to-php81.php | 10 +- config/set/monolog20.php | 6 +- config/set/mysql-to-mysqli.php | 7 +- config/set/naming.php | 6 +- config/set/php52.php | 6 +- config/set/php53.php | 6 +- config/set/php54.php | 6 +- config/set/php55.php | 6 +- config/set/php56.php | 6 +- config/set/php70.php | 6 +- config/set/php71.php | 6 +- config/set/php72.php | 6 +- config/set/php73.php | 6 +- config/set/php74.php | 6 +- config/set/php80.php | 7 +- config/set/php81.php | 6 +- config/set/privatization.php | 6 +- config/set/psr-4.php | 6 +- config/set/type-declaration-strict.php | 6 +- config/set/type-declaration.php | 6 +- config/set/unwrap-compat.php | 6 +- e2e/applied-rule-change-docblock/rector.php | 8 +- .../rector.php | 8 +- .../rector.php | 8 +- .../custom/config/rector.php | 8 +- e2e/parallel-reflection-resolver/rector.php | 8 +- e2e/php74-parse-static/rector.php | 8 +- e2e/plain-views/rector.php | 6 +- e2e/template-extends/rector.php | 6 +- easy-ci.php | 2 - .../config/configured_rule.php | 7 +- packages-tests/Caching/Detector/config.php | 6 +- .../Caching/ValueObject/Storage/config.php | 6 +- .../Type/SpacingAwareArrayTypeNode.php | 1 - rule-doc-generator.php | 4 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../RectorOrder/config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/pre_union_types.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule_php73.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configued_typed_property.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/php_72.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/direct_string_configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/import_config.php | 8 +- .../import_only_on_changed_files_config.php | 9 +- .../config/not_import_short_classes.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/some_config.php | 6 +- .../config/some_config.php | 6 +- .../config/some_config.php | 6 +- .../config/some_config.php | 6 +- .../config/some_config.php | 6 +- .../config/some_config.php | 6 +- .../config/some_config.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/property_promotion.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../configured_rule_skip_side_effect.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/typed_properties.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/php74.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/php_70.php | 8 +- .../config/php_70.php | 8 +- .../config/configured_rule.php | 6 +- .../config/php_70.php | 8 +- .../config/configured_rule.php | 7 +- .../config/php_70.php | 8 +- .../config/configured_rule.php | 6 +- .../config/php_70.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/php_70.php | 8 +- .../config/php_70.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../ClassConst/config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/empty_config.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/property_promotion.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- ...ize_namespace_without_namespace_config.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/import_config.php | 8 +- .../PowToExpRector/config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../CountOnNullRector/config/is_countable.php | 8 +- .../CountOnNullRector/config/php_71.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../ListEachRector/config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/auto_import.php | 8 +- .../config/auto_import_doc_block.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule_php74.php | 8 +- .../config/configured_rule_php81.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/import_names.php | 8 +- .../config/inline_public_configured_rule.php | 8 +- .../union_and_intersection_type_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule_php_version_74.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/auto_import.php | 8 +- .../config/configured_rule.php | 8 +- .../config/nested_attributes_php81.php | 8 +- .../config/auto_import_configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- ...ure_direct_shouldnot_remove_annotation.php | 6 +- .../config/configured_rule.php | 7 +- .../config/should_not_remove_annotation.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule_php_version_74.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../case_insensitive_configured_config.php | 6 +- .../config/configured_config.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/rename_everywhere.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/complex_rename.php | 8 +- .../config/configured_rule.php | 6 +- .../config/non_php_config.php | 6 +- .../config/rename_parent.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/treat_as_non_empty.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/custom_config.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/unconfigured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/unconfigured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 1 - .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/intersection_config.php | 8 +- .../config/union_config.php | 8 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/phpdoc_void.php | 6 +- .../config/configured_rule.php | 7 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/config.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule_php72.php | 8 +- .../config/configured_rule.php | 9 +- .../config/php74.php | 8 +- .../config/configured_rule.php | 8 +- .../config/php80_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/before_union_types.php | 8 +- .../config/before_union_types.php | 8 +- .../config/configured_rule.php | 6 +- .../config/typed_properties.php | 8 +- .../config/before_static_type.php | 8 +- .../config/import_names.php | 8 +- .../config/php_80.php | 8 +- .../config/php_81.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/typed_property.php | 8 +- .../config/complex_types.php | 8 +- .../config/configured_rule.php | 9 +- .../config/configured_php73.php | 8 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 8 +- .../config/rule_php73.php | 8 +- .../config/config.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- ...g_with_nested_union_type_value_objects.php | 6 +- .../config_with_nested_value_objects.php | 6 +- .../config/first_config.php | 6 +- .../config/main_config_with_only_imports.php | 8 +- .../main_config_with_override_value.php | 10 +- .../config/main_config_with_own_value.php | 10 +- tests/DependencyInjection/config/one_set.php | 6 +- .../config/one_set_with_own_rename.php | 8 +- .../config/second_config.php | 6 +- tests/DependencyInjection/config/two_sets.php | 8 +- .../config/two_sets_with_own_rename.php | 10 +- tests/Exclusion/config/some_config.php | 6 +- .../config/config-with-excluded-paths.php | 6 +- .../config/disable_follow_symlinks.php | 6 +- .../config/enable_follow_symlinks.php | 6 +- .../config/test_broken_symlinks.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../CovariantTrio/config/covariant_trio.php | 8 +- .../config/double_imported_trait_use.php | 8 +- .../DoubleRun/config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../InfiniteLoop/config/infinite_loop.php | 6 +- .../Issue6420/config/configured_rule.php | 6 +- .../Issue6480/config/configured_rule.php | 6 +- .../Issue6481/config/configured_rule.php | 6 +- .../Issue6496/config/configure_rule.php | 8 +- .../Issue6557/config/configured_rule.php | 6 +- .../Issue6561/config/configured_rule.php | 6 +- .../Issue6670/config/configured_rule.php | 6 +- .../Issue6675/config/configured_rule.php | 8 +- .../Issue6677/config/configured_rule.php | 6 +- .../Issue6708/config/configured_rule.php | 6 +- .../Issue6840/config/configured_rule.php | 6 +- .../Issue6972/config/configured_rule.php | 6 +- .../Issue7023/config/configured_rule.php | 6 +- .../Issue7023/config/configured_rule_73.php | 8 +- .../Issue7099/config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configure_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule_and.php | 6 +- .../config/configured_rule_or.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/php_tags_added_to_blade.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 8 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- tests/Php/config/invalid_input.php | 6 +- tests/Php/config/invalid_number_input.php | 6 +- tests/Php/config/invalid_php_4_number.php | 6 +- tests/Php/config/invalid_string_input.php | 6 +- tests/Php/config/valid_explicit_value.php | 6 +- tests/Php/config/valid_minus_value.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configured_rule.php | 6 +- .../config/configurable_array_has_values.php | 6 +- .../config/configurable_array_missing.php | 6 +- .../config/empty_configure.php | 6 +- tests/config/downgrade-phpstan-parser.php | 6 +- utils/compiler/config/config.php | 6 +- 757 files changed, 2570 insertions(+), 2710 deletions(-) delete mode 100644 build/target-repository/docs/how_to_use_prefixed_service_in_custom_rule.md diff --git a/build/config/config-downgrade-parallel.php b/build/config/config-downgrade-parallel.php index dac47756158..ed5a9891b26 100644 --- a/build/config/config-downgrade-parallel.php +++ b/build/config/config-downgrade-parallel.php @@ -1,12 +1,11 @@ import(__DIR__ . '/config-downgrade.php'); - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(__DIR__ . '/config-downgrade.php'); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, true); }; diff --git a/build/config/config-downgrade.php b/build/config/config-downgrade.php index 87cb4a8e330..08a0e3b2f48 100644 --- a/build/config/config-downgrade.php +++ b/build/config/config-downgrade.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\Stubs\PHPStanStubLoader; use Rector\Set\ValueObject\DowngradeLevelSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; $phpStanStubLoader = new PHPStanStubLoader(); $phpStanStubLoader->loadStubs(); @@ -15,14 +15,14 @@ require_once __DIR__ . '/../../stubs/Composer/EventDispatcher/EventSubscriberIn require_once __DIR__ . '/../../stubs/Composer/Plugin/PluginInterface.php'; require_once __DIR__ . '/../../stubs/Nette/DI/CompilerExtension.php'; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, false); $parameters->set(Option::SKIP, DowngradeRectorConfig::DEPENDENCY_EXCLUDE_PATHS); $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, __DIR__ . '/phpstan-for-downgrade.neon'); - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_72); + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_72); }; /** diff --git a/build/target-repository/README.md b/build/target-repository/README.md index b1f147a193b..2f504a23a17 100644 --- a/build/target-repository/README.md +++ b/build/target-repository/README.md @@ -76,19 +76,19 @@ vendor/bin/rector init And modify it: ```php -// rector.php use Rector\Php74\Rector\Property\TypedPropertyRector; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (RectorConfig $rectorConfig): void { // here we can define, what sets of rules will be applied // tip: use "SetList" class to autocomplete sets - $containerConfigurator->import(SetList::CODE_QUALITY); + $rectorConfig->sets([ + SetList::CODE_QUALITY + ]); // register single rule - $services = $containerConfigurator->services(); - $services->set(TypedPropertyRector::class); + $rectorConfig->rule(TypedPropertyRector::class); }; ``` @@ -116,19 +116,18 @@ vendor/bin/rector process src // rector.php use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +use Rector\Config\RectorConfig; +return static function (RectorConfig $rectorConfig): void { // paths to refactor; solid alternative to CLI arguments - $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/tests']); + $rectorConfig->paths([__DIR__ . '/src', __DIR__ . '/tests']); // is your PHP version different from the one you refactor to? [default: your PHP version], uses PHP_VERSION_ID format + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_72); // Path to PHPStan with extensions, that PHPStan in Rector uses to determine types - $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, getcwd() . '/phpstan-for-config.neon'); + $rectorConfig->phpstanConfig(__DIR__ . '/phpstan-for-config.neon'); }; ``` diff --git a/build/target-repository/docs/beyond_php_file_processors.md b/build/target-repository/docs/beyond_php_file_processors.md index 365aa0b2827..22faaaa7a1b 100644 --- a/build/target-repository/docs/beyond_php_file_processors.md +++ b/build/target-repository/docs/beyond_php_file_processors.md @@ -17,60 +17,48 @@ Let´s say you want to define a custom configuration where you want to update th All you have to do is using the ChangePackageVersionComposerRector: ```php -// rector.php - use Rector\Composer\Rector\ChangePackageVersionComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); - $services->set(ChangePackageVersionComposerRector::class) - ->configure([ - new PackageAndVersion('symfony/yaml', '^5.0'), - ]); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->ruleWithConfiguration(ChangePackageVersionComposerRector::class, [ + new PackageAndVersion('symfony/yaml', '^5.0'), + ]); }; ``` There are some more rules related to manipulate your composer.json files. Let´s see them in action: ```php -// rector.php - use Rector\Composer\Rector\AddPackageToRequireComposerRector; use Rector\Composer\Rector\AddPackageToRequireDevComposerRector; use Rector\Composer\Rector\RemovePackageComposerRector; use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; use Rector\Composer\ValueObject\ReplacePackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +use Rector\Config\RectorConfig; +return static function (RectorConfig $rectorConfig): void { // Add a package to the require section of your composer.json - $services->set(AddPackageToRequireComposerRector::class) - ->configure([ - new PackageAndVersion('symfony/yaml', '^5.0'), - ]); + $rectorConfig->ruleWithConfiguration(AddPackageToRequireComposerRector::class, [ + new PackageAndVersion('symfony/yaml', '^5.0'), + ]); // Add a package to the require dev section of your composer.json - $services->set(AddPackageToRequireDevComposerRector::class) - ->configure([ - new PackageAndVersion('phpunit/phpunit', '^9.0'), - ]); + $rectorConfig->ruleWithConfiguration(AddPackageToRequireDevComposerRector::class, [ + new PackageAndVersion('phpunit/phpunit', '^9.0'), + ]); // Remove a package from composer.json - $services->set(RemovePackageComposerRector::class) - ->configure([ - 'symfony/console' - ]); + $rectorConfig->ruleWithConfiguration(RemovePackageComposerRector::class, [ + 'symfony/console' + ]); - // Replace a package in the composer.json - $services->set(ReplacePackageAndVersionComposerRector::class) - ->configure([ - new ReplacePackageAndVersion('vendor1/package2', 'vendor2/package1', '^3.0'), - ]); + // Replace a package in the composer.json + $rectorConfig->ruleWithConfiguration(ReplacePackageAndVersionComposerRector::class, [ + new ReplacePackageAndVersion('vendor1/package2', 'vendor2/package1', '^3.0'), + ]); }; ``` diff --git a/build/target-repository/docs/create_own_rule.md b/build/target-repository/docs/create_own_rule.md index 63a7655372d..83f078c16ba 100644 --- a/build/target-repository/docs/create_own_rule.md +++ b/build/target-repository/docs/create_own_rule.md @@ -146,17 +146,11 @@ composer dump-autoload ## 2. Register It ```php -services(); - $services->set(MyFirstRector::class); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->rule(MyFirstRector::class); }; ``` diff --git a/build/target-repository/docs/how_it_works.md b/build/target-repository/docs/how_it_works.md index 22c7692b097..d709202f593 100644 --- a/build/target-repository/docs/how_it_works.md +++ b/build/target-repository/docs/how_it_works.md @@ -66,23 +66,18 @@ E.g. in this case, first the `@expectedException` annotation will be changed to then the `setExpectedException` method will be changed to `expectedException`. ```php -rule(ExceptionAnnotationRector::class); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); - $services->set(Rector\PHPUnit\Rector\ClassMethod\ExceptionAnnotationRector::class); - $services->set(Rector\Renaming\Rector\MethodCall\RenameMethodRector::class) - ->arg('$oldToNewMethodsByClass', [ - PHPUnit\Framework\TestClass::class => [ - 'setExpectedException' => 'expectedException', - 'setExpectedExceptionRegExp' => 'expectedException', - ], - ]); + $rectorConfig->ruleWithConfiguration(Rector\Renaming\Rector\MethodCall\RenameMethodRector::class, [ + new MethodCallRename('PHPUnit\Framework\TestClass', 'setExpectedException', 'expectedException'), + new MethodCallRename('PHPUnit\Framework\TestClass', 'setExpectedExceptionRegExp', 'expectedException'), + ]); }; ``` diff --git a/build/target-repository/docs/how_to_configure_rules.md b/build/target-repository/docs/how_to_configure_rules.md index d7de5fe5528..b431b97cf1a 100644 --- a/build/target-repository/docs/how_to_configure_rules.md +++ b/build/target-repository/docs/how_to_configure_rules.md @@ -5,20 +5,12 @@ Rector rules that implement `Rector\Core\Contract\Rector\ConfigurableRectorInter Typical example is `Rector\Renaming\Rector\Name\RenameClassRector`: ```php -services(); - $services->set(RenameClassRector::class) - ->configure([ - 'App\SomeOldClass' => 'App\SomeNewClass', - ]); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [ + 'App\SomeOldClass' => 'App\SomeNewClass', + ]); }; ``` diff --git a/build/target-repository/docs/how_to_create_custom_fileprocessor.md b/build/target-repository/docs/how_to_create_custom_fileprocessor.md index d7b291c0c5c..a2a698fbcd7 100644 --- a/build/target-repository/docs/how_to_create_custom_fileprocessor.md +++ b/build/target-repository/docs/how_to_create_custom_fileprocessor.md @@ -62,14 +62,12 @@ final class BoldStatementFileProcessor implements FileProcessorInterface Now register your FileProcessor in your configuration (actually in the container): ```php -services(); + $services = $rectorConfig->services(); $services->set(BoldStatementFileProcessor::class); }; ``` @@ -107,8 +105,8 @@ use Rector\Core\ValueObject\Application\File; final class BoldStatementMakeAmericaGreatAgainRector implements BoldStatementRectorInterface { /** - * @var string - */ + * @var string + */ private const OLD_STATEMENT = 'Make america great again'; public function transform(string $content): string @@ -185,18 +183,16 @@ Notice the annotation BoldStatementRectorInterface[]. This is important to injec Yes, we said active. So last but not least we must register our new rule in the container, so it is applied: ```php -services(); + $services = $rectorConfig->services(); $services->set(BoldStatementFileProcessor::class); - $services->set(BoldStatementMakeAmericaGreatAgainRector::class); + + $rectorConfig->rule(BoldStatementMakeAmericaGreatAgainRector::class); }; ``` diff --git a/build/target-repository/docs/how_to_ignore_rule_or_paths.md b/build/target-repository/docs/how_to_ignore_rule_or_paths.md index b682083f3da..fe31b2c0322 100644 --- a/build/target-repository/docs/how_to_ignore_rule_or_paths.md +++ b/build/target-repository/docs/how_to_ignore_rule_or_paths.md @@ -3,21 +3,12 @@ ## Preferred Way: Config ```php -parameters(); +use Rector\Config\RectorConfig; +return static function (RectorConfig $rectorConfig): void { // is there a file you need to skip? - $parameters->set(Option::SKIP, [ + $rectorConfig->skip([ // single file __DIR__ . '/src/ComplicatedFile.php', // or directory diff --git a/build/target-repository/docs/how_to_register_custom_setlist_constant.md b/build/target-repository/docs/how_to_register_custom_setlist_constant.md index 9c7d06562b5..fd90215fab7 100644 --- a/build/target-repository/docs/how_to_register_custom_setlist_constant.md +++ b/build/target-repository/docs/how_to_register_custom_setlist_constant.md @@ -20,37 +20,27 @@ Now, you can register your custom `SetList`'s constant via import from `$contain ```php -import(SetList::MY_FRAMEWORK_20); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->sets([SetList::MY_FRAMEWORK_20]); - $parameters = $containerConfigurator->parameters(); - $parameters->set(Option::PATHS, [__DIR__ . '/src']); + $rectorConfig->paths([__DIR__ . '/src']); }; ``` Note that if you are looking for the downgrade categories, there is already the `DowngradeSetList`: ```php -import(DowngradeSetList::PHP_70) +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->sets([DowngradeSetList::PHP_70]) - $parameters = $containerConfigurator->parameters(); - $parameters->set(Option::PATHS, [__DIR__ . '/src']); + $rectorConfig->paths([__DIR__ . '/src']); }; ``` diff --git a/build/target-repository/docs/how_to_use_prefixed_service_in_custom_rule.md b/build/target-repository/docs/how_to_use_prefixed_service_in_custom_rule.md deleted file mode 100644 index f3ffd7c8601..00000000000 --- a/build/target-repository/docs/how_to_use_prefixed_service_in_custom_rule.md +++ /dev/null @@ -1,41 +0,0 @@ -# How to Use Prefixed Service In Custom Rule - -Since `rector/rector` version 0.11, it is not possible to use service that previously not prefixed in previous version, for example, you have the following custom rector rule with `Symplify\PackageBuilder\Strings\StringFormatConverter` dependency: - -```php -use Symplify\PackageBuilder\Strings\StringFormatConverter; - -final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector -{ - public function __construct(StringFormatConverter $stringFormatter) - { - // ... - } -} -``` - -For above example, the `Symplify\PackageBuilder\Strings\StringFormatConverter` is no longer exists, you can consume via require --dev it: - -```bash -composer require --dev symplify/package-builder -``` - -After that, you need to register the `symplify/package-builder`'s src to service in `rector.php`: - -```php -services(); - $services->set(StringFormatConverter::class); - - // ... -}; -``` - -Now, the `Symplify\PackageBuilder\Strings\StringFormatConverter` service will be detected again. \ No newline at end of file diff --git a/build/target-repository/docs/init_command.md b/build/target-repository/docs/init_command.md index f0fda33ff28..23c76c543d5 100644 --- a/build/target-repository/docs/init_command.md +++ b/build/target-repository/docs/init_command.md @@ -9,19 +9,16 @@ vendor/bin/rector init This will create a `rector.php` if it doesn't already exist in your root directory with some sensitive defaults to start with. ```php -// rector.php -use Rector\Core\Configuration\Option; use Rector\Php74\Rector\Property\TypedPropertyRector; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (RectorConfig $rectorConfig): void { // here we can define, what sets of rules will be applied - $containerConfigurator->import(SetList::CODE_QUALITY); + $rectorConfig->sets([SetList::CODE_QUALITY]); // register single rule - $services = $containerConfigurator->services(); - $services->set(TypedPropertyRector::class); + $rectorConfig->rule(TypedPropertyRector::class); }; ``` @@ -36,20 +33,20 @@ The rector.php file for TYPO3 contains useful framework specific defaults to sta ```php use Ssch\TYPO3Rector\Set\Typo3SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Rector\PostRector\Rector\NameImportingPostRector; use Rector\Core\Configuration\Option; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(Typo3SetList::TYPO3_76); - $containerConfigurator->import(Typo3SetList::TYPO3_87); - $containerConfigurator->import(Typo3SetList::TYPO3_95); - $containerConfigurator->import(Typo3SetList::TYPO3_104); - $containerConfigurator->import(Typo3SetList::TYPO3_11); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->sets([ + Typo3SetList::TYPO3_76, + Typo3SetList::TYPO3_87, + Typo3SetList::TYPO3_95, + Typo3SetList::TYPO3_104, + Typo3SetList::TYPO3_11, + ]); - // get parameters - $parameters = $containerConfigurator->parameters(); - $parameters->set(Option::SKIP, [ + $rectorConfig->skip([ NameImportingPostRector::class => [ 'ClassAliasMap.php', 'ext_localconf.php', diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md index df130d26381..24804dec2db 100644 --- a/build/target-repository/docs/rector_rules_overview.md +++ b/build/target-repository/docs/rector_rules_overview.md @@ -110,7 +110,7 @@ use Rector\Arguments\Rector\ClassMethod\ArgumentAdderRector; use Rector\Arguments\ValueObject\ArgumentAdder; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ArgumentAdderRector::class) @@ -151,7 +151,7 @@ use Rector\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector; use Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(FunctionArgumentDefaultValueReplacerRector::class) @@ -181,7 +181,7 @@ use Rector\Arguments\Rector\MethodCall\RemoveMethodCallParamRector; use Rector\Arguments\ValueObject\RemoveMethodCallParam; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveMethodCallParamRector::class) @@ -217,7 +217,7 @@ use Rector\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueRector; use Rector\Arguments\ValueObject\ReplaceArgumentDefaultValue; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReplaceArgumentDefaultValueRector::class) @@ -248,7 +248,7 @@ use Rector\Arguments\Rector\FuncCall\SwapFuncCallArgumentsRector; use Rector\Arguments\ValueObject\SwapFuncCallArguments; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(SwapFuncCallArgumentsRector::class) @@ -1838,7 +1838,7 @@ Replace PREG delimiter with configured one use Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ConsistentPregDelimiterRector::class) @@ -2016,7 +2016,7 @@ Order attributes by desired names use Rector\CodingStyle\Rector\ClassMethod\OrderAttributesRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(OrderAttributesRector::class) @@ -2087,7 +2087,7 @@ use Rector\CodingStyle\Enum\PreferenceSelfThis; use Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(PreferThisOrSelfMethodCallRector::class) @@ -2163,7 +2163,7 @@ use Rector\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector; use Rector\CodingStyle\ValueObject\ReturnArrayClassMethodToYield; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReturnArrayClassMethodToYieldRector::class) @@ -2464,7 +2464,7 @@ use Rector\Composer\Rector\AddPackageToRequireComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddPackageToRequireComposerRector::class) @@ -2497,7 +2497,7 @@ use Rector\Composer\Rector\AddPackageToRequireDevComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddPackageToRequireDevComposerRector::class) @@ -2530,7 +2530,7 @@ use Rector\Composer\Rector\ChangePackageVersionComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ChangePackageVersionComposerRector::class) @@ -2563,7 +2563,7 @@ Remove package from "require" and "require-dev" in `composer.json` use Rector\Composer\Rector\RemovePackageComposerRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemovePackageComposerRector::class) @@ -2596,7 +2596,7 @@ use Rector\Composer\Rector\RenamePackageComposerRector; use Rector\Composer\ValueObject\RenamePackage; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenamePackageComposerRector::class) @@ -2630,7 +2630,7 @@ use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector; use Rector\Composer\ValueObject\ReplacePackageAndVersion; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReplacePackageAndVersionComposerRector::class) @@ -2725,7 +2725,7 @@ Remove annotation by names use Rector\DeadCode\Rector\ClassLike\RemoveAnnotationRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveAnnotationRector::class) @@ -3254,7 +3254,7 @@ Remove unneeded PHP_VERSION_ID check use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemovePhpVersionIdCheckRector::class) @@ -3457,7 +3457,7 @@ Remove unused private properties use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveUnusedPrivatePropertyRector::class) @@ -3723,7 +3723,7 @@ Add method parent call, in case new parent method is added use Rector\DependencyInjection\Rector\ClassMethod\AddMethodParentCallRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddMethodParentCallRector::class) @@ -4684,7 +4684,7 @@ Change param type to match the lowest type in whole family tree use Rector\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(DowngradeParameterTypeWideningRector::class) @@ -5272,7 +5272,7 @@ use Rector\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector; use Rector\DowngradePhp80\ValueObject\DowngradeAttributeToAnnotation; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(DowngradeAttributeToAnnotationRector::class) @@ -6787,7 +6787,7 @@ Replace string class names by ::class constant use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(StringClassNameToClassConstantRector::class) @@ -7323,7 +7323,7 @@ Changes reserved "Object" name to "Object" where can be configure use Rector\Php71\Rector\Name\ReservedObjectRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReservedObjectRector::class) @@ -7685,7 +7685,7 @@ Add "_" as thousands separator in numbers for higher or equals to limitValue con use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddLiteralSeparatorToNumberRector::class) @@ -7952,7 +7952,7 @@ Changes property type by `@var` annotations or default value. use Rector\Php74\Rector\Property\TypedPropertyRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(TypedPropertyRector::class) @@ -8019,7 +8019,7 @@ use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AnnotationToAttributeRector::class) @@ -8125,7 +8125,7 @@ Refactor Doctrine `@annotation` annotated class to a PHP 8.0 attribute class use Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(DoctrineAnnotationClassToAttributeRector::class) @@ -8958,7 +8958,7 @@ use Rector\Privatization\Rector\MethodCall\ReplaceStringWithClassConstantRector; use Rector\Privatization\ValueObject\ReplaceStringWithClassConstant; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReplaceStringWithClassConstantRector::class) @@ -8996,7 +8996,7 @@ use Rector\Removing\Rector\ClassMethod\ArgumentRemoverRector; use Rector\Removing\ValueObject\ArgumentRemover; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ArgumentRemoverRector::class) @@ -9027,7 +9027,7 @@ use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector; use Rector\Removing\ValueObject\RemoveFuncCallArg; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveFuncCallArgRector::class) @@ -9057,7 +9057,7 @@ use Rector\Removing\Rector\FuncCall\RemoveFuncCallRector; use Rector\Removing\ValueObject\RemoveFuncCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveFuncCallRector::class) @@ -9086,7 +9086,7 @@ Removes interfaces usage from class. use Rector\Removing\Rector\Class_\RemoveInterfacesRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveInterfacesRector::class) @@ -9117,7 +9117,7 @@ Remove namespace by configured namespace names use Rector\Removing\Rector\Namespace_\RemoveNamespaceRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveNamespaceRector::class) @@ -9148,7 +9148,7 @@ Removes extends class by name use Rector\Removing\Rector\Class_\RemoveParentRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveParentRector::class) @@ -9179,7 +9179,7 @@ Remove specific traits from code use Rector\Removing\Rector\Class_\RemoveTraitUseRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveTraitUseRector::class) @@ -9239,7 +9239,7 @@ use Rector\Renaming\Rector\FileWithoutNamespace\PseudoNamespaceToNamespaceRector use Rector\Renaming\ValueObject\PseudoNamespaceToNamespace; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(PseudoNamespaceToNamespaceRector::class) @@ -9272,7 +9272,7 @@ use Rector\Renaming\Rector\ClassMethod\RenameAnnotationRector; use Rector\Renaming\ValueObject\RenameAnnotationByType; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameAnnotationRector::class) @@ -9313,7 +9313,7 @@ use Rector\Renaming\ValueObject\RenameClassAndConstFetch; use Rector\Renaming\ValueObject\RenameClassConstFetch; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameClassConstFetchRector::class) @@ -9351,7 +9351,7 @@ Replaces defined classes by new ones. use Rector\Renaming\Rector\Name\RenameClassRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameClassRector::class) @@ -9394,7 +9394,7 @@ Replace constant by new ones use Rector\Renaming\Rector\ConstFetch\RenameConstantRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameConstantRector::class) @@ -9432,7 +9432,7 @@ Turns defined function call new one. use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameFunctionRector::class) @@ -9464,7 +9464,7 @@ use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\ValueObject\MethodCallRename; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameMethodRector::class) @@ -9494,7 +9494,7 @@ Replaces old namespace by new one. use Rector\Renaming\Rector\Namespace_\RenameNamespaceRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameNamespaceRector::class) @@ -9526,7 +9526,7 @@ use Rector\Renaming\Rector\PropertyFetch\RenamePropertyRector; use Rector\Renaming\ValueObject\RenameProperty; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenamePropertyRector::class) @@ -9556,7 +9556,7 @@ use Rector\Renaming\Rector\StaticCall\RenameStaticMethodRector; use Rector\Renaming\ValueObject\RenameStaticMethod; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameStaticMethodRector::class) @@ -9585,7 +9585,7 @@ Change string value use Rector\Renaming\Rector\String_\RenameStringRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RenameStringRector::class) @@ -9625,7 +9625,7 @@ use Rector\Restoration\Rector\Namespace_\CompleteImportForPartialAnnotationRecto use Rector\Restoration\ValueObject\CompleteImportForPartialAnnotation; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(CompleteImportForPartialAnnotationRector::class) @@ -9741,7 +9741,7 @@ Fixer for PHPStan reports by strict type rule - "PHPStan\Rules\BooleansInConditi use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(BooleanInBooleanNotRuleFixerRector::class) @@ -9782,7 +9782,7 @@ Fixer for PHPStan reports by strict type rule - "PHPStan\Rules\BooleansInConditi use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(BooleanInIfConditionRuleFixerRector::class) @@ -9823,7 +9823,7 @@ Fixer for PHPStan reports by strict type rule - "PHPStan\Rules\BooleansInConditi use Rector\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(BooleanInTernaryOperatorRuleFixerRector::class) @@ -9860,7 +9860,7 @@ Fixer for PHPStan reports by strict type rule - "PHPStan\Rules\DisallowedConstru use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(DisallowedEmptyRuleFixerRector::class) @@ -9897,7 +9897,7 @@ Fixer for PHPStan reports by strict type rule - "PHPStan\Rules\DisallowedConstru use Rector\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(DisallowedShortTernaryRuleFixerRector::class) @@ -9936,7 +9936,7 @@ Add the `AllowDynamicProperties` attribute to all classes use Rector\Transform\Rector\Class_\AddAllowDynamicPropertiesAttributeRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddAllowDynamicPropertiesAttributeRector::class) @@ -9969,7 +9969,7 @@ Add interface by used trait use Rector\Transform\Rector\Class_\AddInterfaceByTraitRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddInterfaceByTraitRector::class) @@ -10004,7 +10004,7 @@ use Rector\Transform\Rector\FuncCall\ArgumentFuncCallToMethodCallRector; use Rector\Transform\ValueObject\ArgumentFuncCallToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ArgumentFuncCallToMethodCallRector::class) @@ -10052,7 +10052,7 @@ use Rector\Transform\Rector\Attribute\AttributeKeyToClassConstFetchRector; use Rector\Transform\ValueObject\AttributeKeyToClassConstFetch; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AttributeKeyToClassConstFetchRector::class) @@ -10093,7 +10093,7 @@ use Rector\Transform\Rector\MethodCall\CallableInMethodCallToVariableRector; use Rector\Transform\ValueObject\CallableInMethodCallToVariable; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(CallableInMethodCallToVariableRector::class) @@ -10162,7 +10162,7 @@ use Rector\Transform\Rector\Assign\DimFetchAssignToMethodCallRector; use Rector\Transform\ValueObject\DimFetchAssignToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(DimFetchAssignToMethodCallRector::class) @@ -10208,7 +10208,7 @@ use Rector\Transform\Rector\FunctionLike\FileGetContentsAndJsonDecodeToStaticCal use Rector\Transform\ValueObject\StaticCallRecipe; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(FileGetContentsAndJsonDecodeToStaticCallRector::class) @@ -10244,7 +10244,7 @@ Changes use of function calls to use constants use Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(FuncCallToConstFetchRector::class) @@ -10282,7 +10282,7 @@ use Rector\Transform\Rector\FuncCall\FuncCallToMethodCallRector; use Rector\Transform\ValueObject\FuncCallToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(FuncCallToMethodCallRector::class) @@ -10327,7 +10327,7 @@ Change configured function calls to new Instance use Rector\Transform\Rector\FuncCall\FuncCallToNewRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(FuncCallToNewRector::class) @@ -10365,7 +10365,7 @@ use Rector\Transform\Rector\FuncCall\FuncCallToStaticCallRector; use Rector\Transform\ValueObject\FuncCallToStaticCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(FuncCallToStaticCallRector::class) @@ -10395,7 +10395,7 @@ use Rector\Transform\Rector\Assign\GetAndSetToMethodCallRector; use Rector\Transform\ValueObject\GetAndSetToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(GetAndSetToMethodCallRector::class) @@ -10425,7 +10425,7 @@ Merges old interface to a new one, that already has its methods use Rector\Transform\Rector\Class_\MergeInterfacesRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(MergeInterfacesRector::class) @@ -10459,7 +10459,7 @@ use Rector\Transform\Rector\MethodCall\MethodCallToAnotherMethodCallWithArgument use Rector\Transform\ValueObject\MethodCallToAnotherMethodCallWithArguments; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(MethodCallToAnotherMethodCallWithArgumentsRector::class) @@ -10494,7 +10494,7 @@ use Rector\Transform\Rector\MethodCall\MethodCallToMethodCallRector; use Rector\Transform\ValueObject\MethodCallToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(MethodCallToMethodCallRector::class) @@ -10535,7 +10535,7 @@ Turns method call `"$this->something()"` to property fetch "$this->something" use Rector\Transform\Rector\MethodCall\MethodCallToPropertyFetchRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(MethodCallToPropertyFetchRector::class) @@ -10573,7 +10573,7 @@ use Rector\Transform\Rector\MethodCall\MethodCallToStaticCallRector; use Rector\Transform\ValueObject\MethodCallToStaticCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(MethodCallToStaticCallRector::class) @@ -10616,7 +10616,7 @@ use Rector\Transform\Rector\New_\NewArgToMethodCallRector; use Rector\Transform\ValueObject\NewArgToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(NewArgToMethodCallRector::class) @@ -10652,7 +10652,7 @@ Change defined new type to constructor injection use Rector\Transform\Rector\New_\NewToConstructorInjectionRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(NewToConstructorInjectionRector::class) @@ -10699,7 +10699,7 @@ use Rector\Transform\Rector\New_\NewToMethodCallRector; use Rector\Transform\ValueObject\NewToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(NewToMethodCallRector::class) @@ -10739,7 +10739,7 @@ use Rector\Transform\Rector\New_\NewToStaticCallRector; use Rector\Transform\ValueObject\NewToStaticCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(NewToStaticCallRector::class) @@ -10775,7 +10775,7 @@ use Rector\Transform\Rector\Class_\ParentClassToTraitsRector; use Rector\Transform\ValueObject\ParentClassToTraits; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ParentClassToTraitsRector::class) @@ -10808,7 +10808,7 @@ use Rector\Transform\Rector\Assign\PropertyAssignToMethodCallRector; use Rector\Transform\ValueObject\PropertyAssignToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(PropertyAssignToMethodCallRector::class) @@ -10839,7 +10839,7 @@ use Rector\Transform\Rector\Assign\PropertyFetchToMethodCallRector; use Rector\Transform\ValueObject\PropertyFetchToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(PropertyFetchToMethodCallRector::class) @@ -10888,7 +10888,7 @@ Remove the `AllowDynamicProperties` attribute from all classes use Rector\Transform\Rector\Class_\RemoveAllowDynamicPropertiesAttributeRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(RemoveAllowDynamicPropertiesAttributeRector::class) @@ -10922,7 +10922,7 @@ use Rector\Transform\Rector\MethodCall\ReplaceParentCallByPropertyCallRector; use Rector\Transform\ValueObject\ReplaceParentCallByPropertyCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReplaceParentCallByPropertyCallRector::class) @@ -10957,7 +10957,7 @@ Add #[\ReturnTypeWillChange] attribute to configured instanceof class with metho use Rector\Transform\Rector\ClassMethod\ReturnTypeWillChangeRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ReturnTypeWillChangeRector::class) @@ -10994,7 +10994,7 @@ use Rector\Transform\Rector\MethodCall\ServiceGetterToConstructorInjectionRector use Rector\Transform\ValueObject\ServiceGetterToConstructorInjection; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ServiceGetterToConstructorInjectionRector::class) @@ -11063,7 +11063,7 @@ use Rector\Transform\Rector\StaticCall\StaticCallToFuncCallRector; use Rector\Transform\ValueObject\StaticCallToFuncCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(StaticCallToFuncCallRector::class) @@ -11093,7 +11093,7 @@ use Rector\Transform\Rector\StaticCall\StaticCallToMethodCallRector; use Rector\Transform\ValueObject\StaticCallToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(StaticCallToMethodCallRector::class) @@ -11149,7 +11149,7 @@ use Rector\Transform\Rector\StaticCall\StaticCallToNewRector; use Rector\Transform\ValueObject\StaticCallToNew; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(StaticCallToNewRector::class) @@ -11185,7 +11185,7 @@ use Rector\Transform\Rector\String_\StringToClassConstantRector; use Rector\Transform\ValueObject\StringToClassConstant; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(StringToClassConstantRector::class) @@ -11220,7 +11220,7 @@ Turns defined code uses of `"__toString()"` method to specific method calls. use Rector\Transform\Rector\String_\ToStringToMethodCallRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ToStringToMethodCallRector::class) @@ -11255,7 +11255,7 @@ use Rector\Transform\Rector\Isset_\UnsetAndIssetToMethodCallRector; use Rector\Transform\ValueObject\UnsetAndIssetToMethodCall; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(UnsetAndIssetToMethodCallRector::class) @@ -11288,7 +11288,7 @@ use Rector\Transform\Rector\ClassMethod\WrapReturnRector; use Rector\Transform\ValueObject\WrapReturn; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(WrapReturnRector::class) @@ -11423,7 +11423,7 @@ use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddParamTypeDeclaration; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddParamTypeDeclarationRector::class) @@ -11459,7 +11459,7 @@ use Rector\TypeDeclaration\Rector\Property\AddPropertyTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddPropertyTypeDeclaration; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddPropertyTypeDeclarationRector::class) @@ -11494,7 +11494,7 @@ use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddReturnTypeDeclaration; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddReturnTypeDeclarationRector::class) @@ -11530,7 +11530,7 @@ Add return type void to function like without any return use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(AddVoidReturnTypeWhereNoReturnRector::class) @@ -11964,7 +11964,7 @@ use Rector\Visibility\Rector\ClassConst\ChangeConstantVisibilityRector; use Rector\Visibility\ValueObject\ChangeConstantVisibility; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ChangeConstantVisibilityRector::class) @@ -12002,7 +12002,7 @@ use Rector\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector; use Rector\Visibility\ValueObject\ChangeMethodVisibility; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (\Rector\Config\RectorConfig $containerConfigurator): void { $services = $containerConfigurator->services(); $services->set(ChangeMethodVisibilityRector::class) diff --git a/build/target-repository/docs/static_reflection_and_autoload.md b/build/target-repository/docs/static_reflection_and_autoload.md index 2434f3d4405..26c22a931a0 100644 --- a/build/target-repository/docs/static_reflection_and_autoload.md +++ b/build/target-repository/docs/static_reflection_and_autoload.md @@ -10,13 +10,11 @@ Do you want to know more about it? Continue here: - [Zero Config Analysis with Static Reflection](https://phpstan.org/blog/zero-config-analysis-with-static-reflection) - from PHPStan ```php -// rector.php - use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); // Rector is using static reflection to load code without running it - see https://phpstan.org/blog/zero-config-analysis-with-static-reflection $parameters->set(Option::AUTOLOAD_PATHS, [ @@ -32,13 +30,12 @@ return static function (ContainerConfigurator $containerConfigurator): void { Do you need to include constants, class aliases or custom autoloader? Use `BOOTSTRAP_FILES` parameter: ```php -// rector.php - +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::BOOTSTRAP_FILES, [ __DIR__ . '/constants.php', diff --git a/build/target-repository/e2e/attributes/rector.php b/build/target-repository/e2e/attributes/rector.php index f2ea9e04f5d..b3f02dffe15 100644 --- a/build/target-repository/e2e/attributes/rector.php +++ b/build/target-repository/e2e/attributes/rector.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Symfony\Set\SymfonySetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SymfonySetList::SYMFONY_52); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SymfonySetList::SYMFONY_52); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80); $parameters->set(Option::SOURCE, [__DIR__ . '/src']); }; diff --git a/build/target-repository/e2e/define-constant/rector.php b/build/target-repository/e2e/define-constant/rector.php index 50cfd0ce75f..1422ef31a4b 100644 --- a/build/target-repository/e2e/define-constant/rector.php +++ b/build/target-repository/e2e/define-constant/rector.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [__DIR__ . '/src']); }; diff --git a/build/target-repository/e2e/dont-execute-code/rector.php b/build/target-repository/e2e/dont-execute-code/rector.php index bde91796b2c..80b957733ae 100644 --- a/build/target-repository/e2e/dont-execute-code/rector.php +++ b/build/target-repository/e2e/dont-execute-code/rector.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [__DIR__.'/src']); - $containerConfigurator->import(SetList::PHP_53); + $rectorConfig->import(SetList::PHP_53); }; diff --git a/build/target-repository/e2e/finalize/rector.php b/build/target-repository/e2e/finalize/rector.php index 290907417b1..fc2e8cae58a 100644 --- a/build/target-repository/e2e/finalize/rector.php +++ b/build/target-repository/e2e/finalize/rector.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FinalizeClassesWithoutChildrenRector::class); }; diff --git a/build/target-repository/e2e/global-install/rector.php b/build/target-repository/e2e/global-install/rector.php index f62e0c56e64..1e51cf196d9 100644 --- a/build/target-repository/e2e/global-install/rector.php +++ b/build/target-repository/e2e/global-install/rector.php @@ -3,13 +3,13 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [__DIR__ . '/src/']); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class); }; diff --git a/build/target-repository/e2e/parse-match-class-on-php74/rector.php b/build/target-repository/e2e/parse-match-class-on-php74/rector.php index 68b98378604..ce8d5cd747b 100644 --- a/build/target-repository/e2e/parse-match-class-on-php74/rector.php +++ b/build/target-repository/e2e/parse-match-class-on-php74/rector.php @@ -2,13 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Set\ValueObject\SetList; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [__DIR__.'/src']); - $containerConfigurator->import(SetList::DEAD_CODE); + $rectorConfig->import(SetList::DEAD_CODE); }; diff --git a/build/target-repository/e2e/parse-php7-code/rector.php b/build/target-repository/e2e/parse-php7-code/rector.php index bde91796b2c..4ed6590b494 100644 --- a/build/target-repository/e2e/parse-php7-code/rector.php +++ b/build/target-repository/e2e/parse-php7-code/rector.php @@ -2,13 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Set\ValueObject\SetList; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [__DIR__.'/src']); - $containerConfigurator->import(SetList::PHP_53); + $rectorConfig->import(SetList::PHP_53); }; diff --git a/build/target-repository/e2e/parse-php8-code/rector.php b/build/target-repository/e2e/parse-php8-code/rector.php index bde91796b2c..80b957733ae 100644 --- a/build/target-repository/e2e/parse-php8-code/rector.php +++ b/build/target-repository/e2e/parse-php8-code/rector.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [__DIR__.'/src']); - $containerConfigurator->import(SetList::PHP_53); + $rectorConfig->import(SetList::PHP_53); }; diff --git a/config/config.php b/config/config.php index 63a152a3004..73421f4654b 100644 --- a/config/config.php +++ b/config/config.php @@ -2,21 +2,21 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Bootstrap\ExtensionConfigResolver; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(__DIR__ . '/services.php'); - $containerConfigurator->import(__DIR__ . '/services-rules.php'); - $containerConfigurator->import(__DIR__ . '/services-packages.php'); - $containerConfigurator->import(__DIR__ . '/parameters.php'); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(__DIR__ . '/services.php'); + $rectorConfig->import(__DIR__ . '/services-rules.php'); + $rectorConfig->import(__DIR__ . '/services-packages.php'); + $rectorConfig->import(__DIR__ . '/parameters.php'); $extensionConfigResolver = new ExtensionConfigResolver(); $extensionConfigFiles = $extensionConfigResolver->provide(); foreach ($extensionConfigFiles as $extensionConfigFile) { - $containerConfigurator->import($extensionConfigFile->getRealPath()); + $rectorConfig->import($extensionConfigFile->getRealPath()); } // require only in dev - $containerConfigurator->import(__DIR__ . '/../utils/compiler/config/config.php', null, 'not_found'); + $rectorConfig->import(__DIR__ . '/../utils/compiler/config/config.php', null, 'not_found'); }; diff --git a/config/parameters.php b/config/parameters.php index 26c1e81fd23..a68500933f2 100644 --- a/config/parameters.php +++ b/config/parameters.php @@ -3,12 +3,13 @@ declare(strict_types=1); use OndraM\CiDetector\CiDetector; -use Rector\Caching\ValueObject\Storage\MemoryCacheStorage; -use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +use Rector\Caching\ValueObject\Storage\MemoryCacheStorage; +use Rector\Config\RectorConfig; +use Rector\Core\Configuration\Option; + +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); // paths and extensions $parameters->set(Option::PATHS, []); diff --git a/config/services-packages.php b/config/services-packages.php index c0a57ca01b8..7ce4677c38d 100644 --- a/config/services-packages.php +++ b/config/services-packages.php @@ -2,15 +2,16 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; + use Symplify\EasyParallel\ValueObject\EasyParallelConfig; use Symplify\PackageBuilder\Yaml\ParametersMerger; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (RectorConfig $rectorConfig): void { // make use of https://github.com/symplify/easy-parallel - $containerConfigurator->import(EasyParallelConfig::FILE_PATH); + $rectorConfig->import(EasyParallelConfig::FILE_PATH); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->defaults() ->public() diff --git a/config/services-rules.php b/config/services-rules.php index b656d0ddc22..78344843c95 100644 --- a/config/services-rules.php +++ b/config/services-rules.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PSR4\Composer\PSR4NamespaceMatcher; use Rector\PSR4\Contract\PSR4AutoloadNamespaceMatcherInterface; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->public() diff --git a/config/services.php b/config/services.php index 0a8b69b6349..2cfd5bf4bfd 100644 --- a/config/services.php +++ b/config/services.php @@ -28,6 +28,7 @@ use Rector\BetterPhpDocParser\PhpDocParser\BetterPhpDocParser; use Rector\BetterPhpDocParser\PhpDocParser\BetterTypeParser; use Rector\Caching\Cache; use Rector\Caching\CacheFactory; +use Rector\Config\RectorConfig; use Rector\Core\Console\ConsoleApplication; use Rector\Core\Console\Style\RectorConsoleOutputStyle; use Rector\Core\Console\Style\RectorConsoleOutputStyleFactory; @@ -36,7 +37,6 @@ use Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory; use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator; use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider; use Symfony\Component\Console\Application; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use function Symfony\Component\DependencyInjection\Loader\Configurator\service; use Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser; use Symplify\PackageBuilder\Console\Command\CommandNaming; @@ -51,8 +51,8 @@ use Symplify\SmartFileSystem\Finder\FinderSanitizer; use Symplify\SmartFileSystem\Json\JsonFileSystem; use Symplify\SmartFileSystem\SmartFileSystem; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->public() diff --git a/config/set/action-injection-to-constructor-injection.php b/config/set/action-injection-to-constructor-injection.php index 4fd4338c731..9140da821cf 100644 --- a/config/set/action-injection-to-constructor-injection.php +++ b/config/set/action-injection-to-constructor-injection.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DependencyInjection\Rector\Class_\ActionInjectionToConstructorInjectionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ActionInjectionToConstructorInjectionRector::class); }; diff --git a/config/set/code-quality.php b/config/set/code-quality.php index d0083dc86e8..49569f89153 100644 --- a/config/set/code-quality.php +++ b/config/set/code-quality.php @@ -3,6 +3,7 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Array_\ArrayThisCallToThisMethodCallRector; + use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector; use Rector\CodeQuality\Rector\Assign\CombinedAssignRector; use Rector\CodeQuality\Rector\Assign\SplitListAssignToSeparateLineRector; @@ -73,13 +74,13 @@ use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector; use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector; use Rector\CodingStyle\Rector\FuncCall\CallUserFuncToMethodCallRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; +use Rector\Config\RectorConfig; use Rector\Php52\Rector\Property\VarToPublicPropertyRector; use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CombinedAssignRector::class); $services->set(SimplifyEmptyArrayCheckRector::class); $services->set(ReplaceMultipleBooleanNotRector::class); diff --git a/config/set/coding-style.php b/config/set/coding-style.php index 95148b33afe..77d3c2e41d5 100644 --- a/config/set/coding-style.php +++ b/config/set/coding-style.php @@ -3,6 +3,7 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Assign\PHPStormVarAnnotationRector; + use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector; use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector; use Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector; @@ -28,12 +29,12 @@ use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector; use Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector; use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector; use Rector\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector; +use Rector\Config\RectorConfig; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; use Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PHPStormVarAnnotationRector::class); $services->set(NullableCompareToNullRector::class); $services->set(BinarySwitchToIfElseRector::class); diff --git a/config/set/dead-code.php b/config/set/dead-code.php index 118a1088701..e7597aee255 100644 --- a/config/set/dead-code.php +++ b/config/set/dead-code.php @@ -3,6 +3,8 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; + +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector; use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector; use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector; @@ -48,10 +50,9 @@ use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector; use Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector; use Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector; use Rector\PHPUnit\Rector\ClassMethod\RemoveEmptyTestMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnwrapFutureCompatibleIfFunctionExistsRector::class); $services->set(UnwrapFutureCompatibleIfPhpVersionRector::class); $services->set(RecastingRemovalRector::class); diff --git a/config/set/defluent.php b/config/set/defluent.php index ecc20ae596c..7b988144706 100644 --- a/config/set/defluent.php +++ b/config/set/defluent.php @@ -2,12 +2,12 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; // @see https://ocramius.github.io/blog/fluent-interfaces-are-evil/ // @see https://www.yegor256.com/2018/03/13/fluent-interfaces.html -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (RectorConfig $rectorConfig): void { $deprecatedMessage = sprintf( 'The DEFLUENT set is deprecated for high number of assumptions and reported bugs. Better use PHPStan rule "%s" to warn about these cases and refactor manually.', 'https://github.com/symplify/phpstan-rules/blob/main/docs/rules_overview.md#nochainmethodcallrule' diff --git a/config/set/downgrade-php53.php b/config/set/downgrade-php53.php index 7b58b223beb..2ebc48a3ecb 100644 --- a/config/set/downgrade-php53.php +++ b/config/set/downgrade-php53.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp53\Rector\Dir\DirConstToFileConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_52); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DirConstToFileConstRector::class); }; diff --git a/config/set/downgrade-php54.php b/config/set/downgrade-php54.php index 2859549578a..1b0b8a244d5 100644 --- a/config/set/downgrade-php54.php +++ b/config/set/downgrade-php54.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp54\Rector\Array_\ShortArrayToLongArrayRector; @@ -11,13 +12,12 @@ use Rector\DowngradePhp54\Rector\FuncCall\DowngradeIndirectCallByArrayRector; use Rector\DowngradePhp54\Rector\FunctionLike\DowngradeCallableTypeDeclarationRector; use Rector\DowngradePhp54\Rector\LNumber\DowngradeBinaryNotationRector; use Rector\DowngradePhp54\Rector\MethodCall\DowngradeInstanceMethodCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_53); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ShortArrayToLongArrayRector::class); $services->set(DowngradeStaticClosureRector::class); $services->set(DowngradeIndirectCallByArrayRector::class); diff --git a/config/set/downgrade-php55.php b/config/set/downgrade-php55.php index 0e4cb5c54ed..1bc4b522c76 100644 --- a/config/set/downgrade-php55.php +++ b/config/set/downgrade-php55.php @@ -2,19 +2,19 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp55\Rector\ClassConstFetch\DowngradeClassConstantToStringRector; use Rector\DowngradePhp55\Rector\Foreach_\DowngradeForeachListRector; use Rector\DowngradePhp55\Rector\FuncCall\DowngradeBoolvalRector; use Rector\DowngradePhp55\Rector\Isset_\DowngradeArbitraryExpressionArgsToEmptyAndIssetRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_54); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeClassConstantToStringRector::class); $services->set(DowngradeForeachListRector::class); $services->set(DowngradeBoolvalRector::class); diff --git a/config/set/downgrade-php56.php b/config/set/downgrade-php56.php index 39bd194ef64..82c6c0990b4 100644 --- a/config/set/downgrade-php56.php +++ b/config/set/downgrade-php56.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp56\Rector\CallLike\DowngradeArgumentUnpackingRector; @@ -9,13 +10,12 @@ use Rector\DowngradePhp56\Rector\FuncCall\DowngradeArrayFilterUseConstantRector; use Rector\DowngradePhp56\Rector\Pow\DowngradeExponentialAssignmentOperatorRector; use Rector\DowngradePhp56\Rector\Pow\DowngradeExponentialOperatorRector; use Rector\DowngradePhp56\Rector\Use_\DowngradeUseFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_55); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeArgumentUnpackingRector::class); $services->set(DowngradeUseFunctionRector::class); $services->set(DowngradeExponentialAssignmentOperatorRector::class); diff --git a/config/set/downgrade-php70.php b/config/set/downgrade-php70.php index b240dcf0175..c1fa2176581 100644 --- a/config/set/downgrade-php70.php +++ b/config/set/downgrade-php70.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp70\Rector\ClassMethod\DowngradeParentTypeDeclarationRector; @@ -23,13 +24,12 @@ use Rector\DowngradePhp70\Rector\New_\DowngradeAnonymousClassRector; use Rector\DowngradePhp70\Rector\Spaceship\DowngradeSpaceshipRector; use Rector\DowngradePhp70\Rector\String_\DowngradeGeneratedScalarTypesRector; use Rector\DowngradePhp70\Rector\TryCatch\DowngradeCatchThrowableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_56); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeCatchThrowableRector::class); $services->set(DowngradeInstanceofThrowableRector::class); $services->set(DowngradeScalarTypeDeclarationRector::class); diff --git a/config/set/downgrade-php71.php b/config/set/downgrade-php71.php index 0dc7aeafbab..2f80edf99e4 100644 --- a/config/set/downgrade-php71.php +++ b/config/set/downgrade-php71.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp71\Rector\Array_\SymmetricArrayDestructuringToListRector; @@ -15,13 +16,12 @@ use Rector\DowngradePhp71\Rector\List_\DowngradeKeysInListRector; use Rector\DowngradePhp71\Rector\StaticCall\DowngradeClosureFromCallableRector; use Rector\DowngradePhp71\Rector\String_\DowngradeNegativeStringOffsetToStrlenRector; use Rector\DowngradePhp71\Rector\TryCatch\DowngradePipeToMultiCatchExceptionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_70); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeNullableTypeDeclarationRector::class); $services->set(DowngradeVoidTypeDeclarationRector::class); $services->set(DowngradeClassConstantVisibilityRector::class); diff --git a/config/set/downgrade-php72.php b/config/set/downgrade-php72.php index 9b964a15208..973b89119b3 100644 --- a/config/set/downgrade-php72.php +++ b/config/set/downgrade-php72.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector; @@ -10,13 +11,12 @@ use Rector\DowngradePhp72\Rector\FuncCall\DowngradeJsonDecodeNullAssociativeArgR use Rector\DowngradePhp72\Rector\FuncCall\DowngradePregUnmatchedAsNullConstantRector; use Rector\DowngradePhp72\Rector\FuncCall\DowngradeStreamIsattyRector; use Rector\DowngradePhp72\Rector\FunctionLike\DowngradeObjectTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_71); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeObjectTypeDeclarationRector::class); $services->set(DowngradeParameterTypeWideningRector::class); $services->set(DowngradePregUnmatchedAsNullConstantRector::class); diff --git a/config/set/downgrade-php73.php b/config/set/downgrade-php73.php index fd04222acd9..d7d3e3d19bd 100644 --- a/config/set/downgrade-php73.php +++ b/config/set/downgrade-php73.php @@ -2,8 +2,8 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; - use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp73\Rector\ConstFetch\DowngradePhp73JsonConstRector; use Rector\DowngradePhp73\Rector\FuncCall\DowngradeArrayKeyFirstLastRector; @@ -12,13 +12,12 @@ use Rector\DowngradePhp73\Rector\FuncCall\DowngradeTrailingCommasInFunctionCalls use Rector\DowngradePhp73\Rector\FuncCall\SetCookieOptionsArrayToArgumentsRector; use Rector\DowngradePhp73\Rector\List_\DowngradeListReferenceAssignmentRector; use Rector\DowngradePhp73\Rector\String_\DowngradeFlexibleHeredocSyntaxRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_72); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeFlexibleHeredocSyntaxRector::class); $services->set(DowngradeListReferenceAssignmentRector::class); $services->set(DowngradeTrailingCommasInFunctionCallsRector::class); diff --git a/config/set/downgrade-php74.php b/config/set/downgrade-php74.php index 84e4ef72645..9588e11faab 100644 --- a/config/set/downgrade-php74.php +++ b/config/set/downgrade-php74.php @@ -2,8 +2,8 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; - use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp74\Rector\Array_\DowngradeArraySpreadRector; use Rector\DowngradePhp74\Rector\ArrowFunction\ArrowFunctionToAnonymousFunctionRector; @@ -17,13 +17,12 @@ use Rector\DowngradePhp74\Rector\Interface_\DowngradePreviouslyImplementedInterf use Rector\DowngradePhp74\Rector\LNumber\DowngradeNumericLiteralSeparatorRector; use Rector\DowngradePhp74\Rector\MethodCall\DowngradeReflectionGetTypeRector; use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeTypedPropertyRector::class); $services->set(ArrowFunctionToAnonymousFunctionRector::class); $services->set(DowngradeCovariantReturnTypeRector::class); diff --git a/config/set/downgrade-php80.php b/config/set/downgrade-php80.php index d0c389731e8..5101e72fc45 100644 --- a/config/set/downgrade-php80.php +++ b/config/set/downgrade-php80.php @@ -2,8 +2,8 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; - use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp80\Rector\ArrayDimFetch\DowngradeDereferenceableOperationRector; use Rector\DowngradePhp80\Rector\Catch_\DowngradeNonCapturingCatchesRector; @@ -35,13 +35,12 @@ use Rector\DowngradePhp80\Rector\Property\DowngradeUnionTypeTypedPropertyRector; use Rector\DowngradePhp80\Rector\StaticCall\DowngradePhpTokenRector; use Rector\DowngradePhp80\ValueObject\DowngradeAttributeToAnnotation; use Rector\Removing\Rector\Class_\RemoveInterfacesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveInterfacesRector::class) ->configure([ // @see https://wiki.php.net/rfc/stringable diff --git a/config/set/downgrade-php81.php b/config/set/downgrade-php81.php index 2b472bcd047..da2205a39ca 100644 --- a/config/set/downgrade-php81.php +++ b/config/set/downgrade-php81.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp81\Rector\Array_\DowngradeArraySpreadStringKeyRector; @@ -13,13 +14,12 @@ use Rector\DowngradePhp81\Rector\FunctionLike\DowngradeNewInInitializerRector; use Rector\DowngradePhp81\Rector\FunctionLike\DowngradePureIntersectionTypeRector; use Rector\DowngradePhp81\Rector\Instanceof_\DowngradePhp81ResourceReturnToObjectRector; use Rector\DowngradePhp81\Rector\Property\DowngradeReadonlyPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeFinalizePublicClassConstantRector::class); $services->set(DowngradeFirstClassCallableSyntaxRector::class); $services->set(DowngradeNeverTypeDeclarationRector::class); diff --git a/config/set/early-return.php b/config/set/early-return.php index 70be964cbe5..190c833c442 100644 --- a/config/set/early-return.php +++ b/config/set/early-return.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; use Rector\EarlyReturn\Rector\Foreach_\ReturnAfterToEarlyOnBreakRector; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; @@ -13,10 +14,9 @@ use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector; use Rector\EarlyReturn\Rector\Return_\ReturnBinaryAndToEarlyReturnRector; use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeNestedForeachIfsToEarlyContinueRector::class); $services->set(ChangeAndIfToEarlyReturnRector::class); $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class); diff --git a/config/set/flysystem-20.php b/config/set/flysystem-20.php index 968636e73ae..ecf9525b66e 100644 --- a/config/set/flysystem-20.php +++ b/config/set/flysystem-20.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\ValueObject\MethodCallRename; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameMethodRector::class) ->configure([ // Rename is now move, specific for files. diff --git a/config/set/framework-extra-bundle-40.php b/config/set/framework-extra-bundle-40.php index 370ad991e02..0af92f2d47c 100644 --- a/config/set/framework-extra-bundle-40.php +++ b/config/set/framework-extra-bundle-40.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Symfony\Rector\ClassMethod\RemoveServiceFromSensioRouteRector; use Rector\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceSensioRouteAnnotationWithSymfonyRector::class); $services->set(RemoveServiceFromSensioRouteRector::class); diff --git a/config/set/framework-extra-bundle-50.php b/config/set/framework-extra-bundle-50.php index c1e4fb90e73..671c204bfe7 100644 --- a/config/set/framework-extra-bundle-50.php +++ b/config/set/framework-extra-bundle-50.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Symfony\Rector\ClassMethod\TemplateAnnotationToThisRenderRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TemplateAnnotationToThisRenderRector::class); }; diff --git a/config/set/gmagick_to_imagick.php b/config/set/gmagick_to_imagick.php index 50151de3d5e..c9538acf655 100644 --- a/config/set/gmagick_to_imagick.php +++ b/config/set/gmagick_to_imagick.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Renaming\ValueObject\MethodCallRename; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; # https://www.php.net/manual/en/book.gmagick.php → https://www.php.net/manual/en/book.imagick.php -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'Gmagick' => 'Imagick', diff --git a/config/set/guzzle50.php b/config/set/guzzle50.php index a24e1f62136..34fc28c7579 100644 --- a/config/set/guzzle50.php +++ b/config/set/guzzle50.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\ValueObject\MethodCallRename; use Rector\Transform\Rector\FuncCall\FuncCallToMethodCallRector; use Rector\Transform\Rector\StaticCall\StaticCallToFuncCallRector; use Rector\Transform\ValueObject\FuncCallToMethodCall; use Rector\Transform\ValueObject\StaticCallToFuncCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $configuration = [ new FuncCallToMethodCall('GuzzleHttp\json_decode', 'GuzzleHttp\Utils', 'jsonDecode'), diff --git a/config/set/level/down-to-php52.php b/config/set/level/down-to-php52.php index 3c4865426a7..7e0b2f8ccd3 100644 --- a/config/set/level/down-to-php52.php +++ b/config/set/level/down-to-php52.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_53); - $containerConfigurator->import(DowngradeSetList::PHP_53); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_53); + $rectorConfig->import(DowngradeSetList::PHP_53); }; diff --git a/config/set/level/down-to-php53.php b/config/set/level/down-to-php53.php index f255db845f5..a6d9ba74f24 100644 --- a/config/set/level/down-to-php53.php +++ b/config/set/level/down-to-php53.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_54); - $containerConfigurator->import(DowngradeSetList::PHP_54); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_54); + $rectorConfig->import(DowngradeSetList::PHP_54); }; diff --git a/config/set/level/down-to-php54.php b/config/set/level/down-to-php54.php index 10894e23d6d..2337b8aa5b1 100644 --- a/config/set/level/down-to-php54.php +++ b/config/set/level/down-to-php54.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_55); - $containerConfigurator->import(DowngradeSetList::PHP_55); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_55); + $rectorConfig->import(DowngradeSetList::PHP_55); }; diff --git a/config/set/level/down-to-php55.php b/config/set/level/down-to-php55.php index 22b82063353..26cd3f7c0a0 100644 --- a/config/set/level/down-to-php55.php +++ b/config/set/level/down-to-php55.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_56); - $containerConfigurator->import(DowngradeSetList::PHP_56); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_56); + $rectorConfig->import(DowngradeSetList::PHP_56); }; diff --git a/config/set/level/down-to-php56.php b/config/set/level/down-to-php56.php index 8223f107ef0..602fbed0d6c 100644 --- a/config/set/level/down-to-php56.php +++ b/config/set/level/down-to-php56.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_70); - $containerConfigurator->import(DowngradeSetList::PHP_70); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_70); + $rectorConfig->import(DowngradeSetList::PHP_70); }; diff --git a/config/set/level/down-to-php70.php b/config/set/level/down-to-php70.php index 92e1f08a665..d4762a17877 100644 --- a/config/set/level/down-to-php70.php +++ b/config/set/level/down-to-php70.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_71); - $containerConfigurator->import(DowngradeSetList::PHP_71); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_71); + $rectorConfig->import(DowngradeSetList::PHP_71); }; diff --git a/config/set/level/down-to-php71.php b/config/set/level/down-to-php71.php index cd177f3a741..339a4b24438 100644 --- a/config/set/level/down-to-php71.php +++ b/config/set/level/down-to-php71.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_72); - $containerConfigurator->import(DowngradeSetList::PHP_72); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_72); + $rectorConfig->import(DowngradeSetList::PHP_72); }; diff --git a/config/set/level/down-to-php72.php b/config/set/level/down-to-php72.php index a586799afc6..29d2a9940a4 100644 --- a/config/set/level/down-to-php72.php +++ b/config/set/level/down-to-php72.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_73); - $containerConfigurator->import(DowngradeSetList::PHP_73); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_73); + $rectorConfig->import(DowngradeSetList::PHP_73); }; diff --git a/config/set/level/down-to-php73.php b/config/set/level/down-to-php73.php index 50ac3eddb65..58eb28e8e36 100644 --- a/config/set/level/down-to-php73.php +++ b/config/set/level/down-to-php73.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_74); - $containerConfigurator->import(DowngradeSetList::PHP_74); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_74); + $rectorConfig->import(DowngradeSetList::PHP_74); }; diff --git a/config/set/level/down-to-php74.php b/config/set/level/down-to-php74.php index 7f7816e2d6a..63ec9416919 100644 --- a/config/set/level/down-to-php74.php +++ b/config/set/level/down-to-php74.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeLevelSetList; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeLevelSetList::DOWN_TO_PHP_80); - $containerConfigurator->import(DowngradeSetList::PHP_80); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_80); + $rectorConfig->import(DowngradeSetList::PHP_80); }; diff --git a/config/set/level/down-to-php80.php b/config/set/level/down-to-php80.php index f6cd89dd297..cf5826ae214 100644 --- a/config/set/level/down-to-php80.php +++ b/config/set/level/down-to-php80.php @@ -2,9 +2,9 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\DowngradeSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(DowngradeSetList::PHP_81); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(DowngradeSetList::PHP_81); }; diff --git a/config/set/level/up-to-php54.php b/config/set/level/up-to-php54.php index 8f8b363f184..f494d6c334f 100644 --- a/config/set/level/up-to-php54.php +++ b/config/set/level/up-to-php54.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_54); - $containerConfigurator->import(SetList::PHP_53); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_54); + $rectorConfig->import(SetList::PHP_53); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_54); }; diff --git a/config/set/level/up-to-php55.php b/config/set/level/up-to-php55.php index bc23a529999..f89bd050250 100644 --- a/config/set/level/up-to-php55.php +++ b/config/set/level/up-to-php55.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_55); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_54); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_55); + $rectorConfig->import(LevelSetList::UP_TO_PHP_54); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_55); }; diff --git a/config/set/level/up-to-php56.php b/config/set/level/up-to-php56.php index f690f0b8373..8fbaa02d607 100644 --- a/config/set/level/up-to-php56.php +++ b/config/set/level/up-to-php56.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_56); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_55); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_56); + $rectorConfig->import(LevelSetList::UP_TO_PHP_55); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_56); }; diff --git a/config/set/level/up-to-php70.php b/config/set/level/up-to-php70.php index e558f4f092e..3d14d64143e 100644 --- a/config/set/level/up-to-php70.php +++ b/config/set/level/up-to-php70.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_70); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_56); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_70); + $rectorConfig->import(LevelSetList::UP_TO_PHP_56); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_70); }; diff --git a/config/set/level/up-to-php71.php b/config/set/level/up-to-php71.php index c6a4d66b2f8..79769ea4345 100644 --- a/config/set/level/up-to-php71.php +++ b/config/set/level/up-to-php71.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_71); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_70); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_71); + $rectorConfig->import(LevelSetList::UP_TO_PHP_70); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_71); }; diff --git a/config/set/level/up-to-php72.php b/config/set/level/up-to-php72.php index fdc79a972cf..737afefe7c2 100644 --- a/config/set/level/up-to-php72.php +++ b/config/set/level/up-to-php72.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_72); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_71); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_72); + $rectorConfig->import(LevelSetList::UP_TO_PHP_71); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_72); }; diff --git a/config/set/level/up-to-php73.php b/config/set/level/up-to-php73.php index b80db8dcd5a..fe89cc67076 100644 --- a/config/set/level/up-to-php73.php +++ b/config/set/level/up-to-php73.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_73); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_72); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_73); + $rectorConfig->import(LevelSetList::UP_TO_PHP_72); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73); }; diff --git a/config/set/level/up-to-php74.php b/config/set/level/up-to-php74.php index 8a88537af67..3f7472028a4 100644 --- a/config/set/level/up-to-php74.php +++ b/config/set/level/up-to-php74.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_74); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_73); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_74); + $rectorConfig->import(LevelSetList::UP_TO_PHP_73); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); }; diff --git a/config/set/level/up-to-php80.php b/config/set/level/up-to-php80.php index 05a60c1c279..09e4eb9945f 100644 --- a/config/set/level/up-to-php80.php +++ b/config/set/level/up-to-php80.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_80); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_74); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_80); + $rectorConfig->import(LevelSetList::UP_TO_PHP_74); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80); }; diff --git a/config/set/level/up-to-php81.php b/config/set/level/up-to-php81.php index db75f1a0f2d..3cc690244db 100644 --- a/config/set/level/up-to-php81.php +++ b/config/set/level/up-to-php81.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::PHP_81); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_80); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::PHP_81); + $rectorConfig->import(LevelSetList::UP_TO_PHP_80); // parameter must be defined after import, to override impored param version - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81); }; diff --git a/config/set/monolog20.php b/config/set/monolog20.php index baedeab2a6b..3cb266a1f52 100644 --- a/config/set/monolog20.php +++ b/config/set/monolog20.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\ValueObject\MethodCallRename; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; # https://github.com/Seldaek/monolog/commit/39f8a20e6dadc0194e846b254c5f23d1c732290b#diff-dce565f403e044caa5e6a0d988339430 -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameMethodRector::class) ->configure([ new MethodCallRename('Monolog\Logger', 'addDebug', 'debug'), diff --git a/config/set/mysql-to-mysqli.php b/config/set/mysql-to-mysqli.php index 4f81d7d5772..9f6536d7980 100644 --- a/config/set/mysql-to-mysqli.php +++ b/config/set/mysql-to-mysqli.php @@ -3,7 +3,9 @@ declare(strict_types=1); use Rector\Arguments\Rector\FuncCall\SwapFuncCallArgumentsRector; + use Rector\Arguments\ValueObject\SwapFuncCallArguments; +use Rector\Config\RectorConfig; use Rector\MysqlToMysqli\Rector\Assign\MysqlAssignToMysqliRector; use Rector\MysqlToMysqli\Rector\FuncCall\MysqlFuncCallToMysqliRector; use Rector\MysqlToMysqli\Rector\FuncCall\MysqlPConnectToMysqliConnectRector; @@ -12,10 +14,9 @@ use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector; use Rector\Removing\ValueObject\RemoveFuncCallArg; use Rector\Renaming\Rector\ConstFetch\RenameConstantRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); # https://stackoverflow.com/a/1390625/1348344 # https://github.com/philip/MySQLConverterTool/blob/master/Converter.php diff --git a/config/set/naming.php b/config/set/naming.php index 404241a7ffd..52ac94860ae 100644 --- a/config/set/naming.php +++ b/config/set/naming.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Assign\RenameVariableToMatchMethodCallReturnTypeRector; use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector; use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector; use Rector\Naming\Rector\ClassMethod\RenameVariableToMatchNewTypeRector; use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector; use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchMethodCallReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameParamToMatchTypeRector::class); $services->set(RenamePropertyToMatchTypeRector::class); $services->set(RenameVariableToMatchNewTypeRector::class); diff --git a/config/set/php52.php b/config/set/php52.php index b1d835f5e4f..c91d501d101 100644 --- a/config/set/php52.php +++ b/config/set/php52.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php52\Rector\Property\VarToPublicPropertyRector; use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector; use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector; use Rector\Removing\ValueObject\RemoveFuncCallArg; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(VarToPublicPropertyRector::class); $services->set(ContinueToBreakInSwitchRector::class); diff --git a/config/set/php53.php b/config/set/php53.php index e1df9f19ae8..523dbfe1f0c 100644 --- a/config/set/php53.php +++ b/config/set/php53.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php53\Rector\FuncCall\DirNameFileConstantToDirConstantRector; use Rector\Php53\Rector\Ternary\TernaryToElvisRector; use Rector\Php53\Rector\Variable\ReplaceHttpServerVarsByServerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryToElvisRector::class); $services->set(DirNameFileConstantToDirConstantRector::class); diff --git a/config/set/php54.php b/config/set/php54.php index 58f8e28132f..b2bd3129221 100644 --- a/config/set/php54.php +++ b/config/set/php54.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php54\Rector\Break_\RemoveZeroBreakContinueRector; use Rector\Php54\Rector\FuncCall\RemoveReferenceFromCallRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameFunctionRector::class) ->configure([ 'mysqli_param_count' => 'mysqli_stmt_param_count', diff --git a/config/set/php55.php b/config/set/php55.php index 00d3b593599..e194d3f648e 100644 --- a/config/set/php55.php +++ b/config/set/php55.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\Class_\ClassConstantToSelfClassRector; use Rector\Php55\Rector\FuncCall\GetCalledClassToSelfClassRector; use Rector\Php55\Rector\FuncCall\GetCalledClassToStaticClassRector; use Rector\Php55\Rector\FuncCall\PregReplaceEModifierRector; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringClassNameToClassConstantRector::class); $services->set(ClassConstantToSelfClassRector::class); $services->set(PregReplaceEModifierRector::class); diff --git a/config/set/php56.php b/config/set/php56.php index b23809e28cc..496223ff3b4 100644 --- a/config/set/php56.php +++ b/config/set/php56.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php56\Rector\FuncCall\PowToExpRector; use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PowToExpRector::class); $services->set(RenameFunctionRector::class) diff --git a/config/set/php70.php b/config/set/php70.php index 0908ecb074b..9d98f957442 100644 --- a/config/set/php70.php +++ b/config/set/php70.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Assign\ListSplitStringRector; use Rector\Php70\Rector\Assign\ListSwapArrayOrderRector; use Rector\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector; @@ -21,10 +22,9 @@ use Rector\Php70\Rector\Switch_\ReduceMultipleDefaultSwitchRector; use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector; use Rector\Php70\Rector\Ternary\TernaryToSpaceshipRector; use Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(Php4ConstructorRector::class); $services->set(TernaryToNullCoalescingRector::class); diff --git a/config/set/php71.php b/config/set/php71.php index 8f9804c7f64..d3d376478cb 100644 --- a/config/set/php71.php +++ b/config/set/php71.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\Assign\AssignArrayToStringRector; use Rector\Php71\Rector\BinaryOp\BinaryOpBetweenNumberAndStringRector; use Rector\Php71\Rector\BooleanOr\IsIterableRector; @@ -10,10 +11,9 @@ use Rector\Php71\Rector\FuncCall\CountOnNullRector; use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector; use Rector\Php71\Rector\List_\ListToArrayDestructRector; use Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IsIterableRector::class); $services->set(MultiExceptionCatchRector::class); $services->set(AssignArrayToStringRector::class); diff --git a/config/set/php72.php b/config/set/php72.php index 1510f4d712a..58513898eeb 100644 --- a/config/set/php72.php +++ b/config/set/php72.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\Assign\ListEachRector; use Rector\Php72\Rector\Assign\ReplaceEachAssignmentWithKeyCurrentRector; use Rector\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector; @@ -13,10 +14,9 @@ use Rector\Php72\Rector\FuncCall\StringsAssertNakedRector; use Rector\Php72\Rector\Unset_\UnsetCastRector; use Rector\Php72\Rector\While_\WhileEachToForeachRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(WhileEachToForeachRector::class); $services->set(ListEachRector::class); diff --git a/config/set/php73.php b/config/set/php73.php index 55d977d207f..98f7b9a06a5 100644 --- a/config/set/php73.php +++ b/config/set/php73.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector; use Rector\Php73\Rector\BooleanOr\IsCountableRector; use Rector\Php73\Rector\ConstFetch\SensitiveConstantNameRector; @@ -13,10 +14,9 @@ use Rector\Php73\Rector\FuncCall\SetCookieRector; use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector; use Rector\Php73\Rector\String_\SensitiveHereNowDocRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IsCountableRector::class); $services->set(ArrayKeyFirstLastRector::class); $services->set(SensitiveDefineRector::class); diff --git a/config/set/php74.php b/config/set/php74.php index 81346668c86..aaa4df6d837 100644 --- a/config/set/php74.php +++ b/config/set/php74.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\ArrayDimFetch\CurlyToSquareBracketArrayStringRector; use Rector\Php74\Rector\Assign\NullCoalescingOperatorRector; use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector; @@ -17,10 +18,9 @@ use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector; use Rector\Php74\Rector\Property\TypedPropertyRector; use Rector\Php74\Rector\StaticCall\ExportToReflectionFunctionRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyRector::class); $services->set(RenameFunctionRector::class) diff --git a/config/set/php80.php b/config/set/php80.php index 90f7e46742e..d18324b30eb 100644 --- a/config/set/php80.php +++ b/config/set/php80.php @@ -3,10 +3,12 @@ declare(strict_types=1); use Rector\Arguments\Rector\ClassMethod\ArgumentAdderRector; + use Rector\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector; use Rector\Arguments\ValueObject\ArgumentAdder; use Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue; use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector; +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector; use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; @@ -26,10 +28,9 @@ use Rector\Php80\Rector\Ternary\GetDebugTypeRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; use Rector\Transform\Rector\StaticCall\StaticCallToFuncCallRector; use Rector\Transform\ValueObject\StaticCallToFuncCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnionTypesRector::class); $services->set(StrContainsRector::class); diff --git a/config/set/php81.php b/config/set/php81.php index 88290ec3729..969324e38a8 100644 --- a/config/set/php81.php +++ b/config/set/php81.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector; use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector; use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector; @@ -12,10 +13,9 @@ use Rector\Php81\Rector\FunctionLike\IntersectionTypesRector; use Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector; use Rector\Php81\Rector\Property\ReadOnlyPropertyRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnNeverTypeRector::class); $services->set(MyCLabsClassToEnumRector::class); $services->set(MyCLabsMethodCallToEnumConstRector::class); diff --git a/config/set/privatization.php b/config/set/privatization.php index b96534bf97c..e2ac05fbbf2 100644 --- a/config/set/privatization.php +++ b/config/set/privatization.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\ChangeGlobalVariablesToPropertiesRector; use Rector\Privatization\Rector\Class_\ChangeLocalPropertyToVariableRector; use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector; @@ -11,10 +12,9 @@ use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector; use Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector; use Rector\Privatization\Rector\Property\ChangeReadOnlyPropertyWithDefaultValueToConstantRector; use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FinalizeClassesWithoutChildrenRector::class); $services->set(ChangeGlobalVariablesToPropertiesRector::class); $services->set(ChangeReadOnlyPropertyWithDefaultValueToConstantRector::class); diff --git a/config/set/psr-4.php b/config/set/psr-4.php index 943ba4c8e2b..9934b1c30c0 100644 --- a/config/set/psr-4.php +++ b/config/set/psr-4.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector; use Rector\PSR4\Rector\Namespace_\MultipleClassFileToPsr4ClassesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class); $services->set(MultipleClassFileToPsr4ClassesRector::class); }; diff --git a/config/set/type-declaration-strict.php b/config/set/type-declaration-strict.php index ed61062ae49..a5f99643747 100644 --- a/config/set/type-declaration-strict.php +++ b/config/set/type-declaration-strict.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector; use Rector\TypeDeclaration\Rector\ClassMethod\ArrayShapeFromConstantArrayReturnRector; @@ -12,10 +13,9 @@ use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector; use Rector\TypeDeclaration\Rector\Param\ParamTypeFromStrictTypedPropertyRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddClosureReturnTypeRector::class); $services->set(ReturnTypeFromStrictTypedPropertyRector::class); $services->set(TypedPropertyFromStrictConstructorRector::class); diff --git a/config/set/type-declaration.php b/config/set/type-declaration.php index a8e8d9b6379..7f43ffce9c4 100644 --- a/config/set/type-declaration.php +++ b/config/set/type-declaration.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector; @@ -10,10 +11,9 @@ use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector; use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; use Rector\TypeDeclaration\Rector\Property\PropertyTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParamTypeDeclarationRector::class); $services->set(ReturnTypeDeclarationRector::class); $services->set(PropertyTypeDeclarationRector::class); diff --git a/config/set/unwrap-compat.php b/config/set/unwrap-compat.php index ef27e4184f9..db0fc0afdbc 100644 --- a/config/set/unwrap-compat.php +++ b/config/set/unwrap-compat.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfFunctionExistsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnwrapFutureCompatibleIfFunctionExistsRector::class); }; diff --git a/e2e/applied-rule-change-docblock/rector.php b/e2e/applied-rule-change-docblock/rector.php index d847a93fe26..080ec6f3f45 100644 --- a/e2e/applied-rule-change-docblock/rector.php +++ b/e2e/applied-rule-change-docblock/rector.php @@ -2,20 +2,20 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector; use Rector\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector; use Rector\DowngradePhp80\ValueObject\DowngradeAttributeToAnnotation; use Rector\Renaming\Rector\Name\RenameClassRector; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [ __DIR__ . '/src', ]); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure(['DateTime' => 'DateTimeInterface']); $services->set(DowngradeAttributeToAnnotationRector::class) diff --git a/e2e/applied-rule-return-array-nodes/rector.php b/e2e/applied-rule-return-array-nodes/rector.php index dd8fc1c1779..16f092c7056 100644 --- a/e2e/applied-rule-return-array-nodes/rector.php +++ b/e2e/applied-rule-return-array-nodes/rector.php @@ -2,18 +2,18 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; use Rector\Core\Configuration\Option; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [ __DIR__ . '/src', ]); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveAlwaysElseRector::class); $services->set(RemoveUnusedPrivateMethodRector::class); }; diff --git a/e2e/no-parallel-reflection-resolver/rector.php b/e2e/no-parallel-reflection-resolver/rector.php index 731b1cf227a..5da25463363 100644 --- a/e2e/no-parallel-reflection-resolver/rector.php +++ b/e2e/no-parallel-reflection-resolver/rector.php @@ -2,19 +2,19 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, false); $parameters->set(Option::PATHS, [ __DIR__ . '/src/', ]); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivatePropertyRector::class); }; diff --git a/e2e/parallel-custom-config/custom/config/rector.php b/e2e/parallel-custom-config/custom/config/rector.php index 88325729f3a..e932499a8c0 100644 --- a/e2e/parallel-custom-config/custom/config/rector.php +++ b/e2e/parallel-custom-config/custom/config/rector.php @@ -2,19 +2,19 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DowngradePhp81\Rector\Property\DowngradeReadonlyPropertyRector; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, true); $parameters->set(Option::PATHS, [ __DIR__.'/../../src/', ]); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeReadonlyPropertyRector::class); }; diff --git a/e2e/parallel-reflection-resolver/rector.php b/e2e/parallel-reflection-resolver/rector.php index 902a6a1d446..41c8c1a27c0 100644 --- a/e2e/parallel-reflection-resolver/rector.php +++ b/e2e/parallel-reflection-resolver/rector.php @@ -2,19 +2,19 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, true); $parameters->set(Option::PATHS, [ __DIR__ . '/src/', ]); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivatePropertyRector::class); }; diff --git a/e2e/php74-parse-static/rector.php b/e2e/php74-parse-static/rector.php index 01a79a9eb32..39603864817 100644 --- a/e2e/php74-parse-static/rector.php +++ b/e2e/php74-parse-static/rector.php @@ -2,18 +2,18 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\FuncCall\DowngradeJsonDecodeNullAssociativeArgRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Rector\Core\Configuration\Option; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, true); $parameters->set(Option::PATHS, [ __DIR__ . '/tests', ]); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeJsonDecodeNullAssociativeArgRector::class); }; diff --git a/e2e/plain-views/rector.php b/e2e/plain-views/rector.php index f5ae9a4515c..6f70e9a5e0f 100644 --- a/e2e/plain-views/rector.php +++ b/e2e/plain-views/rector.php @@ -2,11 +2,11 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [ __DIR__.'/src/', diff --git a/e2e/template-extends/rector.php b/e2e/template-extends/rector.php index f5ae9a4515c..6f70e9a5e0f 100644 --- a/e2e/template-extends/rector.php +++ b/e2e/template-extends/rector.php @@ -2,11 +2,11 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PATHS, [ __DIR__.'/src/', diff --git a/easy-ci.php b/easy-ci.php index c8aa00584be..0264bd244ce 100644 --- a/easy-ci.php +++ b/easy-ci.php @@ -28,7 +28,6 @@ use Rector\StaticTypeMapper\Contract\PhpDocParser\PhpDocTypeMapperInterface; use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface; use Rector\Testing\PHPUnit\AbstractTestCase; use Rector\TypeDeclaration\Contract\TypeInferer\ParamTypeInfererInterface; -use Rector\TypeDeclaration\Contract\TypeInferer\PropertyTypeInfererInterface; use Rector\TypeDeclaration\Contract\TypeInferer\ReturnTypeInfererInterface; use Symfony\Component\Console\Application; use Symfony\Component\Console\Command\Command; @@ -43,7 +42,6 @@ return static function (ContainerConfigurator $containerConfigurator): void { Application::class, RectorInterface::class, TypeToCallReflectionResolverInterface::class, - PropertyTypeInfererInterface::class, ParamTypeInfererInterface::class, ReturnTypeInfererInterface::class, FileProcessorInterface::class, diff --git a/packages-tests/BetterPhpDocParser/PhpDocInlineHtml/config/configured_rule.php b/packages-tests/BetterPhpDocParser/PhpDocInlineHtml/config/configured_rule.php index 128333e1726..0d10a812fa4 100644 --- a/packages-tests/BetterPhpDocParser/PhpDocInlineHtml/config/configured_rule.php +++ b/packages-tests/BetterPhpDocParser/PhpDocInlineHtml/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\BetterPhpDocParser\PhpDocInlineHtml\Source\InlineHtmlRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(InlineHtmlRector::class); }; diff --git a/packages-tests/Caching/Detector/config.php b/packages-tests/Caching/Detector/config.php index ab92831c447..5e1569ef42d 100644 --- a/packages-tests/Caching/Detector/config.php +++ b/packages-tests/Caching/Detector/config.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\Caching\ValueObject\Storage\MemoryCacheStorage; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::CACHE_DIR, sys_get_temp_dir() . '/_rector_cached_files_test'); $parameters->set(Option::CACHE_CLASS, MemoryCacheStorage::class); }; diff --git a/packages-tests/Caching/ValueObject/Storage/config.php b/packages-tests/Caching/ValueObject/Storage/config.php index ab92831c447..5e1569ef42d 100644 --- a/packages-tests/Caching/ValueObject/Storage/config.php +++ b/packages-tests/Caching/ValueObject/Storage/config.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\Caching\ValueObject\Storage\MemoryCacheStorage; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::CACHE_DIR, sys_get_temp_dir() . '/_rector_cached_files_test'); $parameters->set(Option::CACHE_CLASS, MemoryCacheStorage::class); }; diff --git a/packages/BetterPhpDocParser/ValueObject/Type/SpacingAwareArrayTypeNode.php b/packages/BetterPhpDocParser/ValueObject/Type/SpacingAwareArrayTypeNode.php index 71e4ddc8697..6a8349d2e2c 100644 --- a/packages/BetterPhpDocParser/ValueObject/Type/SpacingAwareArrayTypeNode.php +++ b/packages/BetterPhpDocParser/ValueObject/Type/SpacingAwareArrayTypeNode.php @@ -9,7 +9,6 @@ use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode; use PHPStan\PhpDocParser\Ast\Type\TypeNode; use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode; use Rector\PHPStanStaticTypeMapper\TypeMapper\ArrayTypeMapper; - use Stringable; final class SpacingAwareArrayTypeNode extends ArrayTypeNode implements Stringable diff --git a/rule-doc-generator.php b/rule-doc-generator.php index 18dddca93c0..a10c31d68ea 100644 --- a/rule-doc-generator.php +++ b/rule-doc-generator.php @@ -5,8 +5,8 @@ declare(strict_types=1); use Rector\RuleDocGenerator\Category\RectorCategoryInferer; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (ContainerConfigurator $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->autowire(); diff --git a/rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/config/configured_rule.php b/rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/config/configured_rule.php index 1e6c5b2f051..11f9fe9b52e 100644 --- a/rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/config/configured_rule.php +++ b/rules-tests/Arguments/Rector/ClassMethod/ArgumentAdderRector/config/configured_rule.php @@ -9,14 +9,14 @@ use PHPStan\Type\ObjectType; use Rector\Arguments\NodeAnalyzer\ArgumentAddingScope; use Rector\Arguments\Rector\ClassMethod\ArgumentAdderRector; use Rector\Arguments\ValueObject\ArgumentAdder; +use Rector\Config\RectorConfig; use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeClass; use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeContainerBuilder; use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeMultiArg; use Rector\Tests\Arguments\Rector\ClassMethod\ArgumentAdderRector\Source\SomeParentClient; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $arrayType = new ArrayType(new MixedType(), new MixedType()); diff --git a/rules-tests/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/config/configured_rule.php b/rules-tests/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/config/configured_rule.php index 08610990d4a..2084d0911c5 100644 --- a/rules-tests/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/config/configured_rule.php +++ b/rules-tests/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector/config/configured_rule.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Arguments\Rector\ClassMethod\ReplaceArgumentDefaultValueRector; use Rector\Arguments\ValueObject\ReplaceArgumentDefaultValue; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceArgumentDefaultValueRector::class) ->configure([ diff --git a/rules-tests/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector/config/configured_rule.php b/rules-tests/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector/config/configured_rule.php index a9ced65b8f2..246d9acdc2c 100644 --- a/rules-tests/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector/config/configured_rule.php +++ b/rules-tests/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector/config/configured_rule.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector; use Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FunctionArgumentDefaultValueReplacerRector::class) ->configure([ new ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'lte', 'le'), diff --git a/rules-tests/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector/config/configured_rule.php b/rules-tests/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector/config/configured_rule.php index e63f55f4c84..b7d68cb84da 100644 --- a/rules-tests/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector/config/configured_rule.php +++ b/rules-tests/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector/config/configured_rule.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Arguments\Rector\FuncCall\SwapFuncCallArgumentsRector; use Rector\Arguments\ValueObject\SwapFuncCallArguments; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SwapFuncCallArgumentsRector::class) ->configure([new SwapFuncCallArguments('some_function', [1, 0])]); }; diff --git a/rules-tests/Arguments/Rector/MethodCall/RemoveMethodCallParamRector/config/configured_rule.php b/rules-tests/Arguments/Rector/MethodCall/RemoveMethodCallParamRector/config/configured_rule.php index 40aa84ef177..502cb951bf3 100644 --- a/rules-tests/Arguments/Rector/MethodCall/RemoveMethodCallParamRector/config/configured_rule.php +++ b/rules-tests/Arguments/Rector/MethodCall/RemoveMethodCallParamRector/config/configured_rule.php @@ -4,12 +4,12 @@ declare(strict_types=1); use Rector\Arguments\Rector\MethodCall\RemoveMethodCallParamRector; use Rector\Arguments\ValueObject\RemoveMethodCallParam; +use Rector\Config\RectorConfig; use Rector\Tests\Arguments\Rector\MethodCall\RemoveMethodCallParamRector\Source\MethodCaller; use Rector\Tests\Arguments\Rector\MethodCall\RemoveMethodCallParamRector\Source\StaticCaller; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveMethodCallParamRector::class) ->configure([ new RemoveMethodCallParam(MethodCaller::class, 'process', 1), diff --git a/rules-tests/Arguments/Rector/RectorOrder/config/configured_rule.php b/rules-tests/Arguments/Rector/RectorOrder/config/configured_rule.php index f77d808551d..d16ed98d544 100644 --- a/rules-tests/Arguments/Rector/RectorOrder/config/configured_rule.php +++ b/rules-tests/Arguments/Rector/RectorOrder/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PHPUnit\Rector\MethodCall\AssertComparisonToSpecificMethodRector; use Rector\PHPUnit\Rector\MethodCall\AssertFalseStrposToContainsRector; use Rector\PHPUnit\Rector\MethodCall\AssertSameBoolNullToSpecificMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AssertComparisonToSpecificMethodRector::class); $services->set(AssertSameBoolNullToSpecificMethodRector::class); $services->set(AssertFalseStrposToContainsRector::class); diff --git a/rules-tests/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector/config/configured_rule.php index 26c2046e838..371d7e227e9 100644 --- a/rules-tests/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Array_/ArrayThisCallToThisMethodCallRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Array_\ArrayThisCallToThisMethodCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayThisCallToThisMethodCallRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/config/configured_rule.php index 54b7e189460..094b2f57d73 100644 --- a/rules-tests/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CallableThisArrayToAnonymousFunctionRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Assign/CombinedAssignRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Assign/CombinedAssignRector/config/configured_rule.php index ea9f00d78c0..91da7d07a89 100644 --- a/rules-tests/CodeQuality/Rector/Assign/CombinedAssignRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Assign/CombinedAssignRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Assign\CombinedAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CombinedAssignRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Assign/SplitListAssignToSeparateLineRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Assign/SplitListAssignToSeparateLineRector/config/configured_rule.php index 1549b332f50..3fd6e473c44 100644 --- a/rules-tests/CodeQuality/Rector/Assign/SplitListAssignToSeparateLineRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Assign/SplitListAssignToSeparateLineRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Assign\SplitListAssignToSeparateLineRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SplitListAssignToSeparateLineRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/config/configured_rule.php index bf1fa23362f..b415798cb28 100644 --- a/rules-tests/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyEmptyArrayCheckRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/BooleanNot/ReplaceMultipleBooleanNotRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/BooleanNot/ReplaceMultipleBooleanNotRector/config/configured_rule.php index 0a4c967d13a..4bbccd1e2b5 100644 --- a/rules-tests/CodeQuality/Rector/BooleanNot/ReplaceMultipleBooleanNotRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/BooleanNot/ReplaceMultipleBooleanNotRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\BooleanNot\ReplaceMultipleBooleanNotRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceMultipleBooleanNotRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector/config/configured_rule.php index e62306d104c..715a076407e 100644 --- a/rules-tests/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/BooleanNot/SimplifyDeMorganBinaryRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\BooleanNot\SimplifyDeMorganBinaryRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyDeMorganBinaryRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector/config/configured_rule.php index 1508bb5707c..2e52141b08d 100644 --- a/rules-tests/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Catch_\ThrowWithPreviousExceptionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ThrowWithPreviousExceptionRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector/config/configured_rule.php index 93885fca31c..e232f7a9e77 100644 --- a/rules-tests/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\ClassMethod\DateTimeToDateTimeInterfaceRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DateTimeToDateTimeInterfaceRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector/config/configured_rule.php index e9b51ddd16c..e6a4c860813 100644 --- a/rules-tests/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\ClassMethod\NarrowUnionTypeDocRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NarrowUnionTypeDocRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/config/configured_rule.php index a3b21e1a24e..c5d59080e5a 100644 --- a/rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(OptionalParametersAfterRequiredRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/configured_rule.php index 58bbcca55f5..7c97add406b 100644 --- a/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CompleteDynamicPropertiesRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/pre_union_types.php b/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/pre_union_types.php index 325f35a2d33..ab3889df2d0 100644 --- a/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/pre_union_types.php +++ b/rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/config/pre_union_types.php @@ -3,14 +3,14 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(CompleteDynamicPropertiesRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector/config/configured_rule.php index 116c80ca6c5..56b0b6c82be 100644 --- a/rules-tests/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(InlineConstructorDefaultToPropertyRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/config/configured_rule.php index 44dcacee0f2..e5d8c211393 100644 --- a/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(JoinStringConcatRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector/config/configured_rule.php index 751dcde2a07..e6dbc40621e 100644 --- a/rules-tests/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Do_\DoWhileBreakFalseToIfElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DoWhileBreakFalseToIfElseRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/config/configured_rule.php index 67ef27b1f34..b354ce0215e 100644 --- a/rules-tests/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UseIdenticalOverEqualWithSameTypeRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector/config/configured_rule.php index 98b9c503ee0..6e5bc298c98 100644 --- a/rules-tests/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(InlineIfToExplicitIfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector/config/configured_rule.php index efbdd18dbfb..7dcfbded835 100644 --- a/rules-tests/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ForRepeatedCountToOwnVariableRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/For_/ForToForeachRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/For_/ForToForeachRector/config/configured_rule.php index c8be97677d0..f94f629312b 100644 --- a/rules-tests/CodeQuality/Rector/For_/ForToForeachRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/For_/ForToForeachRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\For_\ForToForeachRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ForToForeachRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/config/configured_rule.php index b743fcb78d8..0f7588c646f 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ForeachItemsAssignToEmptyArrayToAssignRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Foreach_/ForeachToInArrayRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Foreach_/ForeachToInArrayRector/config/configured_rule.php index eebcd967b80..96b10d408c9 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/ForeachToInArrayRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Foreach_/ForeachToInArrayRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Foreach_\ForeachToInArrayRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ForeachToInArrayRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule.php index feef59f853d..2a50df0c0c8 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule.php @@ -3,14 +3,14 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Foreach_\SimplifyForeachToArrayFilterRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyForeachToArrayFilterRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::ARROW_FUNCTION); }; diff --git a/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule_php73.php b/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule_php73.php index b0eae17aa44..d7bda0f4639 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule_php73.php +++ b/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToArrayFilterRector/config/configured_rule_php73.php @@ -3,14 +3,14 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Foreach_\SimplifyForeachToArrayFilterRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyForeachToArrayFilterRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::ARROW_FUNCTION - 1); }; diff --git a/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector/config/configured_rule.php index 3dc16074c35..5e265704b4b 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Foreach_\SimplifyForeachToCoalescingRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyForeachToCoalescingRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector/config/configured_rule.php index 5d1b4c82de4..b97b0e3ae9c 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnusedForeachValueToArrayKeysRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/AddPregQuoteDelimiterRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/AddPregQuoteDelimiterRector/config/configured_rule.php index db0f1758e1b..2268f55d5b1 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/AddPregQuoteDelimiterRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/AddPregQuoteDelimiterRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\AddPregQuoteDelimiterRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddPregQuoteDelimiterRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/config/configured_rule.php index c16648e5331..8d8d12d8ebe 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayKeysAndInArrayToArrayKeyExistsRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/config/configured_rule.php index 51a62e2349c..1f4a451dda1 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\ArrayMergeOfNonArraysToSimpleArrayRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayMergeOfNonArraysToSimpleArrayRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector/config/configured_rule.php index 34f80af3205..3995a1f4e46 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector/config/configured_rule.php @@ -3,10 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\CallUserFuncWithArrowFunctionToInlineRector; +use Rector\Config\RectorConfig; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CallUserFuncWithArrowFunctionToInlineRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector/config/configured_rule.php index 3aa1e0273f4..9da23dfbe46 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeArrayPushToArrayAssignRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/CompactToVariablesRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/CompactToVariablesRector/config/configured_rule.php index d26d0abdb9c..c0d4b2f993a 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/CompactToVariablesRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/CompactToVariablesRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CompactToVariablesRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/IntvalToTypeCastRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/IntvalToTypeCastRector/config/configured_rule.php index 5ab484aeeb0..31e5136286c 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/IntvalToTypeCastRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/IntvalToTypeCastRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\IntvalToTypeCastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IntvalToTypeCastRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/config/configured_rule.php index f004449887e..75b3ca708f6 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/IsAWithStringWithThirdArgumentRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\IsAWithStringWithThirdArgumentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IsAWithStringWithThirdArgumentRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/RemoveSoleValueSprintfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/RemoveSoleValueSprintfRector/config/configured_rule.php index 00927991d66..2481251c2be 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/RemoveSoleValueSprintfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/RemoveSoleValueSprintfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\RemoveSoleValueSprintfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveSoleValueSprintfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SetTypeToCastRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SetTypeToCastRector/config/configured_rule.php index 0a5610a8cdd..902eae58ca0 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/SetTypeToCastRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/SetTypeToCastRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\SetTypeToCastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SetTypeToCastRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyFuncGetArgsCountRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyFuncGetArgsCountRector/config/configured_rule.php index c5fd8f3c6ac..cff09f1ff84 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyFuncGetArgsCountRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyFuncGetArgsCountRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\SimplifyFuncGetArgsCountRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyFuncGetArgsCountRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyInArrayValuesRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyInArrayValuesRector/config/configured_rule.php index bf929a3ccad..ebed342d2fa 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyInArrayValuesRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyInArrayValuesRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\SimplifyInArrayValuesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyInArrayValuesRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector/config/configured_rule.php index 3c1d595c906..e43306a1952 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyRegexPatternRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector/config/configured_rule.php index ebbba5ee95b..8826534c2fd 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyStrposLowerRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SingleInArrayToCompareRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SingleInArrayToCompareRector/config/configured_rule.php index ade07b4b95a..49ac09cbe90 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/SingleInArrayToCompareRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/SingleInArrayToCompareRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SingleInArrayToCompareRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FuncCall/UnwrapSprintfOneArgumentRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/UnwrapSprintfOneArgumentRector/config/configured_rule.php index 8b29337b385..0ac3fb0657a 100644 --- a/rules-tests/CodeQuality/Rector/FuncCall/UnwrapSprintfOneArgumentRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FuncCall/UnwrapSprintfOneArgumentRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FuncCall\UnwrapSprintfOneArgumentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnwrapSprintfOneArgumentRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector/config/configured_rule.php index e0664c06398..2f78ee2d26e 100644 --- a/rules-tests/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FunctionLike/RemoveAlwaysTrueConditionSetInConstructorRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FunctionLike\RemoveAlwaysTrueConditionSetInConstructorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAlwaysTrueConditionSetInConstructorRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/config/configured_rule.php index 31b18b57d28..944a5c2f76f 100644 --- a/rules-tests/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyUselessVariableRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/config/configured_rule.php index 15a64a21409..a6965b631d1 100644 --- a/rules-tests/CodeQuality/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/BooleanNotIdenticalToNotIdenticalRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\BooleanNotIdenticalToNotIdenticalRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BooleanNotIdenticalToNotIdenticalRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/config/configured_rule.php index 99c8ef46cb5..a8e1aeaa1d5 100644 --- a/rules-tests/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FlipTypeControlToUseExclusiveTypeRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/GetClassToInstanceOfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/GetClassToInstanceOfRector/config/configured_rule.php index d8989761bf6..75d4069dfef 100644 --- a/rules-tests/CodeQuality/Rector/Identical/GetClassToInstanceOfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/GetClassToInstanceOfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\GetClassToInstanceOfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetClassToInstanceOfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/SimplifyArraySearchRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/SimplifyArraySearchRector/config/configured_rule.php index 8ae6548fb82..b41bc0a390a 100644 --- a/rules-tests/CodeQuality/Rector/Identical/SimplifyArraySearchRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/SimplifyArraySearchRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\SimplifyArraySearchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyArraySearchRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/config/configured_rule.php index 1123846dc36..79c34e39e84 100644 --- a/rules-tests/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/SimplifyBoolIdenticalTrueRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyBoolIdenticalTrueRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/SimplifyConditionsRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/SimplifyConditionsRector/config/configured_rule.php index b929c09c799..2185ea1b9e7 100644 --- a/rules-tests/CodeQuality/Rector/Identical/SimplifyConditionsRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/SimplifyConditionsRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\SimplifyConditionsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyConditionsRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Identical/StrlenZeroToIdenticalEmptyStringRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Identical/StrlenZeroToIdenticalEmptyStringRector/config/configured_rule.php index a39bc2f2e76..1caca9659ad 100644 --- a/rules-tests/CodeQuality/Rector/Identical/StrlenZeroToIdenticalEmptyStringRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Identical/StrlenZeroToIdenticalEmptyStringRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Identical\StrlenZeroToIdenticalEmptyStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StrlenZeroToIdenticalEmptyStringRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/CombineIfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/CombineIfRector/config/configured_rule.php index 280facec63f..4fd9a34d888 100644 --- a/rules-tests/CodeQuality/Rector/If_/CombineIfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/CombineIfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\CombineIfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CombineIfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/config/configured_rule.php index 7be0b69e692..9e59c3ee9a7 100644 --- a/rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ConsecutiveNullCompareReturnsToNullCoalesceQueueRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/ExplicitBoolCompareRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/ExplicitBoolCompareRector/config/configured_rule.php index 1ef6180fe8c..f588c18ddfb 100644 --- a/rules-tests/CodeQuality/Rector/If_/ExplicitBoolCompareRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/ExplicitBoolCompareRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExplicitBoolCompareRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/ShortenElseIfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/ShortenElseIfRector/config/configured_rule.php index 49193473081..c9e1305de4a 100644 --- a/rules-tests/CodeQuality/Rector/If_/ShortenElseIfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/ShortenElseIfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\ShortenElseIfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ShortenElseIfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/SimplifyIfElseToTernaryRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/SimplifyIfElseToTernaryRector/config/configured_rule.php index 34cce36e0a9..0ceccea07fa 100644 --- a/rules-tests/CodeQuality/Rector/If_/SimplifyIfElseToTernaryRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/SimplifyIfElseToTernaryRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyIfElseToTernaryRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/SimplifyIfIssetToNullCoalescingRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/SimplifyIfIssetToNullCoalescingRector/config/configured_rule.php index c894214aef2..19a5aa5d28e 100644 --- a/rules-tests/CodeQuality/Rector/If_/SimplifyIfIssetToNullCoalescingRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/SimplifyIfIssetToNullCoalescingRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\SimplifyIfIssetToNullCoalescingRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyIfIssetToNullCoalescingRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector/config/configured_rule.php index b2e1012844c..402bd64c574 100644 --- a/rules-tests/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\SimplifyIfNotNullReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyIfNotNullReturnRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector/config/configured_rule.php index b626e30a757..69aa1760562 100644 --- a/rules-tests/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\SimplifyIfNullableReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyIfNullableReturnRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/config/configured_rule.php index f06bfff9680..153677541dc 100644 --- a/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyIfReturnBoolRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Include_/AbsolutizeRequireAndIncludePathRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Include_/AbsolutizeRequireAndIncludePathRector/config/configured_rule.php index 1980290f1e5..15544e5b983 100644 --- a/rules-tests/CodeQuality/Rector/Include_/AbsolutizeRequireAndIncludePathRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Include_/AbsolutizeRequireAndIncludePathRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Include_\AbsolutizeRequireAndIncludePathRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AbsolutizeRequireAndIncludePathRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configued_typed_property.php b/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configued_typed_property.php index 1d6fb5885c3..7e5add548e2 100644 --- a/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configued_typed_property.php +++ b/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configued_typed_property.php @@ -3,14 +3,14 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(IssetOnPropertyObjectToPropertyExistsRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configured_rule.php index 094674eb981..0795911ae0d 100644 --- a/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IssetOnPropertyObjectToPropertyExistsRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/config/configured_rule.php index f8966e11261..54c967952ba 100644 --- a/rules-tests/CodeQuality/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/LogicalAnd/AndAssignsToSeparateLinesRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\LogicalAnd\AndAssignsToSeparateLinesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AndAssignsToSeparateLinesRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/config/configured_rule.php index 7f3657793f6..e14e3f5fb22 100644 --- a/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/LogicalAnd/LogicalToBooleanRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\LogicalAnd\LogicalToBooleanRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(LogicalToBooleanRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/New_/NewStaticToNewSelfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/New_/NewStaticToNewSelfRector/config/configured_rule.php index 473aa7e556e..98be116a41a 100644 --- a/rules-tests/CodeQuality/Rector/New_/NewStaticToNewSelfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/New_/NewStaticToNewSelfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\New_\NewStaticToNewSelfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewStaticToNewSelfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/NotEqual/CommonNotEqualRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/NotEqual/CommonNotEqualRector/config/configured_rule.php index 90a7efac5e9..b058c376792 100644 --- a/rules-tests/CodeQuality/Rector/NotEqual/CommonNotEqualRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/NotEqual/CommonNotEqualRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CommonNotEqualRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/PropertyFetch/ExplicitMethodCallOverMagicGetSetRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/PropertyFetch/ExplicitMethodCallOverMagicGetSetRector/config/configured_rule.php index a9778ad3b34..c860b98e45a 100644 --- a/rules-tests/CodeQuality/Rector/PropertyFetch/ExplicitMethodCallOverMagicGetSetRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/PropertyFetch/ExplicitMethodCallOverMagicGetSetRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\PropertyFetch\ExplicitMethodCallOverMagicGetSetRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExplicitMethodCallOverMagicGetSetRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Switch_/SingularSwitchToIfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Switch_/SingularSwitchToIfRector/config/configured_rule.php index eaa38ddd491..594073a1f08 100644 --- a/rules-tests/CodeQuality/Rector/Switch_/SingularSwitchToIfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Switch_/SingularSwitchToIfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Switch_\SingularSwitchToIfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SingularSwitchToIfRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Ternary/ArrayKeyExistsTernaryThenValueToCoalescingRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Ternary/ArrayKeyExistsTernaryThenValueToCoalescingRector/config/configured_rule.php index dc5e9d5ad45..3d0f1b1c6cd 100644 --- a/rules-tests/CodeQuality/Rector/Ternary/ArrayKeyExistsTernaryThenValueToCoalescingRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Ternary/ArrayKeyExistsTernaryThenValueToCoalescingRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayKeyExistsTernaryThenValueToCoalescingRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector/config/configured_rule.php index 0813ed32ce5..048c56bfd13 100644 --- a/rules-tests/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Ternary/SimplifyTautologyTernaryRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Ternary\SimplifyTautologyTernaryRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyTautologyTernaryRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Ternary/SwitchNegatedTernaryRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Ternary/SwitchNegatedTernaryRector/config/configured_rule.php index 3b957b480c4..9924eae1d87 100644 --- a/rules-tests/CodeQuality/Rector/Ternary/SwitchNegatedTernaryRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Ternary/SwitchNegatedTernaryRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SwitchNegatedTernaryRector::class); }; diff --git a/rules-tests/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector/config/configured_rule.php index fd2ed341d2c..8c35e07755a 100644 --- a/rules-tests/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Ternary/UnnecessaryTernaryExpressionRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnnecessaryTernaryExpressionRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Assign/PHPStormVarAnnotationRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Assign/PHPStormVarAnnotationRector/config/configured_rule.php index 0e122dcb7ba..f315616cfd0 100644 --- a/rules-tests/CodingStyle/Rector/Assign/PHPStormVarAnnotationRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Assign/PHPStormVarAnnotationRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Assign\PHPStormVarAnnotationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PHPStormVarAnnotationRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Assign/SplitDoubleAssignRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Assign/SplitDoubleAssignRector/config/configured_rule.php index 53fea39e7f5..31fa96948f0 100644 --- a/rules-tests/CodingStyle/Rector/Assign/SplitDoubleAssignRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Assign/SplitDoubleAssignRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SplitDoubleAssignRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector/config/configured_rule.php index 48f38841419..2fb8cd10869 100644 --- a/rules-tests/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CatchExceptionNameMatchingTypeRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php index c0707c537bc..f2475dc69db 100644 --- a/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveFinalFromConstRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/config/configured_rule.php index 17dd54f5431..088f8394c3b 100644 --- a/rules-tests/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassConst\SplitGroupedConstantsAndPropertiesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SplitGroupedConstantsAndPropertiesRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassConst/VarConstantCommentRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassConst/VarConstantCommentRector/config/configured_rule.php index b9c58b0717e..975bf6de71e 100644 --- a/rules-tests/CodingStyle/Rector/ClassConst/VarConstantCommentRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassConst/VarConstantCommentRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(VarConstantCommentRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector/config/configured_rule.php index 93c3a0d0edb..52732a775d0 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FuncGetArgsToVariadicParamRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/configured_rule.php index c4bf90d9ac7..a9eccea9c49 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php b/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php index 9b4ccfdc48e..884518dfb3e 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php @@ -3,14 +3,14 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::PARENT_VISIBILITY_OVERRIDE); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/config/configured_rule.php index 7536ed562af..dda94f1862f 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/NewlineBeforeNewAssignSetRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewlineBeforeNewAssignSetRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/OrderAttributesRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/OrderAttributesRector/config/configured_rule.php index b1d8c4e3cc4..1891fd2433d 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/OrderAttributesRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/OrderAttributesRector/config/configured_rule.php @@ -3,12 +3,12 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\OrderAttributesRector; +use Rector\Config\RectorConfig; use Rector\Tests\CodingStyle\Rector\ClassMethod\OrderAttributesRector\Source\FirstAttribute; use Rector\Tests\CodingStyle\Rector\ClassMethod\OrderAttributesRector\Source\SecondAttribute; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(OrderAttributesRector::class) ->configure([FirstAttribute::class, SecondAttribute::class]); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/RemoveDoubleUnderscoreInMethodNameRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/RemoveDoubleUnderscoreInMethodNameRector/config/configured_rule.php index 4c0cef73016..74d8f7f30cd 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/RemoveDoubleUnderscoreInMethodNameRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/RemoveDoubleUnderscoreInMethodNameRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\RemoveDoubleUnderscoreInMethodNameRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDoubleUnderscoreInMethodNameRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/config/configured_rule.php index 215477e93a9..eabdcb1fcf7 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector/config/configured_rule.php @@ -5,12 +5,12 @@ declare(strict_types=1); use PHPUnit\Framework\TestCase; use Rector\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector; use Rector\CodingStyle\ValueObject\ReturnArrayClassMethodToYield; +use Rector\Config\RectorConfig; use Rector\Tests\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector\Source\EventSubscriberInterface; use Rector\Tests\CodingStyle\Rector\ClassMethod\ReturnArrayClassMethodToYieldRector\Source\ParentTestCase; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnArrayClassMethodToYieldRector::class) ->configure([ new ReturnArrayClassMethodToYield(EventSubscriberInterface::class, 'getSubscribedEvents'), diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector/config/configured_rule.php index 991959f48c1..5da63d76cd9 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnSpreadOperatorRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector/config/configured_rule.php index d11a313ad24..1f8dcaec41f 100644 --- a/rules-tests/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddArrayDefaultToArrayPropertyRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Encapsed/EncapsedStringsToSprintfRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Encapsed/EncapsedStringsToSprintfRector/config/configured_rule.php index 99d70bcbe62..83b10997053 100644 --- a/rules-tests/CodingStyle/Rector/Encapsed/EncapsedStringsToSprintfRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Encapsed/EncapsedStringsToSprintfRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(EncapsedStringsToSprintfRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/config/configured_rule.php index f915b34ad44..35641fcb0d1 100644 --- a/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(WrapEncapsedVariableInCurlyBracesRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector/config/configured_rule.php index 75e88d54088..5e46bdf384b 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CallUserFuncArrayToVariadicRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector/config/configured_rule.php index 8a1f439fab4..b9f8cbf4596 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector/config/configured_rule.php @@ -3,10 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\CallUserFuncToMethodCallRector; +use Rector\Config\RectorConfig; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CallUserFuncToMethodCallRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ConsistentImplodeRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/ConsistentImplodeRector/config/configured_rule.php index 13fff397680..6fc0ca95101 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ConsistentImplodeRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/ConsistentImplodeRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ConsistentImplodeRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/configured_rule.php index 86ceb5ff1f7..c6f246a68d6 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ConsistentPregDelimiterRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/direct_string_configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/direct_string_configured_rule.php index be139545033..5e1f9d9b896 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/direct_string_configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector/config/direct_string_configured_rule.php @@ -3,10 +3,10 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ConsistentPregDelimiterRector::class) ->configure(['/']); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/config/configured_rule.php index 015a8b7ab11..99a36d7d123 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CountArrayToEmptyArrayComparisonRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/StrictArraySearchRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/StrictArraySearchRector/config/configured_rule.php index 24427d4a46c..f89343f3a6f 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/StrictArraySearchRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/StrictArraySearchRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\StrictArraySearchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StrictArraySearchRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/FuncCall/VersionCompareFuncCallToConstantRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/VersionCompareFuncCallToConstantRector/config/configured_rule.php index 0ad45ccaffb..a7c3ca60431 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/VersionCompareFuncCallToConstantRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/FuncCall/VersionCompareFuncCallToConstantRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(VersionCompareFuncCallToConstantRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/If_/NullableCompareToNullRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/If_/NullableCompareToNullRector/config/configured_rule.php index b330790b361..383218d3618 100644 --- a/rules-tests/CodingStyle/Rector/If_/NullableCompareToNullRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/If_/NullableCompareToNullRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NullableCompareToNullRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/MethodCall/PreferThisOrSelfMethodCallRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/MethodCall/PreferThisOrSelfMethodCallRector/config/configured_rule.php index 5ad7c3ed014..ebe418c9a45 100644 --- a/rules-tests/CodingStyle/Rector/MethodCall/PreferThisOrSelfMethodCallRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/MethodCall/PreferThisOrSelfMethodCallRector/config/configured_rule.php @@ -3,15 +3,15 @@ declare(strict_types=1); use PHPUnit\Framework\TestCase; - use Rector\CodingStyle\Enum\PreferenceSelfThis; + use Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector; +use Rector\Config\RectorConfig; use Rector\Tests\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\BeLocalClass; use Rector\Tests\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector\Source\SomeAbstractTestCase; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PreferThisOrSelfMethodCallRector::class) ->configure([ SomeAbstractTestCase::class => PreferenceSelfThis::PREFER_SELF(), diff --git a/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_config.php b/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_config.php index 593bf0968c3..a6546ec7de9 100644 --- a/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_config.php +++ b/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_config.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_only_on_changed_files_config.php b/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_only_on_changed_files_config.php index b5ce7099520..a6fb3dfb852 100644 --- a/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_only_on_changed_files_config.php +++ b/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_only_on_changed_files_config.php @@ -2,19 +2,18 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Renaming\Rector\Name\RenameClassRector; - use Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\NormalParamClass; use Rector\Tests\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\NormalReturnClass; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); $parameters->set(Option::APPLY_AUTO_IMPORT_NAMES_ON_CHANGED_FILES_ONLY, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ diff --git a/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/not_import_short_classes.php b/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/not_import_short_classes.php index 94f2fe00187..a0c247a7624 100644 --- a/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/not_import_short_classes.php +++ b/rules-tests/CodingStyle/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/not_import_short_classes.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); $parameters->set(Option::IMPORT_SHORT_CLASSES, false); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Plus/UseIncrementAssignRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Plus/UseIncrementAssignRector/config/configured_rule.php index 022274ca08d..a8fe5ef55a5 100644 --- a/rules-tests/CodingStyle/Rector/Plus/UseIncrementAssignRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Plus/UseIncrementAssignRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UseIncrementAssignRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/PostInc/PostIncDecToPreIncDecRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/PostInc/PostIncDecToPreIncDecRector/config/configured_rule.php index 3795924c3b3..e23b4d78031 100644 --- a/rules-tests/CodingStyle/Rector/PostInc/PostIncDecToPreIncDecRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/PostInc/PostIncDecToPreIncDecRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PostIncDecToPreIncDecRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Property/AddFalseDefaultToBoolPropertyRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Property/AddFalseDefaultToBoolPropertyRector/config/configured_rule.php index b9365c377e8..227e0268277 100644 --- a/rules-tests/CodingStyle/Rector/Property/AddFalseDefaultToBoolPropertyRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Property/AddFalseDefaultToBoolPropertyRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Property\AddFalseDefaultToBoolPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddFalseDefaultToBoolPropertyRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/config/configured_rule.php index f9ac2a21dbc..894bdd806e0 100644 --- a/rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Stmt/NewlineAfterStatementRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewlineAfterStatementRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector/config/configured_rule.php index 88734abfbcf..550f2b04e99 100644 --- a/rules-tests/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SymplifyQuoteEscapeRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector/config/configured_rule.php index 7ffacc9aeab..e0f1619ab2a 100644 --- a/rules-tests/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UseClassKeywordForClassNameResolutionRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector/config/configured_rule.php index 03a91b2ef9c..b8b41f698c1 100644 --- a/rules-tests/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Switch_/BinarySwitchToIfElseRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BinarySwitchToIfElseRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Ternary/TernaryConditionVariableAssignmentRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Ternary/TernaryConditionVariableAssignmentRector/config/configured_rule.php index 302125c7071..d63b2ff8700 100644 --- a/rules-tests/CodingStyle/Rector/Ternary/TernaryConditionVariableAssignmentRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Ternary/TernaryConditionVariableAssignmentRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryConditionVariableAssignmentRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/config/configured_rule.php index 70bd9d8b0f8..185ecd865cd 100644 --- a/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SeparateMultiUseImportsRector::class); }; diff --git a/rules-tests/Compatibility/Rector/Class_/AttributeCompatibleAnnotationRector/config/configured_rule.php b/rules-tests/Compatibility/Rector/Class_/AttributeCompatibleAnnotationRector/config/configured_rule.php index d5739293a76..db116ec04de 100644 --- a/rules-tests/Compatibility/Rector/Class_/AttributeCompatibleAnnotationRector/config/configured_rule.php +++ b/rules-tests/Compatibility/Rector/Class_/AttributeCompatibleAnnotationRector/config/configured_rule.php @@ -3,9 +3,9 @@ declare(strict_types=1); use Rector\Compatibility\Rector\Class_\AttributeCompatibleAnnotationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AttributeCompatibleAnnotationRector::class); }; diff --git a/rules-tests/Composer/Rector/AddPackageToRequireComposerRector/config/some_config.php b/rules-tests/Composer/Rector/AddPackageToRequireComposerRector/config/some_config.php index cf61b8c79a8..f9b0af6b417 100644 --- a/rules-tests/Composer/Rector/AddPackageToRequireComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/AddPackageToRequireComposerRector/config/some_config.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Composer\Rector\AddPackageToRequireComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddPackageToRequireComposerRector::class) ->configure([new PackageAndVersion('vendor1/package3', '^3.0')]); }; diff --git a/rules-tests/Composer/Rector/AddPackageToRequireDevComposerRector/config/some_config.php b/rules-tests/Composer/Rector/AddPackageToRequireDevComposerRector/config/some_config.php index 9ebd5de24dc..c36ecbdad9f 100644 --- a/rules-tests/Composer/Rector/AddPackageToRequireDevComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/AddPackageToRequireDevComposerRector/config/some_config.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Composer\Rector\AddPackageToRequireDevComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddPackageToRequireDevComposerRector::class) ->configure([ new PackageAndVersion('vendor1/package3', '^3.0'), diff --git a/rules-tests/Composer/Rector/ChangePackageVersionComposerRector/config/some_config.php b/rules-tests/Composer/Rector/ChangePackageVersionComposerRector/config/some_config.php index 07873c5d4ec..3ade6823cb1 100644 --- a/rules-tests/Composer/Rector/ChangePackageVersionComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/ChangePackageVersionComposerRector/config/some_config.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Composer\Rector\ChangePackageVersionComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangePackageVersionComposerRector::class) ->configure([new PackageAndVersion('vendor1/package3', '^15.0')]); }; diff --git a/rules-tests/Composer/Rector/CombinationComposerRector/config/some_config.php b/rules-tests/Composer/Rector/CombinationComposerRector/config/some_config.php index b938e763b31..d68f844b910 100644 --- a/rules-tests/Composer/Rector/CombinationComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/CombinationComposerRector/config/some_config.php @@ -6,10 +6,10 @@ use Rector\Composer\Rector\ChangePackageVersionComposerRector; use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector; use Rector\Composer\ValueObject\PackageAndVersion; use Rector\Composer\ValueObject\ReplacePackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplacePackageAndVersionComposerRector::class) ->configure([new ReplacePackageAndVersion('vendor1/package2', 'vendor2/package1', '^3.0')]); diff --git a/rules-tests/Composer/Rector/RemovePackageComposerRector/config/some_config.php b/rules-tests/Composer/Rector/RemovePackageComposerRector/config/some_config.php index 660675c2d09..945aaea964c 100644 --- a/rules-tests/Composer/Rector/RemovePackageComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/RemovePackageComposerRector/config/some_config.php @@ -3,10 +3,10 @@ declare(strict_types=1); use Rector\Composer\Rector\RemovePackageComposerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemovePackageComposerRector::class) ->configure(['vendor1/package3', 'vendor1/package1', 'vendor1/package2']); }; diff --git a/rules-tests/Composer/Rector/RenamePackageComposerRector/config/some_config.php b/rules-tests/Composer/Rector/RenamePackageComposerRector/config/some_config.php index c21aca3254b..586b1f526c4 100644 --- a/rules-tests/Composer/Rector/RenamePackageComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/RenamePackageComposerRector/config/some_config.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Composer\Rector\RenamePackageComposerRector; use Rector\Composer\ValueObject\RenamePackage; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenamePackageComposerRector::class) ->configure([new RenamePackage('foo/bar', 'baz/bar'), new RenamePackage('foo/baz', 'baz/baz')]); }; diff --git a/rules-tests/Composer/Rector/ReplacePackageAndVersionComposerRector/config/some_config.php b/rules-tests/Composer/Rector/ReplacePackageAndVersionComposerRector/config/some_config.php index 3220f3f32d3..929c8e48de8 100644 --- a/rules-tests/Composer/Rector/ReplacePackageAndVersionComposerRector/config/some_config.php +++ b/rules-tests/Composer/Rector/ReplacePackageAndVersionComposerRector/config/some_config.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector; use Rector\Composer\ValueObject\ReplacePackageAndVersion; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplacePackageAndVersionComposerRector::class) ->configure([new ReplacePackageAndVersion('vendor1/package1', 'vendor1/package3', '^4.0')]); }; diff --git a/rules-tests/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector/config/configured_rule.php index 3ef5ad5eb49..c68077b7147 100644 --- a/rules-tests/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDuplicatedArrayKeyRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/config/configured_rule.php index 18bc48f3eeb..3c805213f86 100644 --- a/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDoubleAssignRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector/config/configured_rule.php index 1ea33c85020..caf0fb6fb34 100644 --- a/rules-tests/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedVariableAssignRector::class); }; diff --git a/rules-tests/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector/config/configured_rule.php index 914f4e7b5c7..51448324557 100644 --- a/rules-tests/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/BinaryOp/RemoveDuplicatedInstanceOfRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\BinaryOp\RemoveDuplicatedInstanceOfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDuplicatedInstanceOfRector::class); }; diff --git a/rules-tests/DeadCode/Rector/BooleanAnd/RemoveAndTrueRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/BooleanAnd/RemoveAndTrueRector/config/configured_rule.php index c256b94c7a1..c563296bef1 100644 --- a/rules-tests/DeadCode/Rector/BooleanAnd/RemoveAndTrueRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/BooleanAnd/RemoveAndTrueRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAndTrueRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/config/configured_rule.php index 6326d960879..31cab9f5d96 100644 --- a/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Cast\RecastingRemovalRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RecastingRemovalRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector/config/configured_rule.php index 7f2a11a57d6..6f5b737bddc 100644 --- a/rules-tests/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivateClassConstantRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassLike/RemoveAnnotationRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassLike/RemoveAnnotationRector/config/configured_rule.php index fb01dd0ac9f..fa3f0fd377f 100644 --- a/rules-tests/DeadCode/Rector/ClassLike/RemoveAnnotationRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassLike/RemoveAnnotationRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassLike\RemoveAnnotationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAnnotationRector::class) ->configure(['method', 'JMS\DiExtraBundle\Annotation\InjectParams']); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/configured_rule.php index 7f582f019b8..6b526ddf6ee 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadConstructorRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/property_promotion.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/property_promotion.php index 7c1a550acd4..5d6a05aa43c 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/property_promotion.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDeadConstructorRector/config/property_promotion.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::PROPERTY_PROMOTION); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveDeadConstructorRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector/config/configured_rule.php index 19723e0ba6f..38e404838a5 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDelegatingParentCallRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/config/configured_rule.php index 3b472d8fb26..494ad3488ed 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveEmptyClassMethodRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/config/configured_rule.php index 78d74d585b7..f33f199bd06 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveLastReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveLastReturnRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector/config/configured_rule.php index b331ef78246..ce2352fa7c0 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedConstructorParamRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector/config/configured_rule.php index d9065d7701c..4204b99719e 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedParamInRequiredAutowireRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParamInRequiredAutowireRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedParamInRequiredAutowireRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/config/configured_rule.php index 96858d4dece..b4f13dd6f7f 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivateMethodParameterRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/config/configured_rule.php index 6fc2ca527db..8ef99c5ffc9 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivateMethodRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php index bc8c68489ca..75b57110352 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPromotedPropertyRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/config/configured_rule.php index 7fb340fa2e0..b040047a569 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUselessParamTagRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/config/configured_rule.php index ae7cb495526..008d7293e5b 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUselessReturnTagRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Concat/RemoveConcatAutocastRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Concat/RemoveConcatAutocastRector/config/configured_rule.php index e7e50a642d0..55d48679694 100644 --- a/rules-tests/DeadCode/Rector/Concat/RemoveConcatAutocastRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Concat/RemoveConcatAutocastRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveConcatAutocastRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/config/configured_rule.php index 06af04235ba..09678353a67 100644 --- a/rules-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\ValueObject\PhpVersion; use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemovePhpVersionIdCheckRector::class) ->configure([PhpVersion::PHP_80]); }; diff --git a/rules-tests/DeadCode/Rector/Expression/RemoveDeadStmtRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Expression/RemoveDeadStmtRector/config/configured_rule.php index 4174c31610d..83f9fa2677f 100644 --- a/rules-tests/DeadCode/Rector/Expression/RemoveDeadStmtRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Expression/RemoveDeadStmtRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadStmtRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Expression/SimplifyMirrorAssignRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Expression/SimplifyMirrorAssignRector/config/configured_rule.php index 97908453b34..1858e5b7ba3 100644 --- a/rules-tests/DeadCode/Rector/Expression/SimplifyMirrorAssignRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Expression/SimplifyMirrorAssignRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Expression\SimplifyMirrorAssignRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyMirrorAssignRector::class); }; diff --git a/rules-tests/DeadCode/Rector/For_/RemoveDeadContinueRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/For_/RemoveDeadContinueRector/config/configured_rule.php index 09e3988571d..59f10f333bb 100644 --- a/rules-tests/DeadCode/Rector/For_/RemoveDeadContinueRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/For_/RemoveDeadContinueRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\For_\RemoveDeadContinueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadContinueRector::class); }; diff --git a/rules-tests/DeadCode/Rector/For_/RemoveDeadIfForeachForRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/For_/RemoveDeadIfForeachForRector/config/configured_rule.php index 00c41026fde..57bdd44079f 100644 --- a/rules-tests/DeadCode/Rector/For_/RemoveDeadIfForeachForRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/For_/RemoveDeadIfForeachForRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\For_\RemoveDeadIfForeachForRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadIfForeachForRector::class); }; diff --git a/rules-tests/DeadCode/Rector/For_/RemoveDeadLoopRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/For_/RemoveDeadLoopRector/config/configured_rule.php index 5f7a6bb0adb..1fb99962437 100644 --- a/rules-tests/DeadCode/Rector/For_/RemoveDeadLoopRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/For_/RemoveDeadLoopRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\For_\RemoveDeadLoopRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadLoopRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Foreach_/RemoveUnusedForeachKeyRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Foreach_/RemoveUnusedForeachKeyRector/config/configured_rule.php index f332d93259f..3df1a109295 100644 --- a/rules-tests/DeadCode/Rector/Foreach_/RemoveUnusedForeachKeyRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Foreach_/RemoveUnusedForeachKeyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedForeachKeyRector::class); }; diff --git a/rules-tests/DeadCode/Rector/FunctionLike/RemoveCodeAfterReturnRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/FunctionLike/RemoveCodeAfterReturnRector/config/configured_rule.php index cbbf503a51c..04543549d81 100644 --- a/rules-tests/DeadCode/Rector/FunctionLike/RemoveCodeAfterReturnRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/FunctionLike/RemoveCodeAfterReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\FunctionLike\RemoveCodeAfterReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveCodeAfterReturnRector::class); }; diff --git a/rules-tests/DeadCode/Rector/FunctionLike/RemoveDeadReturnRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/FunctionLike/RemoveDeadReturnRector/config/configured_rule.php index b36e8584b2c..b8c05b94896 100644 --- a/rules-tests/DeadCode/Rector/FunctionLike/RemoveDeadReturnRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/FunctionLike/RemoveDeadReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadReturnRector::class); }; diff --git a/rules-tests/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector/config/configured_rule.php index 4e67f59b2cf..cc542f2e025 100644 --- a/rules-tests/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\FunctionLike\RemoveDuplicatedIfReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDuplicatedIfReturnRector::class); }; diff --git a/rules-tests/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector/config/configured_rule.php index 21b0741dd09..753be0f7bf2 100644 --- a/rules-tests/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/FunctionLike/RemoveOverriddenValuesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\FunctionLike\RemoveOverriddenValuesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveOverriddenValuesRector::class); }; diff --git a/rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/config/configured_rule.php index 8d5fb7fb188..c928605a9fb 100644 --- a/rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAlwaysTrueIfConditionRector::class); }; diff --git a/rules-tests/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/config/configured_rule.php index be28c95d737..b96a661e88e 100644 --- a/rules-tests/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadInstanceOfRector::class); }; diff --git a/rules-tests/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/config/configured_rule.php index f3da86749f8..11f76767ad4 100644 --- a/rules-tests/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedNonEmptyArrayBeforeForeachRector::class); }; diff --git a/rules-tests/DeadCode/Rector/If_/SimplifyIfElseWithSameContentRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/If_/SimplifyIfElseWithSameContentRector/config/configured_rule.php index 14f54cbd11b..76f2450f8a5 100644 --- a/rules-tests/DeadCode/Rector/If_/SimplifyIfElseWithSameContentRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/If_/SimplifyIfElseWithSameContentRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyIfElseWithSameContentRector::class); }; diff --git a/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector/config/configured_rule.php index ef27e4184f9..db0fc0afdbc 100644 --- a/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfFunctionExistsRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfFunctionExistsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnwrapFutureCompatibleIfFunctionExistsRector::class); }; diff --git a/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/config/configured_rule.php index 91a5aa64917..a170e3ff3df 100644 --- a/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnwrapFutureCompatibleIfPhpVersionRector::class); }; diff --git a/rules-tests/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector/config/configured_rule.php index 5f14e35cd34..2fae84d55c2 100644 --- a/rules-tests/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveEmptyMethodCallRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/config/configured_rule.php index 1e2a61750d5..e31117e7999 100644 --- a/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveNonExistingVarAnnotationRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Plus/RemoveDeadZeroAndOneOperationRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Plus/RemoveDeadZeroAndOneOperationRector/config/configured_rule.php index 69b03c34b9e..e8afccf07c9 100644 --- a/rules-tests/DeadCode/Rector/Plus/RemoveDeadZeroAndOneOperationRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Plus/RemoveDeadZeroAndOneOperationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadZeroAndOneOperationRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule.php index d93bbeabaec..fe54de04e6c 100644 --- a/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivatePropertyRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule_skip_side_effect.php b/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule_skip_side_effect.php index 02870a10d0a..2b66b70642e 100644 --- a/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule_skip_side_effect.php +++ b/rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/config/configured_rule_skip_side_effect.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivatePropertyRector::class) ->configure([ RemoveUnusedPrivatePropertyRector::REMOVE_ASSIGN_SIDE_EFFECT => false, diff --git a/rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/config/configured_rule.php index b8493ab33e4..3ffe62a048e 100644 --- a/rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUselessVarTagRector::class); }; diff --git a/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/configured_rule.php index b70f3ca4f37..1b51d5e585a 100644 --- a/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveNullPropertyInitializationRector::class); }; diff --git a/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php b/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php index d7dfcaf20cb..2736e7d75a4 100644 --- a/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php +++ b/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveNullPropertyInitializationRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Return_/RemoveDeadConditionAboveReturnRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Return_/RemoveDeadConditionAboveReturnRector/config/configured_rule.php index 5e54cccbbfb..6876f819663 100644 --- a/rules-tests/DeadCode/Rector/Return_/RemoveDeadConditionAboveReturnRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Return_/RemoveDeadConditionAboveReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Return_\RemoveDeadConditionAboveReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadConditionAboveReturnRector::class); }; diff --git a/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/configured_rule.php index 002af576b8d..b056998a139 100644 --- a/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveParentCallWithoutParentRector::class); }; diff --git a/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/php74.php b/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/php74.php index 4ee6ecce394..add1be7a47e 100644 --- a/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/php74.php +++ b/rules-tests/DeadCode/Rector/StaticCall/RemoveParentCallWithoutParentRector/config/php74.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveParentCallWithoutParentRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/config/configured_rule.php index 884fdea7665..2a9487a2923 100644 --- a/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnreachableStatementRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/config/configured_rule.php index dde8b92e96f..c30a0772653 100644 --- a/rules-tests/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDuplicatedCaseInSwitchRector::class); }; diff --git a/rules-tests/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector/config/configured_rule.php index bb2e0544bcf..62849f68688 100644 --- a/rules-tests/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryToBooleanOrFalseToBooleanAndRector::class); }; diff --git a/rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/config/configured_rule.php index 274ac6e4b2f..63f21784189 100644 --- a/rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadTryCatchRector::class); }; diff --git a/rules-tests/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector/config/configured_rule.php b/rules-tests/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector/config/configured_rule.php index ede75f4be77..dd636751108 100644 --- a/rules-tests/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector/config/configured_rule.php +++ b/rules-tests/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DependencyInjection\Rector\ClassMethod\AddMethodParentCallRector; use Rector\Tests\DependencyInjection\Rector\ClassMethod\AddMethodParentCallRector\Source\ParentClassWithNewConstructor; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddMethodParentCallRector::class) ->configure([ ParentClassWithNewConstructor::class => '__construct', diff --git a/rules-tests/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector/config/configured_rule.php b/rules-tests/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector/config/configured_rule.php index 6357e174536..ccf69b25527 100644 --- a/rules-tests/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector/config/configured_rule.php +++ b/rules-tests/DependencyInjection/Rector/Class_/ActionInjectionToConstructorInjectionRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DependencyInjection\Rector\Class_\ActionInjectionToConstructorInjectionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::SYMFONY_CONTAINER_XML_PATH_PARAMETER, __DIR__ . '/../xml/services.xml'); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ActionInjectionToConstructorInjectionRector::class); }; diff --git a/rules-tests/DowngradePhp53/Rector/Dir/DirConstToFileConstRector/config/configured_rule.php b/rules-tests/DowngradePhp53/Rector/Dir/DirConstToFileConstRector/config/configured_rule.php index fee5fa48bd3..6e8a60f28a5 100644 --- a/rules-tests/DowngradePhp53/Rector/Dir/DirConstToFileConstRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp53/Rector/Dir/DirConstToFileConstRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp53\Rector\Dir\DirConstToFileConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DirConstToFileConstRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/Array_/ShortArrayToLongArrayRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/Array_/ShortArrayToLongArrayRector/config/configured_rule.php index beb2efc62c3..49eb937d1d1 100644 --- a/rules-tests/DowngradePhp54/Rector/Array_/ShortArrayToLongArrayRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/Array_/ShortArrayToLongArrayRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\Array_\ShortArrayToLongArrayRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ShortArrayToLongArrayRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/Closure/DowngradeStaticClosureRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/Closure/DowngradeStaticClosureRector/config/configured_rule.php index 63c1cb0ddb5..d07898350fc 100644 --- a/rules-tests/DowngradePhp54/Rector/Closure/DowngradeStaticClosureRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/Closure/DowngradeStaticClosureRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\Closure\DowngradeStaticClosureRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStaticClosureRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/Closure/DowngradeThisInClosureRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/Closure/DowngradeThisInClosureRector/config/configured_rule.php index 3c28d33f459..aac2c35ca95 100644 --- a/rules-tests/DowngradePhp54/Rector/Closure/DowngradeThisInClosureRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/Closure/DowngradeThisInClosureRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\Closure\DowngradeThisInClosureRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeThisInClosureRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/FuncCall/DowngradeIndirectCallByArrayRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/FuncCall/DowngradeIndirectCallByArrayRector/config/configured_rule.php index 3fa904c5efb..4390280e468 100644 --- a/rules-tests/DowngradePhp54/Rector/FuncCall/DowngradeIndirectCallByArrayRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/FuncCall/DowngradeIndirectCallByArrayRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\FuncCall\DowngradeIndirectCallByArrayRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeIndirectCallByArrayRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/FunctionLike/DowngradeCallableTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/FunctionLike/DowngradeCallableTypeDeclarationRector/config/configured_rule.php index 7bbaac799ba..574dd0149a5 100644 --- a/rules-tests/DowngradePhp54/Rector/FunctionLike/DowngradeCallableTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/FunctionLike/DowngradeCallableTypeDeclarationRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\FunctionLike\DowngradeCallableTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeCallableTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/LNumber/DowngradeBinaryNotationRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/LNumber/DowngradeBinaryNotationRector/config/configured_rule.php index aa363a664a0..f59a45bf55b 100644 --- a/rules-tests/DowngradePhp54/Rector/LNumber/DowngradeBinaryNotationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/LNumber/DowngradeBinaryNotationRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\LNumber\DowngradeBinaryNotationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeBinaryNotationRector::class); }; diff --git a/rules-tests/DowngradePhp54/Rector/MethodCall/DowngradeInstanceMethodCallRector/config/configured_rule.php b/rules-tests/DowngradePhp54/Rector/MethodCall/DowngradeInstanceMethodCallRector/config/configured_rule.php index 9a26706bdfb..33aef0fe658 100644 --- a/rules-tests/DowngradePhp54/Rector/MethodCall/DowngradeInstanceMethodCallRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp54/Rector/MethodCall/DowngradeInstanceMethodCallRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp54\Rector\MethodCall\DowngradeInstanceMethodCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeInstanceMethodCallRector::class); }; diff --git a/rules-tests/DowngradePhp55/Rector/ClassConstFetch/DowngradeClassConstantToStringRector/config/configured_rule.php b/rules-tests/DowngradePhp55/Rector/ClassConstFetch/DowngradeClassConstantToStringRector/config/configured_rule.php index 71d05d74d79..c927d90ff4b 100644 --- a/rules-tests/DowngradePhp55/Rector/ClassConstFetch/DowngradeClassConstantToStringRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp55/Rector/ClassConstFetch/DowngradeClassConstantToStringRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp55\Rector\ClassConstFetch\DowngradeClassConstantToStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeClassConstantToStringRector::class); }; diff --git a/rules-tests/DowngradePhp55/Rector/Foreach_/DowngradeForeachListRector/config/configured_rule.php b/rules-tests/DowngradePhp55/Rector/Foreach_/DowngradeForeachListRector/config/configured_rule.php index e2a61df2573..b7d17f7ac1c 100644 --- a/rules-tests/DowngradePhp55/Rector/Foreach_/DowngradeForeachListRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp55/Rector/Foreach_/DowngradeForeachListRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp55\Rector\Foreach_\DowngradeForeachListRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeForeachListRector::class); }; diff --git a/rules-tests/DowngradePhp55/Rector/FuncCall/DowngradeBoolvalRector/config/configured_rule.php b/rules-tests/DowngradePhp55/Rector/FuncCall/DowngradeBoolvalRector/config/configured_rule.php index 0ac1788b2b5..c797a5d6bc2 100644 --- a/rules-tests/DowngradePhp55/Rector/FuncCall/DowngradeBoolvalRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp55/Rector/FuncCall/DowngradeBoolvalRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp55\Rector\FuncCall\DowngradeBoolvalRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeBoolvalRector::class); }; diff --git a/rules-tests/DowngradePhp55/Rector/Isset_/DowngradeArbitraryExpressionArgsToEmptyAndIssetRector/config/configured_rule.php b/rules-tests/DowngradePhp55/Rector/Isset_/DowngradeArbitraryExpressionArgsToEmptyAndIssetRector/config/configured_rule.php index 184692f4f2f..52ed8d1d548 100644 --- a/rules-tests/DowngradePhp55/Rector/Isset_/DowngradeArbitraryExpressionArgsToEmptyAndIssetRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp55/Rector/Isset_/DowngradeArbitraryExpressionArgsToEmptyAndIssetRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp55\Rector\Isset_\DowngradeArbitraryExpressionArgsToEmptyAndIssetRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArbitraryExpressionArgsToEmptyAndIssetRector::class); }; diff --git a/rules-tests/DowngradePhp56/Rector/CallLike/DowngradeArgumentUnpackingRector/config/configured_rule.php b/rules-tests/DowngradePhp56/Rector/CallLike/DowngradeArgumentUnpackingRector/config/configured_rule.php index 1ce761aa9f7..8063b958610 100644 --- a/rules-tests/DowngradePhp56/Rector/CallLike/DowngradeArgumentUnpackingRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp56/Rector/CallLike/DowngradeArgumentUnpackingRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp56\Rector\CallLike\DowngradeArgumentUnpackingRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArgumentUnpackingRector::class); }; diff --git a/rules-tests/DowngradePhp56/Rector/FuncCall/DowngradeArrayFilterUseConstantRector/config/configured_rule.php b/rules-tests/DowngradePhp56/Rector/FuncCall/DowngradeArrayFilterUseConstantRector/config/configured_rule.php index 4163099a6eb..b51eefbea1b 100644 --- a/rules-tests/DowngradePhp56/Rector/FuncCall/DowngradeArrayFilterUseConstantRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp56/Rector/FuncCall/DowngradeArrayFilterUseConstantRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp56\Rector\FuncCall\DowngradeArrayFilterUseConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArrayFilterUseConstantRector::class); }; diff --git a/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialAssignmentOperatorRector/config/configured_rule.php b/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialAssignmentOperatorRector/config/configured_rule.php index 55e0b727045..2033a49ec5a 100644 --- a/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialAssignmentOperatorRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialAssignmentOperatorRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp56\Rector\Pow\DowngradeExponentialAssignmentOperatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeExponentialAssignmentOperatorRector::class); }; diff --git a/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialOperatorRector/config/configured_rule.php b/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialOperatorRector/config/configured_rule.php index 149d999b645..48a875a408c 100644 --- a/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialOperatorRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp56/Rector/Pow/DowngradeExponentialOperatorRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp56\Rector\Pow\DowngradeExponentialOperatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeExponentialOperatorRector::class); }; diff --git a/rules-tests/DowngradePhp56/Rector/Use_/DowngradeUseFunctionRector/config/configured_rule.php b/rules-tests/DowngradePhp56/Rector/Use_/DowngradeUseFunctionRector/config/configured_rule.php index b9ea976b643..7b48ce2a21e 100644 --- a/rules-tests/DowngradePhp56/Rector/Use_/DowngradeUseFunctionRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp56/Rector/Use_/DowngradeUseFunctionRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp56\Rector\Use_\DowngradeUseFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeUseFunctionRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeParentTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeParentTypeDeclarationRector/config/configured_rule.php index e08ae8c9ef2..95068911de2 100644 --- a/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeParentTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeParentTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\ClassMethod\DowngradeParentTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeParentTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector/config/configured_rule.php index 998280dd2d3..a279ec07348 100644 --- a/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/ClassMethod/DowngradeSelfTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\ClassMethod\DowngradeSelfTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeSelfTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector/config/php_70.php index 562ffde3212..83d8a90febc 100644 --- a/rules-tests/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\Coalesce\DowngradeNullCoalesceRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeNullCoalesceRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/Declare_/DowngradeStrictTypeDeclarationRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/Declare_/DowngradeStrictTypeDeclarationRector/config/php_70.php index 1adc8c70d2d..b6ae23ee1f5 100644 --- a/rules-tests/DowngradePhp70/Rector/Declare_/DowngradeStrictTypeDeclarationRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/Declare_/DowngradeStrictTypeDeclarationRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\Declare_\DowngradeStrictTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeStrictTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/Expr/DowngradeUnnecessarilyParenthesizedExpressionRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/Expr/DowngradeUnnecessarilyParenthesizedExpressionRector/config/configured_rule.php index c1074c64041..cd55b65626a 100644 --- a/rules-tests/DowngradePhp70/Rector/Expr/DowngradeUnnecessarilyParenthesizedExpressionRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/Expr/DowngradeUnnecessarilyParenthesizedExpressionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\Expr\DowngradeUnnecessarilyParenthesizedExpressionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeUnnecessarilyParenthesizedExpressionRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/Expression/DowngradeDefineArrayConstantRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/Expression/DowngradeDefineArrayConstantRector/config/php_70.php index 79c4ed4380e..90fe929f904 100644 --- a/rules-tests/DowngradePhp70/Rector/Expression/DowngradeDefineArrayConstantRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/Expression/DowngradeDefineArrayConstantRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\Expression\DowngradeDefineArrayConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeDefineArrayConstantRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeDirnameLevelsRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeDirnameLevelsRector/config/configured_rule.php index 2abff2e095f..b70fe80c003 100644 --- a/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeDirnameLevelsRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeDirnameLevelsRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\FuncCall\DowngradeDirnameLevelsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeDirnameLevelsRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeSessionStartArrayOptionsRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeSessionStartArrayOptionsRector/config/php_70.php index 28133e8ca77..2dc0a353e46 100644 --- a/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeSessionStartArrayOptionsRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeSessionStartArrayOptionsRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\FuncCall\DowngradeSessionStartArrayOptionsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeSessionStartArrayOptionsRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeUncallableValueCallToCallUserFuncRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeUncallableValueCallToCallUserFuncRector/config/configured_rule.php index 208c49e4080..2f970021981 100644 --- a/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeUncallableValueCallToCallUserFuncRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/FuncCall/DowngradeUncallableValueCallToCallUserFuncRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\FuncCall\DowngradeUncallableValueCallToCallUserFuncRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeUncallableValueCallToCallUserFuncRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector/config/php_70.php index a05cf562dfe..5e1d2dcbcb7 100644 --- a/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeScalarTypeDeclarationRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeScalarTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeScalarTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector/config/configured_rule.php index 97b3725e0eb..31d32a6b741 100644 --- a/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/FunctionLike/DowngradeThrowableTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeThrowableTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeThrowableTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector/config/configured_rule.php index bcae6d26649..eb0b9324e87 100644 --- a/rules-tests/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\GroupUse\SplitGroupedUseImportsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SplitGroupedUseImportsRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/Instanceof_/DowngradeInstanceofThrowableRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/Instanceof_/DowngradeInstanceofThrowableRector/config/configured_rule.php index 682aac587f3..0886c7f166b 100644 --- a/rules-tests/DowngradePhp70/Rector/Instanceof_/DowngradeInstanceofThrowableRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/Instanceof_/DowngradeInstanceofThrowableRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\Instanceof_\DowngradeInstanceofThrowableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeInstanceofThrowableRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeClosureCallRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeClosureCallRector/config/configured_rule.php index d2dcdc5bfc0..72499ca1945 100644 --- a/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeClosureCallRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeClosureCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\MethodCall\DowngradeClosureCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeClosureCallRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeMethodCallOnCloneRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeMethodCallOnCloneRector/config/configured_rule.php index 7363cde46af..e1de5f8b093 100644 --- a/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeMethodCallOnCloneRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/MethodCall/DowngradeMethodCallOnCloneRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\MethodCall\DowngradeMethodCallOnCloneRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeMethodCallOnCloneRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector/config/php_70.php index 1936e8b5645..139d0e25b4a 100644 --- a/rules-tests/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/New_/DowngradeAnonymousClassRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\New_\DowngradeAnonymousClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeAnonymousClassRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector/config/php_70.php b/rules-tests/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector/config/php_70.php index 63ce1f297f3..4ef324109bf 100644 --- a/rules-tests/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector/config/php_70.php +++ b/rules-tests/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector/config/php_70.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp70\Rector\Spaceship\DowngradeSpaceshipRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::SCALAR_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeSpaceshipRector::class); }; diff --git a/rules-tests/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector/config/configured_rule.php index 839a5eb34af..fd6daec64f6 100644 --- a/rules-tests/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/String_/DowngradeGeneratedScalarTypesRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeScalarTypeDeclarationRector; use Rector\DowngradePhp70\Rector\String_\DowngradeGeneratedScalarTypesRector; use Rector\DowngradePhp71\Rector\FunctionLike\DowngradeVoidTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeGeneratedScalarTypesRector::class); // dependendent rules diff --git a/rules-tests/DowngradePhp70/Rector/TryCatch/DowngradeCatchThrowableRector/config/configured_rule.php b/rules-tests/DowngradePhp70/Rector/TryCatch/DowngradeCatchThrowableRector/config/configured_rule.php index a03dbadb157..946765de111 100644 --- a/rules-tests/DowngradePhp70/Rector/TryCatch/DowngradeCatchThrowableRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp70/Rector/TryCatch/DowngradeCatchThrowableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\TryCatch\DowngradeCatchThrowableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeCatchThrowableRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/Array_/SymmetricArrayDestructuringToListRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/Array_/SymmetricArrayDestructuringToListRector/config/configured_rule.php index 80a985fd4d8..9ab0cb7d694 100644 --- a/rules-tests/DowngradePhp71/Rector/Array_/SymmetricArrayDestructuringToListRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/Array_/SymmetricArrayDestructuringToListRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\Array_\SymmetricArrayDestructuringToListRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SymmetricArrayDestructuringToListRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/ClassConst/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/ClassConst/config/configured_rule.php index 52c9709b3ba..f9a0f357cd7 100644 --- a/rules-tests/DowngradePhp71/Rector/ClassConst/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/ClassConst/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\ClassConst\DowngradeClassConstantVisibilityRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeClassConstantVisibilityRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/ConstFetch/DowngradePhp71JsonConstRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/ConstFetch/DowngradePhp71JsonConstRector/config/configured_rule.php index cb8b200dcce..75cfeca4bde 100644 --- a/rules-tests/DowngradePhp71/Rector/ConstFetch/DowngradePhp71JsonConstRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/ConstFetch/DowngradePhp71JsonConstRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\ConstFetch\DowngradePhp71JsonConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePhp71JsonConstRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/FuncCall/DowngradeIsIterableRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/FuncCall/DowngradeIsIterableRector/config/configured_rule.php index d57363695ef..9110d31807a 100644 --- a/rules-tests/DowngradePhp71/Rector/FuncCall/DowngradeIsIterableRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/FuncCall/DowngradeIsIterableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\FuncCall\DowngradeIsIterableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeIsIterableRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector/config/configured_rule.php index 074fe63ec55..d43ad198cf2 100644 --- a/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeIterablePseudoTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\FunctionLike\DowngradeIterablePseudoTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeIterablePseudoTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector/config/configured_rule.php index 1cc51959316..bde504935e8 100644 --- a/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeNullableTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\FunctionLike\DowngradeNullableTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNullableTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector/config/configured_rule.php index 0349e370232..52cce082a13 100644 --- a/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/FunctionLike/DowngradeVoidTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\FunctionLike\DowngradeVoidTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeVoidTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/List_/DowngradeKeysInListRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/List_/DowngradeKeysInListRector/config/configured_rule.php index fcfda2fb821..c6e77fb0126 100644 --- a/rules-tests/DowngradePhp71/Rector/List_/DowngradeKeysInListRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/List_/DowngradeKeysInListRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\List_\DowngradeKeysInListRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeKeysInListRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/StaticCall/DowngradeClosureFromCallableRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/StaticCall/DowngradeClosureFromCallableRector/config/configured_rule.php index 4329b9632c7..7eed5ee9db7 100644 --- a/rules-tests/DowngradePhp71/Rector/StaticCall/DowngradeClosureFromCallableRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/StaticCall/DowngradeClosureFromCallableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\StaticCall\DowngradeClosureFromCallableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeClosureFromCallableRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/String_/DowngradeNegativeStringOffsetToStrlenRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/String_/DowngradeNegativeStringOffsetToStrlenRector/config/configured_rule.php index 962d1e277bb..d89b580bf6a 100644 --- a/rules-tests/DowngradePhp71/Rector/String_/DowngradeNegativeStringOffsetToStrlenRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/String_/DowngradeNegativeStringOffsetToStrlenRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\String_\DowngradeNegativeStringOffsetToStrlenRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNegativeStringOffsetToStrlenRector::class); }; diff --git a/rules-tests/DowngradePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/config/configured_rule.php b/rules-tests/DowngradePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/config/configured_rule.php index 7b31f97f361..03af8e69f33 100644 --- a/rules-tests/DowngradePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DowngradePhp71\Rector\TryCatch\DowngradePipeToMultiCatchExceptionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::MULTI_EXCEPTION_CATCH - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradePipeToMultiCatchExceptionRector::class); }; diff --git a/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/configured_rule.php b/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/configured_rule.php index 7c48a563cdd..885a2234cdf 100644 --- a/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/configured_rule.php @@ -3,12 +3,12 @@ declare(strict_types=1); use Psr\Container\ContainerInterface; +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector; use Rector\Tests\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector\Fixture\SomeContainerInterface; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeParameterTypeWideningRector::class) ->configure([ diff --git a/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/empty_config.php b/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/empty_config.php index 1a28d49781f..fd7ab8b587d 100644 --- a/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/empty_config.php +++ b/rules-tests/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector/config/empty_config.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeParameterTypeWideningRector::class); }; diff --git a/rules-tests/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector/config/configured_rule.php b/rules-tests/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector/config/configured_rule.php index 47f842a4f6b..2c4fa54cbed 100644 --- a/rules-tests/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\ConstFetch\DowngradePhp72JsonConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePhp72JsonConstRector::class); }; diff --git a/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/config/configured_rule.php b/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/config/configured_rule.php index ac943738d35..b3dec69fd9f 100644 --- a/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeJsonDecodeNullAssociativeArgRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\FuncCall\DowngradeJsonDecodeNullAssociativeArgRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeJsonDecodeNullAssociativeArgRector::class); }; diff --git a/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector/config/configured_rule.php b/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector/config/configured_rule.php index 9bd46f842af..874880aef19 100644 --- a/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\FuncCall\DowngradePregUnmatchedAsNullConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePregUnmatchedAsNullConstantRector::class); }; diff --git a/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector/config/configured_rule.php b/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector/config/configured_rule.php index ae006d2a6db..5cff57eb441 100644 --- a/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp72/Rector/FuncCall/DowngradeStreamIsattyRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\FuncCall\DowngradeStreamIsattyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStreamIsattyRector::class); }; diff --git a/rules-tests/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector/config/configured_rule.php index 569fbf98b39..2a273e05bbc 100644 --- a/rules-tests/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp72/Rector/FunctionLike/DowngradeObjectTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\FunctionLike\DowngradeObjectTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeObjectTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector/config/configured_rule.php index 31479aeeaa6..6429ff3c93f 100644 --- a/rules-tests/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\ConstFetch\DowngradePhp73JsonConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePhp73JsonConstRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeArrayKeyFirstLastRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeArrayKeyFirstLastRector/config/configured_rule.php index e9ff85616f5..46d0a1a1fc3 100644 --- a/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeArrayKeyFirstLastRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeArrayKeyFirstLastRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\FuncCall\DowngradeArrayKeyFirstLastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArrayKeyFirstLastRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeIsCountableRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeIsCountableRector/config/configured_rule.php index 5d685b0d65b..52664a0fd3b 100644 --- a/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeIsCountableRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeIsCountableRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\FuncCall\DowngradeIsCountableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeIsCountableRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/config/configured_rule.php index 6fd54b9cc09..239c46d7282 100644 --- a/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeTrailingCommasInFunctionCallsRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector/config/configured_rule.php index e4acc1c764e..46d1ea7a6da 100644 --- a/rules-tests/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\FuncCall\SetCookieOptionsArrayToArgumentsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SetCookieOptionsArrayToArgumentsRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector/config/configured_rule.php index 656a4ad72a1..f383a03ceae 100644 --- a/rules-tests/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\List_\DowngradeListReferenceAssignmentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeListReferenceAssignmentRector::class); }; diff --git a/rules-tests/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector/config/configured_rule.php b/rules-tests/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector/config/configured_rule.php index be8562f8b53..f8257026f46 100644 --- a/rules-tests/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp73\Rector\String_\DowngradeFlexibleHeredocSyntaxRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeFlexibleHeredocSyntaxRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector/config/configured_rule.php index 8cbe3314640..63e607bf097 100644 --- a/rules-tests/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Array_\DowngradeArraySpreadRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArraySpreadRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/config/configured_rule.php index 4828bd96523..f8f1fa78b63 100644 --- a/rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\ArrowFunction\ArrowFunctionToAnonymousFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrowFunctionToAnonymousFunctionRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector/config/configured_rule.php index 6cccb6c48ad..48809fd9f3c 100644 --- a/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\ClassMethod\DowngradeContravariantArgumentTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeContravariantArgumentTypeRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector/config/configured_rule.php index ea2509cc6c9..6648f32697d 100644 --- a/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\ClassMethod\DowngradeCovariantReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeCovariantReturnTypeRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector/config/configured_rule.php index 7a0a3b5b474..5a946879a3c 100644 --- a/rules-tests/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Coalesce\DowngradeNullCoalescingOperatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNullCoalescingOperatorRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeArrayMergeCallWithoutArgumentsRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeArrayMergeCallWithoutArgumentsRector/config/configured_rule.php index 0938e129657..ac788758ea3 100644 --- a/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeArrayMergeCallWithoutArgumentsRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeArrayMergeCallWithoutArgumentsRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\FuncCall\DowngradeArrayMergeCallWithoutArgumentsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArrayMergeCallWithoutArgumentsRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector/config/configured_rule.php index 87beaabc34a..08f6746a7f7 100644 --- a/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\FuncCall\DowngradeStripTagsCallWithArrayRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStripTagsCallWithArrayRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/Identical/DowngradeFreadFwriteFalsyToNegationRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/Identical/DowngradeFreadFwriteFalsyToNegationRector/config/configured_rule.php index 9f613b1a9ef..9325fa010ec 100644 --- a/rules-tests/DowngradePhp74/Rector/Identical/DowngradeFreadFwriteFalsyToNegationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/Identical/DowngradeFreadFwriteFalsyToNegationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Identical\DowngradeFreadFwriteFalsyToNegationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeFreadFwriteFalsyToNegationRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/Interface_/DowngradePreviouslyImplementedInterfaceRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/Interface_/DowngradePreviouslyImplementedInterfaceRector/config/configured_rule.php index 1a733a7801d..c9d88490776 100644 --- a/rules-tests/DowngradePhp74/Rector/Interface_/DowngradePreviouslyImplementedInterfaceRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/Interface_/DowngradePreviouslyImplementedInterfaceRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Interface_\DowngradePreviouslyImplementedInterfaceRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePreviouslyImplementedInterfaceRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/LNumber/DowngradeNumericLiteralSeparatorRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/LNumber/DowngradeNumericLiteralSeparatorRector/config/configured_rule.php index def41ac90de..975f9801311 100644 --- a/rules-tests/DowngradePhp74/Rector/LNumber/DowngradeNumericLiteralSeparatorRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/LNumber/DowngradeNumericLiteralSeparatorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\LNumber\DowngradeNumericLiteralSeparatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNumericLiteralSeparatorRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector/config/configured_rule.php index 268fff80151..80d85f89e60 100644 --- a/rules-tests/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\MethodCall\DowngradeReflectionGetTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeReflectionGetTypeRector::class); }; diff --git a/rules-tests/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector/config/configured_rule.php b/rules-tests/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector/config/configured_rule.php index e7bec05beb2..acb6631e422 100644 --- a/rules-tests/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp74/Rector/Property/DowngradeTypedPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeTypedPropertyRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ArrayDimFetch/DowngradeDereferenceableOperationRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ArrayDimFetch/DowngradeDereferenceableOperationRector/config/configured_rule.php index 252085dfce2..afe9a6aa040 100644 --- a/rules-tests/DowngradePhp80/Rector/ArrayDimFetch/DowngradeDereferenceableOperationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ArrayDimFetch/DowngradeDereferenceableOperationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ArrayDimFetch\DowngradeDereferenceableOperationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeDereferenceableOperationRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/Catch_/DowngradeNonCapturingCatchesRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Catch_/DowngradeNonCapturingCatchesRector/config/configured_rule.php index 22560f81dd3..f68f0872fb0 100644 --- a/rules-tests/DowngradePhp80/Rector/Catch_/DowngradeNonCapturingCatchesRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Catch_/DowngradeNonCapturingCatchesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Catch_\DowngradeNonCapturingCatchesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNonCapturingCatchesRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ClassConstFetch/DowngradeClassOnObjectToGetClassRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ClassConstFetch/DowngradeClassOnObjectToGetClassRector/config/configured_rule.php index 96345893e50..5930ae2d23e 100644 --- a/rules-tests/DowngradePhp80/Rector/ClassConstFetch/DowngradeClassOnObjectToGetClassRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ClassConstFetch/DowngradeClassOnObjectToGetClassRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ClassConstFetch\DowngradeClassOnObjectToGetClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeClassOnObjectToGetClassRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector/config/configured_rule.php index e7c7888c597..bdcdb32b8b8 100644 --- a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeAbstractPrivateMethodInTraitRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeAbstractPrivateMethodInTraitRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeAbstractPrivateMethodInTraitRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeRecursiveDirectoryIteratorHasChildrenRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeRecursiveDirectoryIteratorHasChildrenRector/config/configured_rule.php index 88fc3dffe4f..86800f498af 100644 --- a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeRecursiveDirectoryIteratorHasChildrenRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeRecursiveDirectoryIteratorHasChildrenRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeRecursiveDirectoryIteratorHasChildrenRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeRecursiveDirectoryIteratorHasChildrenRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector/config/configured_rule.php index 9f8b68194af..9a43162d95b 100644 --- a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStaticTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeStaticTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStaticTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStringReturnTypeOnToStringRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStringReturnTypeOnToStringRector/config/configured_rule.php index 4260443d892..8a7eef1e7d5 100644 --- a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStringReturnTypeOnToStringRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeStringReturnTypeOnToStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeStringReturnTypeOnToStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStringReturnTypeOnToStringRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector/config/configured_rule.php index f8d57f8fc3f..d9316dc20bd 100644 --- a/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeTrailingCommasInParamUseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeTrailingCommasInParamUseRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/config/configured_rule.php index d05ec92d6c0..400792bfe0b 100644 --- a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector; use Rector\DowngradePhp80\ValueObject\DowngradeAttributeToAnnotation; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeAttributeToAnnotationRector::class) ->configure([ diff --git a/rules-tests/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector/config/configured_rule.php index b6f865b0446..fa17c7f209d 100644 --- a/rules-tests/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Class_\DowngradePropertyPromotionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePropertyPromotionRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/config/configured_rule.php index 5c76614020c..cae62af9a8b 100644 --- a/rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Expression\DowngradeMatchToSwitchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeMatchToSwitchRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/config/configured_rule.php index a1435f34f49..f6a070bd6ee 100644 --- a/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Expression\DowngradeThrowExprRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeThrowExprRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeArrayFilterNullableCallbackRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeArrayFilterNullableCallbackRector/config/configured_rule.php index a30ffab25e8..e338bcc28ec 100644 --- a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeArrayFilterNullableCallbackRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeArrayFilterNullableCallbackRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FuncCall\DowngradeArrayFilterNullableCallbackRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArrayFilterNullableCallbackRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeNumberFormatNoFourthArgRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeNumberFormatNoFourthArgRector/config/configured_rule.php index 5bf3be12aa1..e790986cd21 100644 --- a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeNumberFormatNoFourthArgRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeNumberFormatNoFourthArgRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FuncCall\DowngradeNumberFormatNoFourthArgRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNumberFormatNoFourthArgRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector/config/configured_rule.php index 0b0208a8ea6..497c1a2712f 100644 --- a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrContainsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStrContainsRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/config/configured_rule.php index f9eac39333f..1b55cce02f7 100644 --- a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStrEndsWithRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/config/configured_rule.php index fb6b188a167..e1af6537f6b 100644 --- a/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStrStartsWithRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector/config/configured_rule.php index 764818fef5a..c638ef4a27b 100644 --- a/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeMixedTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeMixedTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeMixedTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/config/configured_rule.php index 947525cf0ce..4fdb10cbb97 100644 --- a/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeUnionTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/Instanceof_/DowngradePhp80ResourceReturnToObjectRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Instanceof_/DowngradePhp80ResourceReturnToObjectRector/config/configured_rule.php index e222d5a4ccd..aa3d8b2d9bb 100644 --- a/rules-tests/DowngradePhp80/Rector/Instanceof_/DowngradePhp80ResourceReturnToObjectRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Instanceof_/DowngradePhp80ResourceReturnToObjectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Instanceof_\DowngradePhp80ResourceReturnToObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePhp80ResourceReturnToObjectRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector/config/configured_rule.php index 485dbdbc018..164b16f923a 100644 --- a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\MethodCall\DowngradeNamedArgumentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNamedArgumentRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector/config/configured_rule.php index a808e7dde0a..3d3ea22a4aa 100644 --- a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\MethodCall\DowngradeReflectionClassGetConstantsFilterRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeReflectionClassGetConstantsFilterRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector/config/configured_rule.php index 23bae0a8a87..de9e85cc704 100644 --- a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\MethodCall\DowngradeReflectionGetAttributesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeReflectionGetAttributesRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionPropertyGetDefaultValueRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionPropertyGetDefaultValueRector/config/configured_rule.php index ea78efc87d3..a1100636f16 100644 --- a/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionPropertyGetDefaultValueRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/MethodCall/DowngradeReflectionPropertyGetDefaultValueRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\MethodCall\DowngradeReflectionPropertyGetDefaultValueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeReflectionPropertyGetDefaultValueRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector/config/configured_rule.php index 428ca9fc6ba..4a3be969704 100644 --- a/rules-tests/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\New_\DowngradeArbitraryExpressionsSupportRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArbitraryExpressionsSupportRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector/config/configured_rule.php index fbf2e859529..d8d636d67d1 100644 --- a/rules-tests/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\NullsafeMethodCall\DowngradeNullsafeToTernaryOperatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNullsafeToTernaryOperatorRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector/config/configured_rule.php index eebeb219976..4ddf02d859d 100644 --- a/rules-tests/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/Property/DowngradeUnionTypeTypedPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\Property\DowngradeUnionTypeTypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeUnionTypeTypedPropertyRector::class); }; diff --git a/rules-tests/DowngradePhp80/Rector/StaticCall/DowngradePhpTokenRector/config/configured_rule.php b/rules-tests/DowngradePhp80/Rector/StaticCall/DowngradePhpTokenRector/config/configured_rule.php index a27eae3a475..51ca2eaf292 100644 --- a/rules-tests/DowngradePhp80/Rector/StaticCall/DowngradePhpTokenRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp80/Rector/StaticCall/DowngradePhpTokenRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\StaticCall\DowngradePhpTokenRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePhpTokenRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/Array_/DowngradeArraySpreadStringKeyRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/Array_/DowngradeArraySpreadStringKeyRector/config/configured_rule.php index 99581666f84..715a1e763af 100644 --- a/rules-tests/DowngradePhp81/Rector/Array_/DowngradeArraySpreadStringKeyRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/Array_/DowngradeArraySpreadStringKeyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\Array_\DowngradeArraySpreadStringKeyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArraySpreadStringKeyRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector/config/configured_rule.php index 50341bb3c68..3a7117ffa44 100644 --- a/rules-tests/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/ClassConst/DowngradeFinalizePublicClassConstantRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\ClassConst\DowngradeFinalizePublicClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeFinalizePublicClassConstantRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/config/configured_rule.php index 1278f28fd37..f07668f3eb6 100644 --- a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeArrayIsListRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\FuncCall\DowngradeArrayIsListRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeArrayIsListRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeFirstClassCallableSyntaxRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeFirstClassCallableSyntaxRector/config/configured_rule.php index aeae110d2ca..d08e10cfd47 100644 --- a/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeFirstClassCallableSyntaxRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/FuncCall/DowngradeFirstClassCallableSyntaxRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\FuncCall\DowngradeFirstClassCallableSyntaxRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeFirstClassCallableSyntaxRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNeverTypeDeclarationRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNeverTypeDeclarationRector/config/configured_rule.php index e89cb9fb20e..51a359cc3d9 100644 --- a/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNeverTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNeverTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\FunctionLike\DowngradeNeverTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNeverTypeDeclarationRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNewInInitializerRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNewInInitializerRector/config/configured_rule.php index 8042a22d0bb..f72e5008d1b 100644 --- a/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNewInInitializerRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradeNewInInitializerRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\FunctionLike\DowngradeNewInInitializerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNewInInitializerRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradePureIntersectionTypeRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradePureIntersectionTypeRector/config/configured_rule.php index 0a669405ee5..78e94f824da 100644 --- a/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradePureIntersectionTypeRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/FunctionLike/DowngradePureIntersectionTypeRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\FunctionLike\DowngradePureIntersectionTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePureIntersectionTypeRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/Instanceof_/DowngradePhp81ResourceReturnToObjectRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/Instanceof_/DowngradePhp81ResourceReturnToObjectRector/config/configured_rule.php index 12945f16f64..5402f460d21 100644 --- a/rules-tests/DowngradePhp81/Rector/Instanceof_/DowngradePhp81ResourceReturnToObjectRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/Instanceof_/DowngradePhp81ResourceReturnToObjectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\Instanceof_\DowngradePhp81ResourceReturnToObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradePhp81ResourceReturnToObjectRector::class); }; diff --git a/rules-tests/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector/config/configured_rule.php b/rules-tests/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector/config/configured_rule.php index df2f1a10d6d..3e30c0df43c 100644 --- a/rules-tests/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector/config/configured_rule.php +++ b/rules-tests/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp81\Rector\Property\DowngradeReadonlyPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeReadonlyPropertyRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector/config/configured_rule.php index 6f729931e43..df0eac84c72 100644 --- a/rules-tests/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeNestedForeachIfsToEarlyContinueRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/Foreach_/ReturnAfterToEarlyOnBreakRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/Foreach_/ReturnAfterToEarlyOnBreakRector/config/configured_rule.php index cbf017bc01a..80e3b126ca4 100644 --- a/rules-tests/EarlyReturn/Rector/Foreach_/ReturnAfterToEarlyOnBreakRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/Foreach_/ReturnAfterToEarlyOnBreakRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Foreach_\ReturnAfterToEarlyOnBreakRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnAfterToEarlyOnBreakRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/config/configured_rule.php index 5be9f97016a..5777b0f85cd 100644 --- a/rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeAndIfToEarlyReturnRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector/config/configured_rule.php index 90495cbe0b9..99f8b4d4746 100644 --- a/rules-tests/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector/config/configured_rule.php index 3896dcc952b..20bc39da067 100644 --- a/rules-tests/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeNestedIfsToEarlyReturnRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector/config/configured_rule.php index a21453a9377..8dd23299843 100644 --- a/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeOrIfContinueToMultiContinueRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector/config/configured_rule.php index b672e1f01ea..166544edfbc 100644 --- a/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeOrIfReturnToEarlyReturnRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/config/configured_rule.php index 0c5a0a67049..5c1f885acee 100644 --- a/rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAlwaysElseRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector/config/configured_rule.php index 6f08cbf89af..86a9cb2c137 100644 --- a/rules-tests/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PreparedValueToEarlyReturnRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector/config/configured_rule.php index efa13bdcc12..533cc825258 100644 --- a/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryAndToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Return_\ReturnBinaryAndToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnBinaryAndToEarlyReturnRector::class); }; diff --git a/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector/config/configured_rule.php b/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector/config/configured_rule.php index e522e37fe0d..653d1561361 100644 --- a/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector/config/configured_rule.php +++ b/rules-tests/EarlyReturn/Rector/Return_/ReturnBinaryOrToEarlyReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnBinaryOrToEarlyReturnRector::class); }; diff --git a/rules-tests/MysqlToMysqli/Rector/Assign/MysqlAssignToMysqliRector/config/configured_rule.php b/rules-tests/MysqlToMysqli/Rector/Assign/MysqlAssignToMysqliRector/config/configured_rule.php index 9deaabf2497..94b81db9784 100644 --- a/rules-tests/MysqlToMysqli/Rector/Assign/MysqlAssignToMysqliRector/config/configured_rule.php +++ b/rules-tests/MysqlToMysqli/Rector/Assign/MysqlAssignToMysqliRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\MysqlToMysqli\Rector\Assign\MysqlAssignToMysqliRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MysqlAssignToMysqliRector::class); }; diff --git a/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector/config/configured_rule.php b/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector/config/configured_rule.php index 03c73394e5c..1ffe9c86ec9 100644 --- a/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector/config/configured_rule.php +++ b/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\MysqlToMysqli\Rector\FuncCall\MysqlFuncCallToMysqliRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MysqlFuncCallToMysqliRector::class); }; diff --git a/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/config/configured_rule.php b/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/config/configured_rule.php index d0553fa4ab4..b0b7e35d261 100644 --- a/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/config/configured_rule.php +++ b/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlPConnectToMysqliConnectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\MysqlToMysqli\Rector\FuncCall\MysqlPConnectToMysqliConnectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MysqlPConnectToMysqliConnectRector::class); }; diff --git a/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector/config/configured_rule.php b/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector/config/configured_rule.php index 8840e3f5dd5..1e60d3d7cc7 100644 --- a/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector/config/configured_rule.php +++ b/rules-tests/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\MysqlToMysqli\Rector\FuncCall\MysqlQueryMysqlErrorWithLinkRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MysqlQueryMysqlErrorWithLinkRector::class); }; diff --git a/rules-tests/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php b/rules-tests/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php index f8566dba41f..6b510a2d32f 100644 --- a/rules-tests/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php +++ b/rules-tests/Naming/Rector/Assign/RenameVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Assign\RenameVariableToMatchMethodCallReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameVariableToMatchMethodCallReturnTypeRector::class); }; diff --git a/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/config/configured_rule.php b/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/config/configured_rule.php index 7e59e832e0f..cc1a792d091 100644 --- a/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/config/configured_rule.php +++ b/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameParamToMatchTypeRector::class); }; diff --git a/rules-tests/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector/config/configured_rule.php b/rules-tests/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector/config/configured_rule.php index 3751108b907..375be0149ad 100644 --- a/rules-tests/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector/config/configured_rule.php +++ b/rules-tests/Naming/Rector/ClassMethod/RenameVariableToMatchNewTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\ClassMethod\RenameVariableToMatchNewTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameVariableToMatchNewTypeRector::class); }; diff --git a/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/configured_rule.php b/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/configured_rule.php index 8dca55e6f2b..2ace3b99f05 100644 --- a/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/configured_rule.php +++ b/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenamePropertyToMatchTypeRector::class); }; diff --git a/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/property_promotion.php b/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/property_promotion.php index 9539504c128..8855558ba35 100644 --- a/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/property_promotion.php +++ b/rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/config/property_promotion.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::PROPERTY_PROMOTION); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenamePropertyToMatchTypeRector::class); }; diff --git a/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector/config/configured_rule.php b/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector/config/configured_rule.php index 31217dc8cf3..6587f99b2f7 100644 --- a/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector/config/configured_rule.php +++ b/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchExprVariableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameForeachValueVariableToMatchExprVariableRector::class); }; diff --git a/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php b/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php index 0c4f47bf50b..27011b079ab 100644 --- a/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php +++ b/rules-tests/Naming/Rector/Foreach_/RenameForeachValueVariableToMatchMethodCallReturnTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchMethodCallReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class); }; diff --git a/rules-tests/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector/config/normalize_namespace_without_namespace_config.php b/rules-tests/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector/config/normalize_namespace_without_namespace_config.php index c6fe53586a0..061ae3cd358 100644 --- a/rules-tests/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector/config/normalize_namespace_without_namespace_config.php +++ b/rules-tests/PSR4/Rector/FileWithoutNamespace/NormalizeNamespaceByPSR4ComposerAutoloadRector/config/normalize_namespace_without_namespace_config.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\PSR4\Contract\PSR4AutoloadNamespaceMatcherInterface; use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector; use Rector\Tests\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector\Source\DummyPSR4AutoloadWithoutNamespaceMatcher; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, false); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class); $services->set(DummyPSR4AutoloadWithoutNamespaceMatcher::class); diff --git a/rules-tests/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector/config/configured_rule.php b/rules-tests/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector/config/configured_rule.php index 82a4a6134d1..bf9566bfe08 100644 --- a/rules-tests/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector/config/configured_rule.php +++ b/rules-tests/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PSR4\Rector\Namespace_\MultipleClassFileToPsr4ClassesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MultipleClassFileToPsr4ClassesRector::class); }; diff --git a/rules-tests/Php52/Rector/Property/VarToPublicPropertyRector/config/configured_rule.php b/rules-tests/Php52/Rector/Property/VarToPublicPropertyRector/config/configured_rule.php index e6007f9a605..a8459da2ad1 100644 --- a/rules-tests/Php52/Rector/Property/VarToPublicPropertyRector/config/configured_rule.php +++ b/rules-tests/Php52/Rector/Property/VarToPublicPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php52\Rector\Property\VarToPublicPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(VarToPublicPropertyRector::class); }; diff --git a/rules-tests/Php52/Rector/Switch_/ContinueToBreakInSwitchRector/config/configured_rule.php b/rules-tests/Php52/Rector/Switch_/ContinueToBreakInSwitchRector/config/configured_rule.php index 6cd941a8938..d91bfeafa00 100644 --- a/rules-tests/Php52/Rector/Switch_/ContinueToBreakInSwitchRector/config/configured_rule.php +++ b/rules-tests/Php52/Rector/Switch_/ContinueToBreakInSwitchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ContinueToBreakInSwitchRector::class); }; diff --git a/rules-tests/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector/config/configured_rule.php b/rules-tests/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector/config/configured_rule.php index 08ad35f6e14..4ad1a2bf92f 100644 --- a/rules-tests/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector/config/configured_rule.php +++ b/rules-tests/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php53\Rector\FuncCall\DirNameFileConstantToDirConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DirNameFileConstantToDirConstantRector::class); }; diff --git a/rules-tests/Php53/Rector/Ternary/TernaryToElvisRector/config/configured_rule.php b/rules-tests/Php53/Rector/Ternary/TernaryToElvisRector/config/configured_rule.php index 233f2daab0c..f5923f42b8d 100644 --- a/rules-tests/Php53/Rector/Ternary/TernaryToElvisRector/config/configured_rule.php +++ b/rules-tests/Php53/Rector/Ternary/TernaryToElvisRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php53\Rector\Ternary\TernaryToElvisRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryToElvisRector::class); }; diff --git a/rules-tests/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector/config/configured_rule.php b/rules-tests/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector/config/configured_rule.php index a9a1182c029..13b60774381 100644 --- a/rules-tests/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector/config/configured_rule.php +++ b/rules-tests/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php53\Rector\Variable\ReplaceHttpServerVarsByServerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceHttpServerVarsByServerRector::class); }; diff --git a/rules-tests/Php54/Rector/Break_/RemoveZeroBreakContinueRector/config/configured_rule.php b/rules-tests/Php54/Rector/Break_/RemoveZeroBreakContinueRector/config/configured_rule.php index dd87b167a88..09dee60a052 100644 --- a/rules-tests/Php54/Rector/Break_/RemoveZeroBreakContinueRector/config/configured_rule.php +++ b/rules-tests/Php54/Rector/Break_/RemoveZeroBreakContinueRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php54\Rector\Break_\RemoveZeroBreakContinueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveZeroBreakContinueRector::class); }; diff --git a/rules-tests/Php54/Rector/FuncCall/RemoveReferenceFromCallRector/config/configured_rule.php b/rules-tests/Php54/Rector/FuncCall/RemoveReferenceFromCallRector/config/configured_rule.php index 862b8426891..96358fc1c57 100644 --- a/rules-tests/Php54/Rector/FuncCall/RemoveReferenceFromCallRector/config/configured_rule.php +++ b/rules-tests/Php54/Rector/FuncCall/RemoveReferenceFromCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php54\Rector\FuncCall\RemoveReferenceFromCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveReferenceFromCallRector::class); }; diff --git a/rules-tests/Php55/Rector/Class_/ClassConstantToSelfClassRector/config/configured_rule.php b/rules-tests/Php55/Rector/Class_/ClassConstantToSelfClassRector/config/configured_rule.php index bc159446be8..a75a8bad38f 100644 --- a/rules-tests/Php55/Rector/Class_/ClassConstantToSelfClassRector/config/configured_rule.php +++ b/rules-tests/Php55/Rector/Class_/ClassConstantToSelfClassRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\Class_\ClassConstantToSelfClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClassConstantToSelfClassRector::class); }; diff --git a/rules-tests/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector/config/configured_rule.php b/rules-tests/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector/config/configured_rule.php index 5acf7085784..605827ab5b4 100644 --- a/rules-tests/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector/config/configured_rule.php +++ b/rules-tests/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\FuncCall\GetCalledClassToSelfClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetCalledClassToSelfClassRector::class); }; diff --git a/rules-tests/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector/config/configured_rule.php b/rules-tests/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector/config/configured_rule.php index 63fb453e4f0..6d1a2a14c69 100644 --- a/rules-tests/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector/config/configured_rule.php +++ b/rules-tests/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\FuncCall\GetCalledClassToStaticClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetCalledClassToStaticClassRector::class); }; diff --git a/rules-tests/Php55/Rector/FuncCall/PregReplaceEModifierRector/config/configured_rule.php b/rules-tests/Php55/Rector/FuncCall/PregReplaceEModifierRector/config/configured_rule.php index 20bf1a5a870..07242056514 100644 --- a/rules-tests/Php55/Rector/FuncCall/PregReplaceEModifierRector/config/configured_rule.php +++ b/rules-tests/Php55/Rector/FuncCall/PregReplaceEModifierRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\FuncCall\PregReplaceEModifierRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PregReplaceEModifierRector::class); }; diff --git a/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/configured_rule.php b/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/configured_rule.php index d587c558785..ca768db8389 100644 --- a/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/configured_rule.php +++ b/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringClassNameToClassConstantRector::class) ->configure(['Nette\*', 'Error', 'Exception']); }; diff --git a/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/import_config.php b/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/import_config.php index 13607493f0d..60785835d20 100644 --- a/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/import_config.php +++ b/rules-tests/Php55/Rector/String_/StringClassNameToClassConstantRector/config/import_config.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(StringClassNameToClassConstantRector::class); }; diff --git a/rules-tests/Php56/Rector/FuncCall/PowToExpRector/config/configured_rule.php b/rules-tests/Php56/Rector/FuncCall/PowToExpRector/config/configured_rule.php index e69781183cc..c576facd223 100644 --- a/rules-tests/Php56/Rector/FuncCall/PowToExpRector/config/configured_rule.php +++ b/rules-tests/Php56/Rector/FuncCall/PowToExpRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php56\Rector\FuncCall\PowToExpRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PowToExpRector::class); }; diff --git a/rules-tests/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/config/configured_rule.php b/rules-tests/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/config/configured_rule.php index 6ef17666368..33d1d14c804 100644 --- a/rules-tests/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/config/configured_rule.php +++ b/rules-tests/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddDefaultValueForUndefinedVariableRector::class); }; diff --git a/rules-tests/Php70/Rector/Assign/ListSplitStringRector/config/configured_rule.php b/rules-tests/Php70/Rector/Assign/ListSplitStringRector/config/configured_rule.php index 6311ad6ce52..299d48640fb 100644 --- a/rules-tests/Php70/Rector/Assign/ListSplitStringRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Assign/ListSplitStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Assign\ListSplitStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ListSplitStringRector::class); }; diff --git a/rules-tests/Php70/Rector/Assign/ListSwapArrayOrderRector/config/configured_rule.php b/rules-tests/Php70/Rector/Assign/ListSwapArrayOrderRector/config/configured_rule.php index 161bb9162e8..d65d3df4e38 100644 --- a/rules-tests/Php70/Rector/Assign/ListSwapArrayOrderRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Assign/ListSwapArrayOrderRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Assign\ListSwapArrayOrderRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ListSwapArrayOrderRector::class); }; diff --git a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/config/configured_rule.php b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/config/configured_rule.php index 462c6cad6d9..cbd544f91ab 100644 --- a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BreakNotInLoopOrSwitchToReturnRector::class); }; diff --git a/rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/config/configured_rule.php b/rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/config/configured_rule.php index 8167081de0e..71f5fc188e3 100644 --- a/rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\ClassMethod\Php4ConstructorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(Php4ConstructorRector::class); }; diff --git a/rules-tests/Php70/Rector/FuncCall/CallUserMethodRector/config/configured_rule.php b/rules-tests/Php70/Rector/FuncCall/CallUserMethodRector/config/configured_rule.php index 8c0c34eacfc..46fd52399fa 100644 --- a/rules-tests/Php70/Rector/FuncCall/CallUserMethodRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FuncCall/CallUserMethodRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FuncCall\CallUserMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CallUserMethodRector::class); }; diff --git a/rules-tests/Php70/Rector/FuncCall/EregToPregMatchRector/config/configured_rule.php b/rules-tests/Php70/Rector/FuncCall/EregToPregMatchRector/config/configured_rule.php index 2de5daed2b8..96ec876fde5 100644 --- a/rules-tests/Php70/Rector/FuncCall/EregToPregMatchRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FuncCall/EregToPregMatchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FuncCall\EregToPregMatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(EregToPregMatchRector::class); }; diff --git a/rules-tests/Php70/Rector/FuncCall/MultiDirnameRector/config/configured_rule.php b/rules-tests/Php70/Rector/FuncCall/MultiDirnameRector/config/configured_rule.php index 2fca1204e18..d34e1d5a351 100644 --- a/rules-tests/Php70/Rector/FuncCall/MultiDirnameRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FuncCall/MultiDirnameRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FuncCall\MultiDirnameRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MultiDirnameRector::class); }; diff --git a/rules-tests/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/config/configured_rule.php b/rules-tests/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/config/configured_rule.php index d98702b589c..e909b150455 100644 --- a/rules-tests/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FuncCall\NonVariableToVariableOnFunctionCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NonVariableToVariableOnFunctionCallRector::class); }; diff --git a/rules-tests/Php70/Rector/FuncCall/RandomFunctionRector/config/configured_rule.php b/rules-tests/Php70/Rector/FuncCall/RandomFunctionRector/config/configured_rule.php index db16f72ff88..3a7dc4d5358 100644 --- a/rules-tests/Php70/Rector/FuncCall/RandomFunctionRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FuncCall/RandomFunctionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FuncCall\RandomFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RandomFunctionRector::class); }; diff --git a/rules-tests/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/config/configured_rule.php b/rules-tests/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/config/configured_rule.php index 4862ea20505..65606994984 100644 --- a/rules-tests/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FuncCall\RenameMktimeWithoutArgsToTimeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameMktimeWithoutArgsToTimeRector::class); }; diff --git a/rules-tests/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector/config/configured_rule.php b/rules-tests/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector/config/configured_rule.php index 094e1f14215..606dfbb78bd 100644 --- a/rules-tests/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExceptionHandlerTypehintRector::class); }; diff --git a/rules-tests/Php70/Rector/If_/IfToSpaceshipRector/config/configured_rule.php b/rules-tests/Php70/Rector/If_/IfToSpaceshipRector/config/configured_rule.php index 3b48fb823e6..1379835bd78 100644 --- a/rules-tests/Php70/Rector/If_/IfToSpaceshipRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/If_/IfToSpaceshipRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\If_\IfToSpaceshipRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IfToSpaceshipRector::class); }; diff --git a/rules-tests/Php70/Rector/List_/EmptyListRector/config/configured_rule.php b/rules-tests/Php70/Rector/List_/EmptyListRector/config/configured_rule.php index 336f43d57db..2f71a2afcc1 100644 --- a/rules-tests/Php70/Rector/List_/EmptyListRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/List_/EmptyListRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\List_\EmptyListRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(EmptyListRector::class); }; diff --git a/rules-tests/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/config/configured_rule.php b/rules-tests/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/config/configured_rule.php index 68c20ba5f6a..4c995d20dd7 100644 --- a/rules-tests/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ThisCallOnStaticMethodToStaticCallRector::class); }; diff --git a/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/config/configured_rule.php b/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/config/configured_rule.php index 15ad15711dd..f5476a7610b 100644 --- a/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StaticCallOnNonStaticToInstanceCallRector::class); }; diff --git a/rules-tests/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector/config/configured_rule.php b/rules-tests/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector/config/configured_rule.php index 6d75a3b0180..8f7341022e8 100644 --- a/rules-tests/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Switch_\ReduceMultipleDefaultSwitchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReduceMultipleDefaultSwitchRector::class); }; diff --git a/rules-tests/Php70/Rector/Ternary/TernaryToNullCoalescingRector/config/configured_rule.php b/rules-tests/Php70/Rector/Ternary/TernaryToNullCoalescingRector/config/configured_rule.php index eb7f46ddbde..fcfc74b1c47 100644 --- a/rules-tests/Php70/Rector/Ternary/TernaryToNullCoalescingRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Ternary/TernaryToNullCoalescingRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryToNullCoalescingRector::class); }; diff --git a/rules-tests/Php70/Rector/Ternary/TernaryToSpaceshipRector/config/configured_rule.php b/rules-tests/Php70/Rector/Ternary/TernaryToSpaceshipRector/config/configured_rule.php index 3e1e48dcb1d..f7e0bcd2afd 100644 --- a/rules-tests/Php70/Rector/Ternary/TernaryToSpaceshipRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Ternary/TernaryToSpaceshipRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Ternary\TernaryToSpaceshipRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryToSpaceshipRector::class); }; diff --git a/rules-tests/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/config/configured_rule.php b/rules-tests/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/config/configured_rule.php index 8a8f9c79762..60245de52e0 100644 --- a/rules-tests/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/config/configured_rule.php +++ b/rules-tests/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(WrapVariableVariableNameInCurlyBracesRector::class); }; diff --git a/rules-tests/Php71/Rector/Assign/AssignArrayToStringRector/config/configured_rule.php b/rules-tests/Php71/Rector/Assign/AssignArrayToStringRector/config/configured_rule.php index fbb73fa40fd..d0979af8b72 100644 --- a/rules-tests/Php71/Rector/Assign/AssignArrayToStringRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/Assign/AssignArrayToStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\Assign\AssignArrayToStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AssignArrayToStringRector::class); }; diff --git a/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/config/configured_rule.php b/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/config/configured_rule.php index 5da07436c97..5729eba4029 100644 --- a/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\BinaryOp\BinaryOpBetweenNumberAndStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BinaryOpBetweenNumberAndStringRector::class); }; diff --git a/rules-tests/Php71/Rector/BooleanOr/IsIterableRector/config/configured_rule.php b/rules-tests/Php71/Rector/BooleanOr/IsIterableRector/config/configured_rule.php index 4e7481a098c..6623f606009 100644 --- a/rules-tests/Php71/Rector/BooleanOr/IsIterableRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/BooleanOr/IsIterableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\BooleanOr\IsIterableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IsIterableRector::class); }; diff --git a/rules-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/config/configured_rule.php b/rules-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/config/configured_rule.php index 5c0e9b1b77b..3ca5bf01f28 100644 --- a/rules-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\ClassConst\PublicConstantVisibilityRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PublicConstantVisibilityRector::class); }; diff --git a/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/is_countable.php b/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/is_countable.php index 101afa1787a..c86edee2285 100644 --- a/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/is_countable.php +++ b/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/is_countable.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php71\Rector\FuncCall\CountOnNullRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::IS_COUNTABLE); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(CountOnNullRector::class); }; diff --git a/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/php_71.php b/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/php_71.php index e21f1ea6011..f34143341e0 100644 --- a/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/php_71.php +++ b/rules-tests/Php71/Rector/FuncCall/CountOnNullRector/config/php_71.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php71\Rector\FuncCall\CountOnNullRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::COUNT_ON_NULL); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(CountOnNullRector::class); }; diff --git a/rules-tests/Php71/Rector/FuncCall/RemoveExtraParametersRector/config/configured_rule.php b/rules-tests/Php71/Rector/FuncCall/RemoveExtraParametersRector/config/configured_rule.php index 76edf132cf0..1422a7a11d9 100644 --- a/rules-tests/Php71/Rector/FuncCall/RemoveExtraParametersRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/FuncCall/RemoveExtraParametersRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveExtraParametersRector::class); }; diff --git a/rules-tests/Php71/Rector/List_/ListToArrayDestructRector/config/configured_rule.php b/rules-tests/Php71/Rector/List_/ListToArrayDestructRector/config/configured_rule.php index 9865362de09..e412e15ab8c 100644 --- a/rules-tests/Php71/Rector/List_/ListToArrayDestructRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/List_/ListToArrayDestructRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\List_\ListToArrayDestructRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ListToArrayDestructRector::class); }; diff --git a/rules-tests/Php71/Rector/Name/ReservedObjectRector/config/configured_rule.php b/rules-tests/Php71/Rector/Name/ReservedObjectRector/config/configured_rule.php index ea07d09977e..813ee0838af 100644 --- a/rules-tests/Php71/Rector/Name/ReservedObjectRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/Name/ReservedObjectRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\Name\ReservedObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReservedObjectRector::class) ->configure([ 'ReservedObject' => 'SmartObject', diff --git a/rules-tests/Php71/Rector/TryCatch/MultiExceptionCatchRector/config/configured_rule.php b/rules-tests/Php71/Rector/TryCatch/MultiExceptionCatchRector/config/configured_rule.php index fc37fb401c1..a85eae864d6 100644 --- a/rules-tests/Php71/Rector/TryCatch/MultiExceptionCatchRector/config/configured_rule.php +++ b/rules-tests/Php71/Rector/TryCatch/MultiExceptionCatchRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MultiExceptionCatchRector::class); }; diff --git a/rules-tests/Php72/Rector/Assign/ListEachRector/config/configured_rule.php b/rules-tests/Php72/Rector/Assign/ListEachRector/config/configured_rule.php index c393b132f14..36601e99e2c 100644 --- a/rules-tests/Php72/Rector/Assign/ListEachRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/Assign/ListEachRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\Assign\ListEachRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ListEachRector::class); }; diff --git a/rules-tests/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector/config/configured_rule.php b/rules-tests/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector/config/configured_rule.php index 1545fa07e2a..c0ecd24f1c1 100644 --- a/rules-tests/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\Assign\ReplaceEachAssignmentWithKeyCurrentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceEachAssignmentWithKeyCurrentRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/config/configured_rule.php b/rules-tests/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/config/configured_rule.php index 08608a6fac2..ca8ad59a25b 100644 --- a/rules-tests/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CreateFunctionToAnonymousFunctionRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import.php b/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import.php index 3197820ea18..dfc60954b9a 100644 --- a/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import.php +++ b/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Php72\Rector\FuncCall\GetClassOnNullRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(GetClassOnNullRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import_doc_block.php b/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import_doc_block.php index 3197820ea18..dfc60954b9a 100644 --- a/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import_doc_block.php +++ b/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/auto_import_doc_block.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Php72\Rector\FuncCall\GetClassOnNullRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(GetClassOnNullRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/configured_rule.php b/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/configured_rule.php index b6503b9eca7..28d3d4efde0 100644 --- a/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/FuncCall/GetClassOnNullRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\FuncCall\GetClassOnNullRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetClassOnNullRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/IsObjectOnIncompleteClassRector/config/configured_rule.php b/rules-tests/Php72/Rector/FuncCall/IsObjectOnIncompleteClassRector/config/configured_rule.php index d73cc129531..2433ff21a38 100644 --- a/rules-tests/Php72/Rector/FuncCall/IsObjectOnIncompleteClassRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/FuncCall/IsObjectOnIncompleteClassRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\FuncCall\IsObjectOnIncompleteClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IsObjectOnIncompleteClassRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector/config/configured_rule.php b/rules-tests/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector/config/configured_rule.php index 2f070167a56..aa07642de70 100644 --- a/rules-tests/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\FuncCall\ParseStrWithResultArgumentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParseStrWithResultArgumentRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/StringifyDefineRector/config/configured_rule.php b/rules-tests/Php72/Rector/FuncCall/StringifyDefineRector/config/configured_rule.php index 93dc708ffef..b92f2dd1f13 100644 --- a/rules-tests/Php72/Rector/FuncCall/StringifyDefineRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/FuncCall/StringifyDefineRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\FuncCall\StringifyDefineRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringifyDefineRector::class); }; diff --git a/rules-tests/Php72/Rector/FuncCall/StringsAssertNakedRector/config/configured_rule.php b/rules-tests/Php72/Rector/FuncCall/StringsAssertNakedRector/config/configured_rule.php index 39f8034c9e0..0dfbd599735 100644 --- a/rules-tests/Php72/Rector/FuncCall/StringsAssertNakedRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/FuncCall/StringsAssertNakedRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\FuncCall\StringsAssertNakedRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringsAssertNakedRector::class); }; diff --git a/rules-tests/Php72/Rector/Unset_/UnsetCastRector/config/configured_rule.php b/rules-tests/Php72/Rector/Unset_/UnsetCastRector/config/configured_rule.php index 21dfdb7343f..81765c01565 100644 --- a/rules-tests/Php72/Rector/Unset_/UnsetCastRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/Unset_/UnsetCastRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\Unset_\UnsetCastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnsetCastRector::class); }; diff --git a/rules-tests/Php72/Rector/While_/WhileEachToForeachRector/config/configured_rule.php b/rules-tests/Php72/Rector/While_/WhileEachToForeachRector/config/configured_rule.php index 04763ec046f..7c861fc8a32 100644 --- a/rules-tests/Php72/Rector/While_/WhileEachToForeachRector/config/configured_rule.php +++ b/rules-tests/Php72/Rector/While_/WhileEachToForeachRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php72\Rector\While_\WhileEachToForeachRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(WhileEachToForeachRector::class); }; diff --git a/rules-tests/Php73/Rector/BinaryOr/IsCountableRector/config/configured_rule.php b/rules-tests/Php73/Rector/BinaryOr/IsCountableRector/config/configured_rule.php index 196a5f0de34..9c0111f856a 100644 --- a/rules-tests/Php73/Rector/BinaryOr/IsCountableRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/BinaryOr/IsCountableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\BooleanOr\IsCountableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IsCountableRector::class); }; diff --git a/rules-tests/Php73/Rector/ConstFetch/SensitiveConstantNameRector/config/configured_rule.php b/rules-tests/Php73/Rector/ConstFetch/SensitiveConstantNameRector/config/configured_rule.php index 7354cdfdc66..1b26c69a1e4 100644 --- a/rules-tests/Php73/Rector/ConstFetch/SensitiveConstantNameRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/ConstFetch/SensitiveConstantNameRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\ConstFetch\SensitiveConstantNameRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SensitiveConstantNameRector::class); }; diff --git a/rules-tests/Php73/Rector/FuncCall/ArrayKeyFirstLastRector/config/configured_rule.php b/rules-tests/Php73/Rector/FuncCall/ArrayKeyFirstLastRector/config/configured_rule.php index af8e7aa4bc5..560443406e5 100644 --- a/rules-tests/Php73/Rector/FuncCall/ArrayKeyFirstLastRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/FuncCall/ArrayKeyFirstLastRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\FuncCall\ArrayKeyFirstLastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayKeyFirstLastRector::class); }; diff --git a/rules-tests/Php73/Rector/FuncCall/JsonThrowOnErrorRector/config/configured_rule.php b/rules-tests/Php73/Rector/FuncCall/JsonThrowOnErrorRector/config/configured_rule.php index 17d4542208c..86cc140021e 100644 --- a/rules-tests/Php73/Rector/FuncCall/JsonThrowOnErrorRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/FuncCall/JsonThrowOnErrorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(JsonThrowOnErrorRector::class); }; diff --git a/rules-tests/Php73/Rector/FuncCall/RegexDashEscapeRector/config/configured_rule.php b/rules-tests/Php73/Rector/FuncCall/RegexDashEscapeRector/config/configured_rule.php index eeb1817d9dc..ee4c2f40414 100644 --- a/rules-tests/Php73/Rector/FuncCall/RegexDashEscapeRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/FuncCall/RegexDashEscapeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\FuncCall\RegexDashEscapeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RegexDashEscapeRector::class); }; diff --git a/rules-tests/Php73/Rector/FuncCall/SensitiveDefineRector/config/configured_rule.php b/rules-tests/Php73/Rector/FuncCall/SensitiveDefineRector/config/configured_rule.php index b171e075823..c3b769893ab 100644 --- a/rules-tests/Php73/Rector/FuncCall/SensitiveDefineRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/FuncCall/SensitiveDefineRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\FuncCall\SensitiveDefineRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SensitiveDefineRector::class); }; diff --git a/rules-tests/Php73/Rector/FuncCall/SetcookieRector/config/configured_rule.php b/rules-tests/Php73/Rector/FuncCall/SetcookieRector/config/configured_rule.php index 07ea070f944..07a84bbe3cb 100644 --- a/rules-tests/Php73/Rector/FuncCall/SetcookieRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/FuncCall/SetcookieRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\FuncCall\SetCookieRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SetCookieRector::class); }; diff --git a/rules-tests/Php73/Rector/FuncCall/StringifyStrNeedlesRector/config/configured_rule.php b/rules-tests/Php73/Rector/FuncCall/StringifyStrNeedlesRector/config/configured_rule.php index ed45b0ed428..a0aa99ec09f 100644 --- a/rules-tests/Php73/Rector/FuncCall/StringifyStrNeedlesRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/FuncCall/StringifyStrNeedlesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringifyStrNeedlesRector::class); }; diff --git a/rules-tests/Php73/Rector/String_/SensitiveHereNowDocRector/config/configured_rule.php b/rules-tests/Php73/Rector/String_/SensitiveHereNowDocRector/config/configured_rule.php index 233f599e4be..eaa9446c1cf 100644 --- a/rules-tests/Php73/Rector/String_/SensitiveHereNowDocRector/config/configured_rule.php +++ b/rules-tests/Php73/Rector/String_/SensitiveHereNowDocRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php73\Rector\String_\SensitiveHereNowDocRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SensitiveHereNowDocRector::class); }; diff --git a/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php b/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php index 80f0aa07104..7c7905b6638 100644 --- a/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\ArrayDimFetch\CurlyToSquareBracketArrayStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CurlyToSquareBracketArrayStringRector::class); }; diff --git a/rules-tests/Php74/Rector/Assign/NullCoalescingOperatorRector/config/configured_rule.php b/rules-tests/Php74/Rector/Assign/NullCoalescingOperatorRector/config/configured_rule.php index 7d6e369fa03..447ea63d6a5 100644 --- a/rules-tests/Php74/Rector/Assign/NullCoalescingOperatorRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/Assign/NullCoalescingOperatorRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\Assign\NullCoalescingOperatorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NullCoalescingOperatorRector::class); }; diff --git a/rules-tests/Php74/Rector/Closure/ClosureToArrowFunctionRector/config/configured_rule.php b/rules-tests/Php74/Rector/Closure/ClosureToArrowFunctionRector/config/configured_rule.php index 63c9794b7cf..cce562ace3b 100644 --- a/rules-tests/Php74/Rector/Closure/ClosureToArrowFunctionRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/Closure/ClosureToArrowFunctionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClosureToArrowFunctionRector::class); }; diff --git a/rules-tests/Php74/Rector/Double/RealToFloatTypeCastRector/config/configured_rule.php b/rules-tests/Php74/Rector/Double/RealToFloatTypeCastRector/config/configured_rule.php index 5c18edf0c0d..de24fe16375 100644 --- a/rules-tests/Php74/Rector/Double/RealToFloatTypeCastRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/Double/RealToFloatTypeCastRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\Double\RealToFloatTypeCastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RealToFloatTypeCastRector::class); }; diff --git a/rules-tests/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/config/configured_rule.php b/rules-tests/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/config/configured_rule.php index 94263315ff9..738087f032e 100644 --- a/rules-tests/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\FuncCall\ArrayKeyExistsOnPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayKeyExistsOnPropertyRector::class); }; diff --git a/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php74.php b/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php74.php index acb447e5eb6..61aa14768d7 100644 --- a/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php74.php +++ b/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php74.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ArraySpreadInsteadOfArrayMergeRector::class); }; diff --git a/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php81.php b/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php81.php index e5866576ab8..9ec8737e3f4 100644 --- a/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php81.php +++ b/rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php81.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ArraySpreadInsteadOfArrayMergeRector::class); }; diff --git a/rules-tests/Php74/Rector/FuncCall/FilterVarToAddSlashesRector/config/configured_rule.php b/rules-tests/Php74/Rector/FuncCall/FilterVarToAddSlashesRector/config/configured_rule.php index 0f05c3cf9f4..64b14ec2107 100644 --- a/rules-tests/Php74/Rector/FuncCall/FilterVarToAddSlashesRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/FuncCall/FilterVarToAddSlashesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\FuncCall\FilterVarToAddSlashesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FilterVarToAddSlashesRector::class); }; diff --git a/rules-tests/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/config/configured_rule.php b/rules-tests/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/config/configured_rule.php index c62eac3b40d..03a3bd7fee4 100644 --- a/rules-tests/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\FuncCall\MbStrrposEncodingArgumentPositionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MbStrrposEncodingArgumentPositionRector::class); }; diff --git a/rules-tests/Php74/Rector/Function_/ReservedFnFunctionRector/config/configured_rule.php b/rules-tests/Php74/Rector/Function_/ReservedFnFunctionRector/config/configured_rule.php index c398f2a0e4f..7ea9a4f26af 100644 --- a/rules-tests/Php74/Rector/Function_/ReservedFnFunctionRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/Function_/ReservedFnFunctionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\Function_\ReservedFnFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReservedFnFunctionRector::class); }; diff --git a/rules-tests/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector/config/configured_rule.php b/rules-tests/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector/config/configured_rule.php index b8832cbd892..16260c39f64 100644 --- a/rules-tests/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddLiteralSeparatorToNumberRector::class) ->configure([ AddLiteralSeparatorToNumberRector::LIMIT_VALUE => 1_000_000, diff --git a/rules-tests/Php74/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/config/configured_rule.php b/rules-tests/Php74/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/config/configured_rule.php index 485d0587ce5..f98cb8370ca 100644 --- a/rules-tests/Php74/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\MethodCall\ChangeReflectionTypeToStringToGetNameRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeReflectionTypeToStringToGetNameRector::class); }; diff --git a/rules-tests/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/config/configured_rule.php b/rules-tests/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/config/configured_rule.php index 77c1bfb48f6..0033ce86723 100644 --- a/rules-tests/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RestoreDefaultNullToNullableTypePropertyRector::class); }; diff --git a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/configured_rule.php b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/configured_rule.php index 26945fe5356..94c94a6d479 100644 --- a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php74\Rector\Property\TypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); }; diff --git a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/import_names.php b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/import_names.php index 22c54691876..31b7f827346 100644 --- a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/import_names.php +++ b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/import_names.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php74\Rector\Property\TypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/inline_public_configured_rule.php b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/inline_public_configured_rule.php index f99967a4d97..156d71654e8 100644 --- a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/inline_public_configured_rule.php +++ b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/inline_public_configured_rule.php @@ -2,18 +2,18 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php74\Rector\Property\TypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyRector::class) ->configure([ TypedPropertyRector::INLINE_PUBLIC => true, ]); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); }; diff --git a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/union_and_intersection_type_rule.php b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/union_and_intersection_type_rule.php index db4129d1b95..dbafef89cd6 100644 --- a/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/union_and_intersection_type_rule.php +++ b/rules-tests/Php74/Rector/Property/TypedPropertyRector/config/union_and_intersection_type_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php74\Rector\Property\TypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::INTERSECTION_TYPES); }; diff --git a/rules-tests/Php74/Rector/StaticCall/ExportToReflectionFunctionRector/config/configured_rule.php b/rules-tests/Php74/Rector/StaticCall/ExportToReflectionFunctionRector/config/configured_rule.php index f32ce5ffcaa..ae77c8d1490 100644 --- a/rules-tests/Php74/Rector/StaticCall/ExportToReflectionFunctionRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/StaticCall/ExportToReflectionFunctionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php74\Rector\StaticCall\ExportToReflectionFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExportToReflectionFunctionRector::class); }; diff --git a/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule.php b/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule.php index e6920504e0e..443711bd54e 100644 --- a/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveUnusedVariableInCatchRector::class); }; diff --git a/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule_php_version_74.php b/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule_php_version_74.php index 43dbe343656..3cc3b5bc63a 100644 --- a/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule_php_version_74.php +++ b/rules-tests/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector/config/configured_rule_php_version_74.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RemoveUnusedVariableInCatchRector::class); }; diff --git a/rules-tests/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector/config/configured_rule.php b/rules-tests/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector/config/configured_rule.php index d1f7374a9c2..eff00b6e812 100644 --- a/rules-tests/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddParamBasedOnParentClassMethodRector::class); }; diff --git a/rules-tests/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector/config/configured_rule.php b/rules-tests/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector/config/configured_rule.php index cef3bd6f334..d41dc6abb03 100644 --- a/rules-tests/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FinalPrivateToPrivateVisibilityRector::class); }; diff --git a/rules-tests/Php80/Rector/ClassMethod/SetStateToStaticRector/config/configured_rule.php b/rules-tests/Php80/Rector/ClassMethod/SetStateToStaticRector/config/configured_rule.php index bb9085fda33..01c339c34d6 100644 --- a/rules-tests/Php80/Rector/ClassMethod/SetStateToStaticRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/ClassMethod/SetStateToStaticRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\ClassMethod\SetStateToStaticRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SetStateToStaticRector::class); }; diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/auto_import.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/auto_import.php index b371472563b..6e003ca6c49 100644 --- a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/auto_import.php +++ b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/auto_import.php @@ -2,20 +2,20 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\Annotation\Apple; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\Attribute\Apple as AppleAttribute; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::NEW_INITIALIZERS - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AnnotationToAttributeRector::class) ->configure([ new AnnotationToAttribute('Doctrine\ORM\Mapping\Entity'), diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php index 8dcee8e7faa..5fbdb42f450 100644 --- a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php @@ -2,19 +2,19 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\GenericAnnotation; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\GenericSingleImplicitAnnotation; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::NEW_INITIALIZERS - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AnnotationToAttributeRector::class) ->configure([ diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php index 365945edd60..c47f9ba74ee 100644 --- a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php +++ b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; @@ -11,14 +12,13 @@ use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\All use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\Length; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\NotNull; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\NotNumber; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { +return static function (RectorConfig $rectorConfig): void { // covers https://wiki.php.net/rfc/new_in_initializers#nested_attributes - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::NEW_INITIALIZERS); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AnnotationToAttributeRector::class) ->configure([ new AnnotationToAttribute(All::class), diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/auto_import_configured_rule.php b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/auto_import_configured_rule.php index 1eeb9e3b302..e5d1bd1d72b 100644 --- a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/auto_import_configured_rule.php +++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/auto_import_configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ClassPropertyAssignToConstructorPromotionRector::class); }; diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/configured_rule.php b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/configured_rule.php index f0f3510780a..69df6200223 100644 --- a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClassPropertyAssignToConstructorPromotionRector::class); }; diff --git a/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configure_direct_shouldnot_remove_annotation.php b/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configure_direct_shouldnot_remove_annotation.php index 0e0febc9a77..ec25bc7a255 100644 --- a/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configure_direct_shouldnot_remove_annotation.php +++ b/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configure_direct_shouldnot_remove_annotation.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DoctrineAnnotationClassToAttributeRector::class) ->configure([false]); }; diff --git a/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configured_rule.php b/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configured_rule.php index e96e8b579b1..030a643acd8 100644 --- a/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DoctrineAnnotationClassToAttributeRector::class); }; diff --git a/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/should_not_remove_annotation.php b/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/should_not_remove_annotation.php index e4a90b806b2..adb7f4e3aed 100644 --- a/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/should_not_remove_annotation.php +++ b/rules-tests/Php80/Rector/Class_/DoctrineAnnotationClassToAttributeRector/config/should_not_remove_annotation.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DoctrineAnnotationClassToAttributeRector::class) ->configure([ DoctrineAnnotationClassToAttributeRector::REMOVE_ANNOTATIONS => false, diff --git a/rules-tests/Php80/Rector/Class_/StringableForToStringRector/config/configured_rule.php b/rules-tests/Php80/Rector/Class_/StringableForToStringRector/config/configured_rule.php index d54b48ad809..057afce2a4b 100644 --- a/rules-tests/Php80/Rector/Class_/StringableForToStringRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Class_/StringableForToStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\StringableForToStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringableForToStringRector::class); }; diff --git a/rules-tests/Php80/Rector/FuncCall/ClassOnObjectRector/config/configured_rule.php b/rules-tests/Php80/Rector/FuncCall/ClassOnObjectRector/config/configured_rule.php index f28c1a4a6be..a4f0e28c6cd 100644 --- a/rules-tests/Php80/Rector/FuncCall/ClassOnObjectRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/FuncCall/ClassOnObjectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\FuncCall\ClassOnObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClassOnObjectRector::class); }; diff --git a/rules-tests/Php80/Rector/FuncCall/Php8ResourceReturnToObjectRector/config/configured_rule.php b/rules-tests/Php80/Rector/FuncCall/Php8ResourceReturnToObjectRector/config/configured_rule.php index c93bd9df85a..9bd0f4b55b5 100644 --- a/rules-tests/Php80/Rector/FuncCall/Php8ResourceReturnToObjectRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/FuncCall/Php8ResourceReturnToObjectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(Php8ResourceReturnToObjectRector::class); }; diff --git a/rules-tests/Php80/Rector/FuncCall/TokenGetAllToObjectRector/config/configured_rule.php b/rules-tests/Php80/Rector/FuncCall/TokenGetAllToObjectRector/config/configured_rule.php index 4cc90d4198b..b0613ef4bab 100644 --- a/rules-tests/Php80/Rector/FuncCall/TokenGetAllToObjectRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/FuncCall/TokenGetAllToObjectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\FuncCall\TokenGetAllToObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TokenGetAllToObjectRector::class); }; diff --git a/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/config/configured_rule.php b/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/config/configured_rule.php index 1de3de858e0..4bd681b619c 100644 --- a/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Php80\Rector\FunctionLike\UnionTypesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnionTypesRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES); }; diff --git a/rules-tests/Php80/Rector/Identical/StrEndsWithRector/config/configured_rule.php b/rules-tests/Php80/Rector/Identical/StrEndsWithRector/config/configured_rule.php index e1f095123fd..24bf808f5a1 100644 --- a/rules-tests/Php80/Rector/Identical/StrEndsWithRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Identical/StrEndsWithRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Identical\StrEndsWithRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StrEndsWithRector::class); }; diff --git a/rules-tests/Php80/Rector/Identical/StrStartsWithRector/config/configured_rule.php b/rules-tests/Php80/Rector/Identical/StrStartsWithRector/config/configured_rule.php index cdc04c4263b..02dc72eac07 100644 --- a/rules-tests/Php80/Rector/Identical/StrStartsWithRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Identical/StrStartsWithRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Identical\StrStartsWithRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StrStartsWithRector::class); }; diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/config/configured_rule.php b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/config/configured_rule.php index a5fc7462e57..664055410c0 100644 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\NotIdentical\StrContainsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StrContainsRector::class); }; diff --git a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule.php b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule.php index 9e834d25650..dec21708291 100644 --- a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ChangeSwitchToMatchRector::class); }; diff --git a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule_php_version_74.php b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule_php_version_74.php index 76d26fef48e..33d06a9f065 100644 --- a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule_php_version_74.php +++ b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/config/configured_rule_php_version_74.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ChangeSwitchToMatchRector::class); }; diff --git a/rules-tests/Php80/Rector/Ternary/GetDebugTypeRector/config/configured_rule.php b/rules-tests/Php80/Rector/Ternary/GetDebugTypeRector/config/configured_rule.php index 3d9424d037a..d831dc89f09 100644 --- a/rules-tests/Php80/Rector/Ternary/GetDebugTypeRector/config/configured_rule.php +++ b/rules-tests/Php80/Rector/Ternary/GetDebugTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Ternary\GetDebugTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetDebugTypeRector::class); }; diff --git a/rules-tests/Php81/Rector/ClassConst/FinalizePublicClassConstantRector/config/configured_rule.php b/rules-tests/Php81/Rector/ClassConst/FinalizePublicClassConstantRector/config/configured_rule.php index 09b8f8c4e83..d15921c702e 100644 --- a/rules-tests/Php81/Rector/ClassConst/FinalizePublicClassConstantRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/ClassConst/FinalizePublicClassConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FinalizePublicClassConstantRector::class); }; diff --git a/rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/config/configured_rule.php b/rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/config/configured_rule.php index 0618e2e6f87..c938c414dc0 100644 --- a/rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\ClassMethod\NewInInitializerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewInInitializerRector::class); }; diff --git a/rules-tests/Php81/Rector/Class_/MyCLabsClassToEnumRector/config/configured_rule.php b/rules-tests/Php81/Rector/Class_/MyCLabsClassToEnumRector/config/configured_rule.php index fb34271040b..aa659928d97 100644 --- a/rules-tests/Php81/Rector/Class_/MyCLabsClassToEnumRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/Class_/MyCLabsClassToEnumRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MyCLabsClassToEnumRector::class); }; diff --git a/rules-tests/Php81/Rector/Class_/SpatieEnumClassToEnumRector/config/configured_rule.php b/rules-tests/Php81/Rector/Class_/SpatieEnumClassToEnumRector/config/configured_rule.php index 298e7c9f5cf..404d7cc85ed 100644 --- a/rules-tests/Php81/Rector/Class_/SpatieEnumClassToEnumRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/Class_/SpatieEnumClassToEnumRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SpatieEnumClassToEnumRector::class); }; diff --git a/rules-tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/config/configured_rule.php b/rules-tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/config/configured_rule.php index c49e2241ad1..cf6d588c443 100644 --- a/rules-tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NullToStrictStringFuncCallArgRector::class); }; diff --git a/rules-tests/Php81/Rector/FuncCall/Php81ResourceReturnToObjectRector/config/configured_rule.php b/rules-tests/Php81/Rector/FuncCall/Php81ResourceReturnToObjectRector/config/configured_rule.php index 8681c8d4931..3d6672305ed 100644 --- a/rules-tests/Php81/Rector/FuncCall/Php81ResourceReturnToObjectRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/FuncCall/Php81ResourceReturnToObjectRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\FuncCall\Php81ResourceReturnToObjectRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(Php81ResourceReturnToObjectRector::class); }; diff --git a/rules-tests/Php81/Rector/FunctionLike/IntersectionTypesRector/config/configured_rule.php b/rules-tests/Php81/Rector/FunctionLike/IntersectionTypesRector/config/configured_rule.php index 73016b2810f..424ecf07a93 100644 --- a/rules-tests/Php81/Rector/FunctionLike/IntersectionTypesRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/FunctionLike/IntersectionTypesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\FunctionLike\IntersectionTypesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(IntersectionTypesRector::class); }; diff --git a/rules-tests/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector/config/configured_rule.php b/rules-tests/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector/config/configured_rule.php index 853e7ec9bcd..e1e7a524fbf 100644 --- a/rules-tests/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MyCLabsMethodCallToEnumConstRector::class); }; diff --git a/rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/config/configured_rule.php b/rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/config/configured_rule.php index 5316f1beef5..2b04d4401ca 100644 --- a/rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/config/configured_rule.php +++ b/rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\Property\ReadOnlyPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReadOnlyPropertyRector::class); }; diff --git a/rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/config/configured_rule.php b/rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/config/configured_rule.php index a07c55c27b3..ab714895d75 100644 --- a/rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PrivatizeFinalClassMethodRector::class); }; diff --git a/rules-tests/Privatization/Rector/Class_/ChangeGlobalVariablesToPropertiesRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Class_/ChangeGlobalVariablesToPropertiesRector/config/configured_rule.php index 396afcdbc1c..44e984e971f 100644 --- a/rules-tests/Privatization/Rector/Class_/ChangeGlobalVariablesToPropertiesRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Class_/ChangeGlobalVariablesToPropertiesRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\ChangeGlobalVariablesToPropertiesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeGlobalVariablesToPropertiesRector::class); }; diff --git a/rules-tests/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector/config/configured_rule.php index 8ddab5d85a7..33b3ea99091 100644 --- a/rules-tests/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\ChangeLocalPropertyToVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeLocalPropertyToVariableRector::class); }; diff --git a/rules-tests/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector/config/configured_rule.php index f78d73cd8a6..5d72793ab55 100644 --- a/rules-tests/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeReadOnlyVariableWithDefaultValueToConstantRector::class); }; diff --git a/rules-tests/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector/config/configured_rule.php index 290907417b1..fc2e8cae58a 100644 --- a/rules-tests/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FinalizeClassesWithoutChildrenRector::class); }; diff --git a/rules-tests/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector/config/configured_rule.php index 5062b374d3b..f5256b9a235 100644 --- a/rules-tests/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Class_/RepeatedLiteralToClassConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\RepeatedLiteralToClassConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RepeatedLiteralToClassConstantRector::class); }; diff --git a/rules-tests/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector/config/configured_rule.php b/rules-tests/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector/config/configured_rule.php index fd839be153a..2e276dfa3e4 100644 --- a/rules-tests/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/MethodCall/PrivatizeLocalGetterToPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PrivatizeLocalGetterToPropertyRector::class); }; diff --git a/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/case_insensitive_configured_config.php b/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/case_insensitive_configured_config.php index eb763c04a4e..facaa901e5f 100644 --- a/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/case_insensitive_configured_config.php +++ b/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/case_insensitive_configured_config.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\MethodCall\ReplaceStringWithClassConstantRector; use Rector\Privatization\ValueObject\ReplaceStringWithClassConstant; use Rector\Tests\Privatization\Rector\MethodCall\ReplaceStringWithClassConstantRector\Source\Order; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceStringWithClassConstantRector::class) ->configure([ new ReplaceStringWithClassConstant( diff --git a/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/configured_config.php b/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/configured_config.php index 782cbc35948..22f0e50908d 100644 --- a/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/configured_config.php +++ b/rules-tests/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector/config/configured_config.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\MethodCall\ReplaceStringWithClassConstantRector; use Rector\Privatization\ValueObject\ReplaceStringWithClassConstant; use Rector\Tests\Privatization\Rector\MethodCall\ReplaceStringWithClassConstantRector\Source\Placeholder; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceStringWithClassConstantRector::class) ->configure([ new ReplaceStringWithClassConstant( diff --git a/rules-tests/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector/config/configured_rule.php index 2cce0ecad10..e27b0468e46 100644 --- a/rules-tests/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Property\ChangeReadOnlyPropertyWithDefaultValueToConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeReadOnlyPropertyWithDefaultValueToConstantRector::class); }; diff --git a/rules-tests/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector/config/configured_rule.php b/rules-tests/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector/config/configured_rule.php index c102c0f3781..c6203095a17 100644 --- a/rules-tests/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector/config/configured_rule.php +++ b/rules-tests/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PrivatizeFinalClassPropertyRector::class); }; diff --git a/rules-tests/Removing/Rector/ClassMethod/ArgumentRemoverRector/config/configured_rule.php b/rules-tests/Removing/Rector/ClassMethod/ArgumentRemoverRector/config/configured_rule.php index 608a3eb3140..99796d3d43b 100644 --- a/rules-tests/Removing/Rector/ClassMethod/ArgumentRemoverRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/ClassMethod/ArgumentRemoverRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\ClassMethod\ArgumentRemoverRector; use Rector\Removing\ValueObject\ArgumentRemover; use Rector\Tests\Removing\Rector\ClassMethod\ArgumentRemoverRector\Source\Persister; use Rector\Tests\Removing\Rector\ClassMethod\ArgumentRemoverRector\Source\RemoveInTheMiddle; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\Yaml\Yaml; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArgumentRemoverRector::class) ->configure([ new ArgumentRemover(Persister::class, 'getSelectJoinColumnSQL', 4, null), new ArgumentRemover( diff --git a/rules-tests/Removing/Rector/Class_/RemoveInterfacesRector/config/configured_rule.php b/rules-tests/Removing/Rector/Class_/RemoveInterfacesRector/config/configured_rule.php index 4b3a9eb9588..33f836cdac9 100644 --- a/rules-tests/Removing/Rector/Class_/RemoveInterfacesRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/Class_/RemoveInterfacesRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\Class_\RemoveInterfacesRector; use Rector\Tests\Removing\Rector\Class_\RemoveInterfacesRector\Source\SomeInterface; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveInterfacesRector::class) ->configure([SomeInterface::class]); }; diff --git a/rules-tests/Removing/Rector/Class_/RemoveParentRector/config/configured_rule.php b/rules-tests/Removing/Rector/Class_/RemoveParentRector/config/configured_rule.php index 384c47cdbce..63c9f2e6ace 100644 --- a/rules-tests/Removing/Rector/Class_/RemoveParentRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/Class_/RemoveParentRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\Class_\RemoveParentRector; use Rector\Tests\Removing\Rector\Class_\RemoveParentRector\Source\ParentTypeToBeRemoved; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveParentRector::class) ->configure([ParentTypeToBeRemoved::class]); }; diff --git a/rules-tests/Removing/Rector/Class_/RemoveTraitUseRector/config/configured_rule.php b/rules-tests/Removing/Rector/Class_/RemoveTraitUseRector/config/configured_rule.php index 40d24130f91..0e4978c1a95 100644 --- a/rules-tests/Removing/Rector/Class_/RemoveTraitUseRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/Class_/RemoveTraitUseRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\Class_\RemoveTraitUseRector; use Rector\Tests\Removing\Rector\Class_\RemoveTraitUseRector\Source\TraitToBeRemoved; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveTraitUseRector::class) ->configure([TraitToBeRemoved::class]); }; diff --git a/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallArgRector/config/configured_rule.php b/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallArgRector/config/configured_rule.php index 0d9ae89d27e..b662e294324 100644 --- a/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallArgRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallArgRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector; use Rector\Removing\ValueObject\RemoveFuncCallArg; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveFuncCallArgRector::class) ->configure([new RemoveFuncCallArg('ldap_first_attribute', 2)]); }; diff --git a/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallRector/config/configured_rule.php b/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallRector/config/configured_rule.php index c1b002f1a98..f4ce1be9396 100644 --- a/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/FuncCall/RemoveFuncCallRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\FuncCall\RemoveFuncCallRector; use Rector\Removing\ValueObject\RemoveFuncCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveFuncCallRector::class) ->configure([ new RemoveFuncCall('ini_get', [ diff --git a/rules-tests/Removing/Rector/Namespace_/RemoveNamespaceRector/config/configured_rule.php b/rules-tests/Removing/Rector/Namespace_/RemoveNamespaceRector/config/configured_rule.php index fa4e43e7c2c..989a699d185 100644 --- a/rules-tests/Removing/Rector/Namespace_/RemoveNamespaceRector/config/configured_rule.php +++ b/rules-tests/Removing/Rector/Namespace_/RemoveNamespaceRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Removing\Rector\Namespace_\RemoveNamespaceRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveNamespaceRector::class) ->configure(['App']); }; diff --git a/rules-tests/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector/config/configured_rule.php b/rules-tests/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector/config/configured_rule.php index b5693f7ff5e..5ce9a50c2b6 100644 --- a/rules-tests/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector/config/configured_rule.php +++ b/rules-tests/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\RemovingStatic\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(LocallyCalledStaticMethodToNonStaticRector::class); }; diff --git a/rules-tests/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector/config/configured_rule.php b/rules-tests/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector/config/configured_rule.php index a636caed4bb..125e2577adf 100644 --- a/rules-tests/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector; use Rector\Renaming\ValueObject\RenameClassAndConstFetch; use Rector\Renaming\ValueObject\RenameClassConstFetch; use Rector\Tests\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector\Source\DifferentClass; use Rector\Tests\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector\Source\LocalFormEvents; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassConstFetchRector::class) ->configure([ new RenameClassConstFetch(LocalFormEvents::class, 'PRE_BIND', 'PRE_SUBMIT'), diff --git a/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/configured_rule.php b/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/configured_rule.php index dfbd0cfa216..efc23805f34 100644 --- a/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\ClassMethod\RenameAnnotationRector; use Rector\Renaming\ValueObject\RenameAnnotationByType; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameAnnotationRector::class) ->configure([new RenameAnnotationByType('PHPUnit\Framework\TestCase', 'scenario', 'test')]); }; diff --git a/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/rename_everywhere.php b/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/rename_everywhere.php index f746d9a22d0..0a0f4879273 100644 --- a/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/rename_everywhere.php +++ b/rules-tests/Renaming/Rector/ClassMethod/RenameAnnotationRector/config/rename_everywhere.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\ClassMethod\RenameAnnotationRector; use Rector\Renaming\ValueObject\RenameAnnotation; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameAnnotationRector::class) ->configure([new RenameAnnotation('psalm-ignore', 'phpstan-ignore')]); }; diff --git a/rules-tests/Renaming/Rector/ConstFetch/RenameConstantRector/config/configured_rule.php b/rules-tests/Renaming/Rector/ConstFetch/RenameConstantRector/config/configured_rule.php index 2c397c209aa..8db7e81151c 100644 --- a/rules-tests/Renaming/Rector/ConstFetch/RenameConstantRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/ConstFetch/RenameConstantRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\ConstFetch\RenameConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameConstantRector::class) ->configure([ 'MYSQL_ASSOC' => 'MYSQLI_ASSOC', diff --git a/rules-tests/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector/config/configured_rule.php b/rules-tests/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector/config/configured_rule.php index 58321551086..54c962bae6b 100644 --- a/rules-tests/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\FileWithoutNamespace\PseudoNamespaceToNamespaceRector; use Rector\Renaming\ValueObject\PseudoNamespaceToNamespace; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PseudoNamespaceToNamespaceRector::class) ->configure([ new PseudoNamespaceToNamespace('PHPUnit_', ['PHPUnit_Framework_MockObject_MockObject']), diff --git a/rules-tests/Renaming/Rector/FuncCall/RenameFunctionAutoImportRector/config/configured_rule.php b/rules-tests/Renaming/Rector/FuncCall/RenameFunctionAutoImportRector/config/configured_rule.php index c20c2128af5..b6e2d26c688 100644 --- a/rules-tests/Renaming/Rector/FuncCall/RenameFunctionAutoImportRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/FuncCall/RenameFunctionAutoImportRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameFunctionRector::class) ->configure([ 'service' => 'Symfony\Component\DependencyInjection\Loader\Configurator\service', diff --git a/rules-tests/Renaming/Rector/FuncCall/RenameFunctionRector/config/configured_rule.php b/rules-tests/Renaming/Rector/FuncCall/RenameFunctionRector/config/configured_rule.php index ae496a7a91d..2919f741ac1 100644 --- a/rules-tests/Renaming/Rector/FuncCall/RenameFunctionRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/FuncCall/RenameFunctionRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameFunctionRector::class) ->configure([ 'view' => 'Laravel\Templating\render', diff --git a/rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/config/configured_rule.php b/rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/config/configured_rule.php index d6104d8beb0..34215e62a6b 100644 --- a/rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/MethodCall/RenameMethodRector/config/configured_rule.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\ValueObject\MethodCallRename; use Rector\Renaming\ValueObject\MethodCallRenameWithArrayKey; @@ -9,10 +10,9 @@ use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\AbstractTy use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\CustomType; use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\Foo; use Rector\Tests\Renaming\Rector\MethodCall\RenameMethodRector\Source\SomeSubscriber; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameMethodRector::class) ->configure([ new MethodCallRename(AbstractType::class, 'setDefaultOptions', 'configureOptions'), diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/complex_rename.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/complex_rename.php index dd719c58325..ffb1e022102 100644 --- a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/complex_rename.php +++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/complex_rename.php @@ -2,19 +2,19 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Renaming\Rector\MethodCall\RenameMethodRector; use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Renaming\ValueObject\MethodCallRename; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\NewClassWithNewMethod; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClassWithMethod; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ OldClassWithMethod::class => NewClassWithNewMethod::class, diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/configured_rule.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/configured_rule.php index e36ff8f8964..9acf9c2a144 100644 --- a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/configured_rule.php @@ -4,6 +4,7 @@ declare(strict_types=1); use Acme\Bar\DoNotUpdateExistingTargetNamespace; use Manual\Twig\TwigFilter; +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Fixture\DuplicatedClass; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\AbstractManualExtension; @@ -16,10 +17,9 @@ use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClass; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClassWithTypo; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\SomeFinalClass; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\SomeNonFinalClass; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'FqnizeNamespaced' => 'Abc\FqnizeNamespaced', diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/non_php_config.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/non_php_config.php index 838e4597482..69810548c12 100644 --- a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/non_php_config.php +++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/non_php_config.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\NewClass; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClass; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ diff --git a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_parent.php b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_parent.php index b56912ebe6f..ae0643786e5 100644 --- a/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_parent.php +++ b/rules-tests/Renaming/Rector/Name/RenameClassRector/config/rename_parent.php @@ -2,12 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'ThisClassDoesNotExistAnymore' => 'NewClassThatDoesNotExistEither', diff --git a/rules-tests/Renaming/Rector/Namespace_/RenameNamespaceRector/config/configured_rule.php b/rules-tests/Renaming/Rector/Namespace_/RenameNamespaceRector/config/configured_rule.php index 7c9b7ef7c51..3a003876e0b 100644 --- a/rules-tests/Renaming/Rector/Namespace_/RenameNamespaceRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/Namespace_/RenameNamespaceRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Namespace_\RenameNamespaceRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameNamespaceRector::class) ->configure([ 'OldNamespace' => 'NewNamespace', diff --git a/rules-tests/Renaming/Rector/PropertyFetch/RenamePropertyRector/config/configured_rule.php b/rules-tests/Renaming/Rector/PropertyFetch/RenamePropertyRector/config/configured_rule.php index a78b7c8a9c2..817ecc50752 100644 --- a/rules-tests/Renaming/Rector/PropertyFetch/RenamePropertyRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/PropertyFetch/RenamePropertyRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\PropertyFetch\RenamePropertyRector; use Rector\Renaming\ValueObject\RenameProperty; use Rector\Tests\Renaming\Rector\PropertyFetch\RenamePropertyRector\Source\ClassWithProperties; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenamePropertyRector::class) ->configure([ diff --git a/rules-tests/Renaming/Rector/StaticCall/RenameStaticMethodRector/config/configured_rule.php b/rules-tests/Renaming/Rector/StaticCall/RenameStaticMethodRector/config/configured_rule.php index ab3538d2717..12d93c03a90 100644 --- a/rules-tests/Renaming/Rector/StaticCall/RenameStaticMethodRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/StaticCall/RenameStaticMethodRector/config/configured_rule.php @@ -3,13 +3,13 @@ declare(strict_types=1); use Nette\Utils\Html; +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\StaticCall\RenameStaticMethodRector; use Rector\Renaming\ValueObject\RenameStaticMethod; use Rector\Tests\Renaming\Rector\StaticCall\RenameStaticMethodRector\Source\FormMacros; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameStaticMethodRector::class) ->configure([ diff --git a/rules-tests/Renaming/Rector/String_/RenameStringRector/config/configured_rule.php b/rules-tests/Renaming/Rector/String_/RenameStringRector/config/configured_rule.php index a0285eb8488..7cf60c1f036 100644 --- a/rules-tests/Renaming/Rector/String_/RenameStringRector/config/configured_rule.php +++ b/rules-tests/Renaming/Rector/String_/RenameStringRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\String_\RenameStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameStringRector::class) ->configure([ 'ROLE_PREVIOUS_ADMIN' => 'IS_IMPERSONATOR', diff --git a/rules-tests/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/config/configured_rule.php b/rules-tests/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/config/configured_rule.php index 182ec3a83f9..ac7b57b0891 100644 --- a/rules-tests/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/config/configured_rule.php +++ b/rules-tests/Restoration/Rector/ClassConstFetch/MissingClassConstantReferenceToStringRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Restoration\Rector\ClassConstFetch\MissingClassConstantReferenceToStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MissingClassConstantReferenceToStringRector::class); }; diff --git a/rules-tests/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector/config/configured_rule.php b/rules-tests/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector/config/configured_rule.php index 1efd61941ae..1d9ffe39a4a 100644 --- a/rules-tests/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector/config/configured_rule.php +++ b/rules-tests/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Restoration\Rector\ClassLike\UpdateFileNameByClassNameFileSystemRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UpdateFileNameByClassNameFileSystemRector::class); }; diff --git a/rules-tests/Restoration/Rector/Class_/RemoveFinalFromEntityRector/config/configured_rule.php b/rules-tests/Restoration/Rector/Class_/RemoveFinalFromEntityRector/config/configured_rule.php index a6278b20ed5..e17e48dde6f 100644 --- a/rules-tests/Restoration/Rector/Class_/RemoveFinalFromEntityRector/config/configured_rule.php +++ b/rules-tests/Restoration/Rector/Class_/RemoveFinalFromEntityRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Restoration\Rector\Class_\RemoveFinalFromEntityRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveFinalFromEntityRector::class); }; diff --git a/rules-tests/Restoration/Rector/Namespace_/CompleteImportForPartialAnnotationRector/config/configured_rule.php b/rules-tests/Restoration/Rector/Namespace_/CompleteImportForPartialAnnotationRector/config/configured_rule.php index 42df05ef80c..2fd185734c1 100644 --- a/rules-tests/Restoration/Rector/Namespace_/CompleteImportForPartialAnnotationRector/config/configured_rule.php +++ b/rules-tests/Restoration/Rector/Namespace_/CompleteImportForPartialAnnotationRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Restoration\Rector\Namespace_\CompleteImportForPartialAnnotationRector; use Rector\Restoration\ValueObject\CompleteImportForPartialAnnotation; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CompleteImportForPartialAnnotationRector::class) ->configure([new CompleteImportForPartialAnnotation('Doctrine\ORM\Mapping', 'ORM')]); }; diff --git a/rules-tests/Restoration/Rector/Property/MakeTypedPropertyNullableIfCheckedRector/config/configured_rule.php b/rules-tests/Restoration/Rector/Property/MakeTypedPropertyNullableIfCheckedRector/config/configured_rule.php index 9b09fdefb43..ca026c4c040 100644 --- a/rules-tests/Restoration/Rector/Property/MakeTypedPropertyNullableIfCheckedRector/config/configured_rule.php +++ b/rules-tests/Restoration/Rector/Property/MakeTypedPropertyNullableIfCheckedRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Restoration\Rector\Property\MakeTypedPropertyNullableIfCheckedRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MakeTypedPropertyNullableIfCheckedRector::class); }; diff --git a/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/configured_rule.php b/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/configured_rule.php index 9bdc97e1936..5819adefd71 100644 --- a/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/configured_rule.php +++ b/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BooleanInBooleanNotRuleFixerRector::class); }; diff --git a/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/treat_as_non_empty.php b/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/treat_as_non_empty.php index 173bfeb350a..c0e9d56735f 100644 --- a/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/treat_as_non_empty.php +++ b/rules-tests/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector/config/treat_as_non_empty.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BooleanInBooleanNotRuleFixerRector::class) ->configure([ BooleanInBooleanNotRuleFixerRector::TREAT_AS_NON_EMPTY => true, diff --git a/rules-tests/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector/config/configured_rule.php b/rules-tests/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector/config/configured_rule.php index 39751fe13c2..ac684878b59 100644 --- a/rules-tests/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector/config/configured_rule.php +++ b/rules-tests/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DisallowedEmptyRuleFixerRector::class); }; diff --git a/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/config/configured_rule.php b/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/config/configured_rule.php index cfe3c55702f..29b4c46fd7f 100644 --- a/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/config/configured_rule.php +++ b/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BooleanInIfConditionRuleFixerRector::class); }; diff --git a/rules-tests/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector/config/configured_rule.php b/rules-tests/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector/config/configured_rule.php index fcafb0d198d..26df8682d02 100644 --- a/rules-tests/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector/config/configured_rule.php +++ b/rules-tests/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(BooleanInTernaryOperatorRuleFixerRector::class); }; diff --git a/rules-tests/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector/config/configured_rule.php b/rules-tests/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector/config/configured_rule.php index f9baa75ff7b..309898e8432 100644 --- a/rules-tests/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector/config/configured_rule.php +++ b/rules-tests/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DisallowedShortTernaryRuleFixerRector::class); }; diff --git a/rules-tests/Transform/Rector/Assign/DimFetchAssignToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/Assign/DimFetchAssignToMethodCallRector/config/configured_rule.php index 1134983abfd..074c07d8b94 100644 --- a/rules-tests/Transform/Rector/Assign/DimFetchAssignToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Assign/DimFetchAssignToMethodCallRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Assign\DimFetchAssignToMethodCallRector\Source\SomeRoute; use Rector\Tests\Transform\Rector\Assign\DimFetchAssignToMethodCallRector\Source\SomeRouteList; use Rector\Transform\Rector\Assign\DimFetchAssignToMethodCallRector; use Rector\Transform\ValueObject\DimFetchAssignToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DimFetchAssignToMethodCallRector::class) ->configure([new DimFetchAssignToMethodCall(SomeRouteList::class, SomeRoute::class, 'addRoute')]); }; diff --git a/rules-tests/Transform/Rector/Assign/GetAndSetToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/Assign/GetAndSetToMethodCallRector/config/configured_rule.php index 5ec7dd628c9..a83abe6b78d 100644 --- a/rules-tests/Transform/Rector/Assign/GetAndSetToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Assign/GetAndSetToMethodCallRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Assign\GetAndSetToMethodCallRector\Source\Klarka; use Rector\Tests\Transform\Rector\Assign\GetAndSetToMethodCallRector\Source\SomeContainer; use Rector\Transform\Rector\Assign\GetAndSetToMethodCallRector; use Rector\Transform\ValueObject\GetAndSetToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetAndSetToMethodCallRector::class) ->configure([ new GetAndSetToMethodCall(SomeContainer::class, 'getService', 'addService'), diff --git a/rules-tests/Transform/Rector/Assign/PropertyAssignToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/Assign/PropertyAssignToMethodCallRector/config/configured_rule.php index 85d58d59beb..fabda967f32 100644 --- a/rules-tests/Transform/Rector/Assign/PropertyAssignToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Assign/PropertyAssignToMethodCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Assign\PropertyAssignToMethodCallRector\Source\ChoiceControl; use Rector\Transform\Rector\Assign\PropertyAssignToMethodCallRector; use Rector\Transform\ValueObject\PropertyAssignToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PropertyAssignToMethodCallRector::class) ->configure([ new PropertyAssignToMethodCall(ChoiceControl::class, 'checkAllowedValues', 'checkDefaultValue'), diff --git a/rules-tests/Transform/Rector/Assign/PropertyFetchToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/Assign/PropertyFetchToMethodCallRector/config/configured_rule.php index 2f1667cc223..44482bc2070 100644 --- a/rules-tests/Transform/Rector/Assign/PropertyFetchToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Assign/PropertyFetchToMethodCallRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Assign\PropertyFetchToMethodCallRector\Source\Generator; use Rector\Tests\Transform\Rector\Assign\PropertyFetchToMethodCallRector\Source\Translator; use Rector\Transform\Rector\Assign\PropertyFetchToMethodCallRector; use Rector\Transform\ValueObject\PropertyFetchToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(PropertyFetchToMethodCallRector::class) ->configure([ diff --git a/rules-tests/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector/config/configured_rule.php b/rules-tests/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector/config/configured_rule.php index e1682b49ea7..ed8576458fe 100644 --- a/rules-tests/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\Attribute\AttributeKeyToClassConstFetchRector; use Rector\Transform\ValueObject\AttributeKeyToClassConstFetch; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AttributeKeyToClassConstFetchRector::class) ->configure([ new AttributeKeyToClassConstFetch('Doctrine\ORM\Mapping\Column', 'type', 'Doctrine\DBAL\Types\Types', [ diff --git a/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/configured_rule.php b/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/configured_rule.php index 6a13bc6b09c..c6736b064cd 100644 --- a/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\ClassMethod\ReturnTypeWillChangeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeWillChangeRector::class); }; diff --git a/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/custom_config.php b/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/custom_config.php index 2505e6d0aa0..4c6e42ee363 100644 --- a/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/custom_config.php +++ b/rules-tests/Transform/Rector/ClassMethod/ReturnTypeWillChangeRector/config/custom_config.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\ClassMethod\ReturnTypeWillChangeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeWillChangeRector::class) ->configure([ 'ArrayAccess' => ['offsetExists'], diff --git a/rules-tests/Transform/Rector/ClassMethod/WrapReturnRector/config/configured_rule.php b/rules-tests/Transform/Rector/ClassMethod/WrapReturnRector/config/configured_rule.php index 9cf04557c4d..c80104c88ed 100644 --- a/rules-tests/Transform/Rector/ClassMethod/WrapReturnRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/ClassMethod/WrapReturnRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\ClassMethod\WrapReturnRector\Source\SomeReturnClass; use Rector\Transform\Rector\ClassMethod\WrapReturnRector; use Rector\Transform\ValueObject\WrapReturn; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(WrapReturnRector::class) ->configure([new WrapReturn(SomeReturnClass::class, 'getItem', true)]); }; diff --git a/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/configured_rule.php b/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/configured_rule.php index 04d2c001512..e3423e3ffd4 100644 --- a/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\Class_\AddAllowDynamicPropertiesAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddAllowDynamicPropertiesAttributeRector::class) ->configure(['*\Fixture\Process\*']); }; diff --git a/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php b/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php index 7b199d1aa6b..0aa889fabd4 100644 --- a/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php +++ b/rules-tests/Transform/Rector/Class_/AddAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\Class_\AddAllowDynamicPropertiesAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddAllowDynamicPropertiesAttributeRector::class); }; diff --git a/rules-tests/Transform/Rector/Class_/AddInterfaceByTraitRector/config/configured_rule.php b/rules-tests/Transform/Rector/Class_/AddInterfaceByTraitRector/config/configured_rule.php index 50030956954..b49a6a8dc82 100644 --- a/rules-tests/Transform/Rector/Class_/AddInterfaceByTraitRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Class_/AddInterfaceByTraitRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Class_\AddInterfaceByTraitRector\Source\SomeInterface; use Rector\Tests\Transform\Rector\Class_\AddInterfaceByTraitRector\Source\SomeTrait; use Rector\Transform\Rector\Class_\AddInterfaceByTraitRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddInterfaceByTraitRector::class) ->configure([ SomeTrait::class => SomeInterface::class, diff --git a/rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/config/configured_rule.php b/rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/config/configured_rule.php index cbf2069cf8a..ee1ad3aec39 100644 --- a/rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Class_/ChangeSingletonToServiceRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\Class_\ChangeSingletonToServiceRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeSingletonToServiceRector::class); }; diff --git a/rules-tests/Transform/Rector/Class_/MergeInterfacesRector/config/configured_rule.php b/rules-tests/Transform/Rector/Class_/MergeInterfacesRector/config/configured_rule.php index 3090fbc180c..4a16bb80ba0 100644 --- a/rules-tests/Transform/Rector/Class_/MergeInterfacesRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Class_/MergeInterfacesRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Class_\MergeInterfacesRector\Source\SomeInterface; use Rector\Tests\Transform\Rector\Class_\MergeInterfacesRector\Source\SomeOldInterface; use Rector\Transform\Rector\Class_\MergeInterfacesRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MergeInterfacesRector::class) ->configure([ SomeOldInterface::class => SomeInterface::class, diff --git a/rules-tests/Transform/Rector/Class_/ParentClassToTraitsRector/config/configured_rule.php b/rules-tests/Transform/Rector/Class_/ParentClassToTraitsRector/config/configured_rule.php index e888da419cf..35a37543fc7 100644 --- a/rules-tests/Transform/Rector/Class_/ParentClassToTraitsRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Class_/ParentClassToTraitsRector/config/configured_rule.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Source\AnotherParentObject; use Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Source\ParentObject; use Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Source\SecondTrait; use Rector\Tests\Transform\Rector\Class_\ParentClassToTraitsRector\Source\SomeTrait; use Rector\Transform\Rector\Class_\ParentClassToTraitsRector; use Rector\Transform\ValueObject\ParentClassToTraits; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParentClassToTraitsRector::class) ->configure([ new ParentClassToTraits(ParentObject::class, [SomeTrait::class]), diff --git a/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/configured_rule.php b/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/configured_rule.php index 18a5017fd08..894accfe04b 100644 --- a/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\Class_\RemoveAllowDynamicPropertiesAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAllowDynamicPropertiesAttributeRector::class) ->configure(['*\Fixture\Process\*']); }; diff --git a/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php b/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php index c1e4fae3db6..e368653fc64 100644 --- a/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php +++ b/rules-tests/Transform/Rector/Class_/RemoveAllowDynamicPropertiesAttributeRector/config/unconfigured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\Class_\RemoveAllowDynamicPropertiesAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveAllowDynamicPropertiesAttributeRector::class); }; diff --git a/rules-tests/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/config/configured_rule.php index 33ba8dfd2c3..87346bd7121 100644 --- a/rules-tests/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\FuncCall\ArgumentFuncCallToMethodCallRector; use Rector\Transform\ValueObject\ArgumentFuncCallToMethodCall; use Rector\Transform\ValueObject\ArrayFuncCallToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArgumentFuncCallToMethodCallRector::class) ->configure([ diff --git a/rules-tests/Transform/Rector/FuncCall/FuncCallToConstFetchRector/config/configured_rule.php b/rules-tests/Transform/Rector/FuncCall/FuncCallToConstFetchRector/config/configured_rule.php index 8f2e9b2c63a..71a0561edaa 100644 --- a/rules-tests/Transform/Rector/FuncCall/FuncCallToConstFetchRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/FuncCall/FuncCallToConstFetchRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FuncCallToConstFetchRector::class) ->configure([ 'php_sapi_name' => 'PHP_SAPI', diff --git a/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/config/configured_rule.php index d91b5faf004..8b4336811e5 100644 --- a/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\FuncCall\FuncCallToMethodCallRector\Source\SomeTranslator; use Rector\Transform\Rector\FuncCall\FuncCallToMethodCallRector; use Rector\Transform\ValueObject\FuncCallToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FuncCallToMethodCallRector::class) ->configure([ diff --git a/rules-tests/Transform/Rector/FuncCall/FuncCallToNewRector/config/configured_rule.php b/rules-tests/Transform/Rector/FuncCall/FuncCallToNewRector/config/configured_rule.php index 05555126935..902746f6710 100644 --- a/rules-tests/Transform/Rector/FuncCall/FuncCallToNewRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/FuncCall/FuncCallToNewRector/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\FuncCall\FuncCallToNewRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FuncCallToNewRector::class) ->configure([ 'collection' => 'Collection', diff --git a/rules-tests/Transform/Rector/FuncCall/FuncCallToStaticCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/FuncCall/FuncCallToStaticCallRector/config/configured_rule.php index b47a56ed193..6d1cf7b8a90 100644 --- a/rules-tests/Transform/Rector/FuncCall/FuncCallToStaticCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/FuncCall/FuncCallToStaticCallRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\FuncCall\FuncCallToStaticCallRector; use Rector\Transform\ValueObject\FuncCallToStaticCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FuncCallToStaticCallRector::class) ->configure([ new FuncCallToStaticCall('view', 'SomeStaticClass', 'render'), diff --git a/rules-tests/Transform/Rector/FunctionLike/FileGetContentsAndJsonDecodeToStaticCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/FunctionLike/FileGetContentsAndJsonDecodeToStaticCallRector/config/configured_rule.php index 7cc3b3e5430..983047a20f5 100644 --- a/rules-tests/Transform/Rector/FunctionLike/FileGetContentsAndJsonDecodeToStaticCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/FunctionLike/FileGetContentsAndJsonDecodeToStaticCallRector/config/configured_rule.php @@ -3,7 +3,6 @@ declare(strict_types=1); use Rector\Config\RectorConfig; - use Rector\Transform\Rector\FunctionLike\FileGetContentsAndJsonDecodeToStaticCallRector; use Rector\Transform\ValueObject\StaticCallRecipe; diff --git a/rules-tests/Transform/Rector/Isset_/UnsetAndIssetToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/Isset_/UnsetAndIssetToMethodCallRector/config/configured_rule.php index 8700bc737ca..6385e5f23e8 100644 --- a/rules-tests/Transform/Rector/Isset_/UnsetAndIssetToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/Isset_/UnsetAndIssetToMethodCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\Isset_\UnsetAndIssetToMethodCallRector\Source\LocalContainer; use Rector\Transform\Rector\Isset_\UnsetAndIssetToMethodCallRector; use Rector\Transform\ValueObject\UnsetAndIssetToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(UnsetAndIssetToMethodCallRector::class) ->configure([new UnsetAndIssetToMethodCall(LocalContainer::class, 'hasService', 'removeService')]); }; diff --git a/rules-tests/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector/config/configured_rule.php index 901594c59f8..1ed9f0a74da 100644 --- a/rules-tests/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\CallableInMethodCallToVariableRector\Source\DummyCache; use Rector\Transform\Rector\MethodCall\CallableInMethodCallToVariableRector; use Rector\Transform\ValueObject\CallableInMethodCallToVariable; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CallableInMethodCallToVariableRector::class) ->configure([new CallableInMethodCallToVariable(DummyCache::class, 'save', 1)]); }; diff --git a/rules-tests/Transform/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/config/configured_rule.php index 52faaa2d8f6..d0aec52ed50 100644 --- a/rules-tests/Transform/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/MethodCallToAnotherMethodCallWithArgumentsRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\MethodCallToAnotherMethodCallWithArgumentsRector\Source\NetteServiceDefinition; use Rector\Transform\Rector\MethodCall\MethodCallToAnotherMethodCallWithArgumentsRector; use Rector\Transform\ValueObject\MethodCallToAnotherMethodCallWithArguments; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MethodCallToAnotherMethodCallWithArgumentsRector::class) ->configure([ diff --git a/rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/config/configured_rule.php index 2a5d03d1e6c..ac701b72eaa 100644 --- a/rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/MethodCallToMethodCallRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Source\FirstDependency; use Rector\Tests\Transform\Rector\MethodCall\MethodCallToMethodCallRector\Source\SecondDependency; use Rector\Transform\Rector\MethodCall\MethodCallToMethodCallRector; use Rector\Transform\ValueObject\MethodCallToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MethodCallToMethodCallRector::class) ->configure([new MethodCallToMethodCall(FirstDependency::class, 'go', SecondDependency::class, 'away')]); diff --git a/rules-tests/Transform/Rector/MethodCall/MethodCallToPropertyFetchRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/MethodCallToPropertyFetchRector/config/configured_rule.php index 5dd2edfe454..d8e9b86d967 100644 --- a/rules-tests/Transform/Rector/MethodCall/MethodCallToPropertyFetchRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/MethodCallToPropertyFetchRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\MethodCallToPropertyFetchRector\Source\RenameToProperty; use Rector\Transform\Rector\MethodCall\MethodCallToPropertyFetchRector; use Rector\Transform\ValueObject\MethodCallToPropertyFetch; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MethodCallToPropertyFetchRector::class) ->configure([new MethodCallToPropertyFetch(RenameToProperty::class, 'getEntityManager', 'entityManager')]); }; diff --git a/rules-tests/Transform/Rector/MethodCall/MethodCallToStaticCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/MethodCallToStaticCallRector/config/configured_rule.php index ee7541b4cf0..3407a191735 100644 --- a/rules-tests/Transform/Rector/MethodCall/MethodCallToStaticCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/MethodCallToStaticCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\MethodCallToStaticCallRector\Source\AnotherDependency; use Rector\Transform\Rector\MethodCall\MethodCallToStaticCallRector; use Rector\Transform\ValueObject\MethodCallToStaticCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(MethodCallToStaticCallRector::class) ->configure([ diff --git a/rules-tests/Transform/Rector/MethodCall/ReplaceParentCallByPropertyCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/ReplaceParentCallByPropertyCallRector/config/configured_rule.php index 934b663d277..ea3746a2e8b 100644 --- a/rules-tests/Transform/Rector/MethodCall/ReplaceParentCallByPropertyCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/ReplaceParentCallByPropertyCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\ReplaceParentCallByPropertyCallRector\Source\TypeClassToReplaceMethodCallBy; use Rector\Transform\Rector\MethodCall\ReplaceParentCallByPropertyCallRector; use Rector\Transform\ValueObject\ReplaceParentCallByPropertyCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReplaceParentCallByPropertyCallRector::class) ->configure([ new ReplaceParentCallByPropertyCall(TypeClassToReplaceMethodCallBy::class, 'someMethod', 'someProperty'), diff --git a/rules-tests/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/config/configured_rule.php b/rules-tests/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/config/configured_rule.php index a65ffac2fb9..1cc55376d4b 100644 --- a/rules-tests/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/MethodCall/ServiceGetterToConstructorInjectionRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\MethodCall\ServiceGetterToConstructorInjectionRector\Source\AnotherService; use Rector\Tests\Transform\Rector\MethodCall\ServiceGetterToConstructorInjectionRector\Source\FirstService; use Rector\Transform\Rector\MethodCall\ServiceGetterToConstructorInjectionRector; use Rector\Transform\ValueObject\ServiceGetterToConstructorInjection; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ServiceGetterToConstructorInjectionRector::class) ->configure([ new ServiceGetterToConstructorInjection(FirstService::class, 'getAnotherService', AnotherService::class), diff --git a/rules-tests/Transform/Rector/New_/NewArgToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/New_/NewArgToMethodCallRector/config/configured_rule.php index 368ef50dff9..e2c4ec430ce 100644 --- a/rules-tests/Transform/Rector/New_/NewArgToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/New_/NewArgToMethodCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\New_\NewArgToMethodCallRector\Source\SomeDotenv; use Rector\Transform\Rector\New_\NewArgToMethodCallRector; use Rector\Transform\ValueObject\NewArgToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewArgToMethodCallRector::class) ->configure([new NewArgToMethodCall(SomeDotenv::class, true, 'usePutenv')]); }; diff --git a/rules-tests/Transform/Rector/New_/NewToConstructorInjectionRector/config/configured_rule.php b/rules-tests/Transform/Rector/New_/NewToConstructorInjectionRector/config/configured_rule.php index 823731517b8..8f540705682 100644 --- a/rules-tests/Transform/Rector/New_/NewToConstructorInjectionRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/New_/NewToConstructorInjectionRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\New_\NewToConstructorInjectionRector\Source\DummyValidator; use Rector\Transform\Rector\New_\NewToConstructorInjectionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewToConstructorInjectionRector::class) ->configure([DummyValidator::class]); }; diff --git a/rules-tests/Transform/Rector/New_/NewToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/New_/NewToMethodCallRector/config/configured_rule.php index 4100b765aab..559aee85576 100644 --- a/rules-tests/Transform/Rector/New_/NewToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/New_/NewToMethodCallRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\New_\NewToMethodCallRector\Source\MyClass; use Rector\Tests\Transform\Rector\New_\NewToMethodCallRector\Source\MyClassFactory; use Rector\Transform\Rector\New_\NewToMethodCallRector; use Rector\Transform\ValueObject\NewToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewToMethodCallRector::class) ->configure([new NewToMethodCall(MyClass::class, MyClassFactory::class, 'create')]); }; diff --git a/rules-tests/Transform/Rector/New_/NewToStaticCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/New_/NewToStaticCallRector/config/configured_rule.php index 563924b4c2e..6d5f84f3bf9 100644 --- a/rules-tests/Transform/Rector/New_/NewToStaticCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/New_/NewToStaticCallRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\New_\NewToStaticCallRector\Source\FromNewClass; use Rector\Tests\Transform\Rector\New_\NewToStaticCallRector\Source\IntoStaticClass; use Rector\Transform\Rector\New_\NewToStaticCallRector; use Rector\Transform\ValueObject\NewToStaticCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(NewToStaticCallRector::class) ->configure([new NewToStaticCall(FromNewClass::class, IntoStaticClass::class, 'run')]); }; diff --git a/rules-tests/Transform/Rector/StaticCall/StaticCallToFuncCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/StaticCall/StaticCallToFuncCallRector/config/configured_rule.php index 4fd50c96a5f..35937858d48 100644 --- a/rules-tests/Transform/Rector/StaticCall/StaticCallToFuncCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/StaticCall/StaticCallToFuncCallRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\StaticCall\StaticCallToFuncCallRector\Source\SomeOldStaticClass; use Rector\Transform\Rector\StaticCall\StaticCallToFuncCallRector; use Rector\Transform\ValueObject\StaticCallToFuncCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StaticCallToFuncCallRector::class) ->configure([new StaticCallToFuncCall(SomeOldStaticClass::class, 'render', 'view')]); }; diff --git a/rules-tests/Transform/Rector/StaticCall/StaticCallToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/StaticCall/StaticCallToMethodCallRector/config/configured_rule.php index 4f087efc4e6..1f67f4f1843 100644 --- a/rules-tests/Transform/Rector/StaticCall/StaticCallToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/StaticCall/StaticCallToMethodCallRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\StaticCall\StaticCallToMethodCallRector; use Rector\Transform\ValueObject\StaticCallToMethodCall; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StaticCallToMethodCallRector::class) ->configure([ new StaticCallToMethodCall( diff --git a/rules-tests/Transform/Rector/StaticCall/StaticCallToNewRector/config/configured_rule.php b/rules-tests/Transform/Rector/StaticCall/StaticCallToNewRector/config/configured_rule.php index 5a16cedb912..58c1e67743c 100644 --- a/rules-tests/Transform/Rector/StaticCall/StaticCallToNewRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/StaticCall/StaticCallToNewRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Tests\Transform\Rector\StaticCall\StaticCallToNewRector\Source\SomeJsonResponse; use Rector\Transform\Rector\StaticCall\StaticCallToNewRector; use Rector\Transform\ValueObject\StaticCallToNew; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StaticCallToNewRector::class) ->configure([new StaticCallToNew(SomeJsonResponse::class, 'create')]); }; diff --git a/rules-tests/Transform/Rector/String_/StringToClassConstantRector/config/configured_rule.php b/rules-tests/Transform/Rector/String_/StringToClassConstantRector/config/configured_rule.php index 972683b3145..8a321bc1da0 100644 --- a/rules-tests/Transform/Rector/String_/StringToClassConstantRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/String_/StringToClassConstantRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\String_\StringToClassConstantRector; use Rector\Transform\ValueObject\StringToClassConstant; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringToClassConstantRector::class) ->configure([ diff --git a/rules-tests/Transform/Rector/String_/ToStringToMethodCallRector/config/configured_rule.php b/rules-tests/Transform/Rector/String_/ToStringToMethodCallRector/config/configured_rule.php index 73f9d42212f..fd97bdc562e 100644 --- a/rules-tests/Transform/Rector/String_/ToStringToMethodCallRector/config/configured_rule.php +++ b/rules-tests/Transform/Rector/String_/ToStringToMethodCallRector/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Transform\Rector\String_\ToStringToMethodCallRector; use Symfony\Component\Config\ConfigCache; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ToStringToMethodCallRector::class) ->configure([ ConfigCache::class => 'getPath', diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector/config/configured_rule.php index a8b19ddcaa1..83fe1b56a08 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddArrayParamDocTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector/config/configured_rule.php index aed85f2462a..b234145c172 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddArrayReturnDocTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php index 747a9a91887..7dd809cdcc9 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AddMethodCallBasedStrictParamTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php index 5e43e374087..9c6e90474ee 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::INTERSECTION_TYPES); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AddMethodCallBasedStrictParamTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php index a88e9bcfa2b..ee370f36053 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AddMethodCallBasedStrictParamTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php index 855be48fd57..0d867f4b5f5 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php @@ -5,6 +5,7 @@ declare(strict_types=1); use PHPStan\Type\MixedType; use PHPStan\Type\ObjectType; use PHPStan\Type\StringType; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector\Contract\ParentInterfaceWithChangeTypeInterface; @@ -13,10 +14,9 @@ use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRecto use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ParserInterface; use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddParamTypeDeclaration; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddParamTypeDeclarationRector::class) ->configure([ @@ -36,6 +36,6 @@ return static function (ContainerConfigurator $containerConfigurator): void { new AddParamTypeDeclaration(ParentTypeToMixed::class, 'process', 0, new MixedType(true)), ]); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::MIXED_TYPE); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector/config/configured_rule.php index 1e43bbc411a..7d914e5c9d1 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector/config/configured_rule.php @@ -4,16 +4,16 @@ declare(strict_types=1); use PHPStan\Type\MixedType; use PHPStan\Type\VoidType; +use Rector\Config\RectorConfig; use Rector\StaticTypeMapper\ValueObject\Type\SimpleStaticType; use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector\Fixture\ReturnOfStatic; use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector\Fixture\ReturnTheMixed; use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector\Source\PHPUnitTestCase; use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddReturnTypeDeclaration; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddReturnTypeDeclarationRector::class) ->configure([ diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php index 4af22258dae..411fdc22439 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddVoidReturnTypeWhereNoReturnRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/phpdoc_void.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/phpdoc_void.php index f18407951fc..00bfd12fed2 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/phpdoc_void.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/phpdoc_void.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddVoidReturnTypeWhereNoReturnRector::class) ->configure([ diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ArrayShapeFromConstantArrayReturnRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ArrayShapeFromConstantArrayReturnRector/config/configured_rule.php index c498d689b06..b8dac9f0aeb 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ArrayShapeFromConstantArrayReturnRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ArrayShapeFromConstantArrayReturnRector/config/configured_rule.php @@ -2,11 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ArrayShapeFromConstantArrayReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrayShapeFromConstantArrayReturnRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector/config/configured_rule.php index f66da1a0714..9e25165b0e9 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParamTypeByMethodCallTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByParentCallTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByParentCallTypeRector/config/configured_rule.php index c7423ee4469..605f0a43c49 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByParentCallTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByParentCallTypeRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParamTypeByParentCallTypeRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnAnnotationIncorrectNullableRector/config/config.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnAnnotationIncorrectNullableRector/config/config.php index 1d8a06f645b..a9578031f2a 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnAnnotationIncorrectNullableRector/config/config.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnAnnotationIncorrectNullableRector/config/config.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnAnnotationIncorrectNullableRector; +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnAnnotationIncorrectNullableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnAnnotationIncorrectNullableRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php index 53a70ba522e..e04a41e8a42 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReturnNeverTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule_php72.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule_php72.php index adf3a6f817d..95792e5e85c 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule_php72.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule_php72.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_72); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReturnNeverTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php index fb208df7ced..c2f86cfa023 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php @@ -2,16 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; - use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeFromReturnNewRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::STATIC_RETURN_TYPE); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php index 1fb0d241912..d40a885cb1c 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeFromReturnNewRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::STATIC_RETURN_TYPE - 1); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/configured_rule.php index 0e9950d3095..e177c6309fe 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeFromStrictTypedCallRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/php80_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/php80_rule.php index 6a61ec44210..327f729fc1e 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/php80_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/config/php80_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeFromStrictTypedCallRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php index 2f27395e053..84c75f342b1 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeFromStrictTypedPropertyRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector/config/before_union_types.php b/rules-tests/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector/config/before_union_types.php index 893297c4033..98069cda7db 100644 --- a/rules-tests/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector/config/before_union_types.php +++ b/rules-tests/TypeDeclaration/Rector/Closure/AddClosureReturnTypeRector/config/before_union_types.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AddClosureReturnTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/before_union_types.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/before_union_types.php index 71ba4bf5672..f4d2342c1a2 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/before_union_types.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/before_union_types.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ParamTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/configured_rule.php index 318b4d6e7f0..bb6bcb49f27 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParamTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/typed_properties.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/typed_properties.php index 178920ff4b1..da4e95a2337 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/typed_properties.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/config/typed_properties.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ParamTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/before_static_type.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/before_static_type.php index 40e6ca286e6..f1bbcfc4c59 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/before_static_type.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/before_static_type.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::STATIC_RETURN_TYPE - 1); $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, __DIR__ . '/../../../../../../phpstan-for-rector.neon'); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReturnTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/import_names.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/import_names.php index 5baf9aaeac8..e693da84f72 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/import_names.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/import_names.php @@ -2,17 +2,17 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::STATIC_RETURN_TYPE - 1); $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, __DIR__ . '/../../../../../../phpstan-for-rector.neon'); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReturnTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_80.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_80.php index b5ada1e910f..62b33b4d66b 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_80.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_80.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::STATIC_RETURN_TYPE); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReturnTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_81.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_81.php index 2926d8387c4..be30522fd16 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_81.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector/config/php_81.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReturnTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector/config/configured_rule.php index ddab7229fac..8f15da9d954 100644 --- a/rules-tests/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/MethodCall/FormerNullableArgumentToScalarTypedRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\MethodCall\FormerNullableArgumentToScalarTypedRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(FormerNullableArgumentToScalarTypedRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector/config/configured_rule.php index 52f8f4cbeef..ad6a8e09c61 100644 --- a/rules-tests/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Param\ParamTypeFromStrictTypedPropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ParamTypeFromStrictTypedPropertyRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/AddPropertyTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/AddPropertyTypeDeclarationRector/config/configured_rule.php index 9abaf6bf23b..658a8eafdb3 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/AddPropertyTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/AddPropertyTypeDeclarationRector/config/configured_rule.php @@ -4,14 +4,14 @@ declare(strict_types=1); use PHPStan\Type\IntegerType; use PHPStan\Type\StringType; +use Rector\Config\RectorConfig; use Rector\Tests\TypeDeclaration\Rector\Property\AddPropertyTypeDeclarationRector\Source\ParentClassWithProperty; use Rector\Tests\TypeDeclaration\Rector\Property\AddPropertyTypeDeclarationRector\Source\SomeTraitWithProperty; use Rector\TypeDeclaration\Rector\Property\AddPropertyTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddPropertyTypeDeclaration; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddPropertyTypeDeclarationRector::class) ->configure([ diff --git a/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/configured_rule.php index 67aa2ff6528..16df0cb4a84 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\PropertyTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(PropertyTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/typed_property.php b/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/typed_property.php index 39b532bd0f7..e6daf5bb745 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/typed_property.php +++ b/rules-tests/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector/config/typed_property.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\PropertyTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(PropertyTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php index ec843b513e0..36c7f4b0e25 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromAssignsRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::INTERSECTION_TYPES); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php index ba32e580982..0e3594df333 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php @@ -2,16 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromAssignsRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_php73.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_php73.php index 3fe1839a022..dc66bf39fab 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_php73.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_php73.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromStrictConstructorRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES - 1); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php index 4217ce4fcb8..9dcd1b4400d 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromStrictConstructorRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, value: PhpVersionFeature::INTERSECTION_TYPES); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/configured_rule.php index 19913105983..f862cd58261 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromStrictGetterMethodReturnTypeRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/rule_php73.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/rule_php73.php index 41977520717..0df232899e6 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/rule_php73.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector/config/rule_php73.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromStrictGetterMethodReturnTypeRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES - 1); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/config/config.php b/rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/config/config.php index 36801189ae8..31c4b8957ce 100755 --- a/rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/config/config.php +++ b/rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/config/config.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace Utils\Rector\Tests\Rector\VarAnnotationMissingNullableRectorTest; +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\VarAnnotationIncorrectNullableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(VarAnnotationIncorrectNullableRector::class); }; diff --git a/rules-tests/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector/config/configured_rule.php b/rules-tests/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector/config/configured_rule.php index 0df3e1f86f6..cd4427614c5 100644 --- a/rules-tests/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector/config/configured_rule.php +++ b/rules-tests/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\ValueObject\Visibility; use Rector\Tests\Visibility\Rector\ClassConst\ChangeConstantVisibilityRector\Source\ParentObject; use Rector\Visibility\Rector\ClassConst\ChangeConstantVisibilityRector; use Rector\Visibility\ValueObject\ChangeConstantVisibility; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeConstantVisibilityRector::class) ->configure([ new ChangeConstantVisibility(ParentObject::class, 'TO_BE_PUBLIC_CONSTANT', Visibility::PUBLIC), diff --git a/rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/config/configured_rule.php b/rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/config/configured_rule.php index 2782d225d5f..cb26145dfef 100644 --- a/rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/config/configured_rule.php +++ b/rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/config/configured_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\ValueObject\Visibility; use Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Source\ParentObject; use Rector\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector; use Rector\Visibility\ValueObject\ChangeMethodVisibility; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeMethodVisibilityRector::class) ->configure([ diff --git a/rules-tests/Visibility/Rector/ClassMethod/ExplicitPublicClassMethodRector/config/configured_rule.php b/rules-tests/Visibility/Rector/ClassMethod/ExplicitPublicClassMethodRector/config/configured_rule.php index 822c0c7008d..7aaff1cdb4c 100644 --- a/rules-tests/Visibility/Rector/ClassMethod/ExplicitPublicClassMethodRector/config/configured_rule.php +++ b/rules-tests/Visibility/Rector/ClassMethod/ExplicitPublicClassMethodRector/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Visibility\Rector\ClassMethod\ExplicitPublicClassMethodRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExplicitPublicClassMethodRector::class); }; diff --git a/tests/Application/ApplicationFileProcessor/config/configured_rule.php b/tests/Application/ApplicationFileProcessor/config/configured_rule.php index 74c934fc229..1b73931492d 100644 --- a/tests/Application/ApplicationFileProcessor/config/configured_rule.php +++ b/tests/Application/ApplicationFileProcessor/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Tests\Application\ApplicationFileProcessor\Source\Rector\ChangeTextRector; use Rector\Core\Tests\Application\ApplicationFileProcessor\Source\TextFileProcessor; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->public() ->autowire() diff --git a/tests/Configuration/ValueObjectInliner/config/config_with_nested_union_type_value_objects.php b/tests/Configuration/ValueObjectInliner/config/config_with_nested_union_type_value_objects.php index fc189791ebb..e95ae4462db 100644 --- a/tests/Configuration/ValueObjectInliner/config/config_with_nested_union_type_value_objects.php +++ b/tests/Configuration/ValueObjectInliner/config/config_with_nested_union_type_value_objects.php @@ -7,13 +7,13 @@ namespace Rector\Core\Tests\Configuration\ValueObjectInliner\config; use PHPStan\Type\NullType; use PHPStan\Type\StringType; use PHPStan\Type\UnionType; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\ValueObjectInliner; use Rector\Core\Tests\Configuration\ValueObjectInliner\Source\ServiceWithValueObject; use Rector\Core\Tests\Configuration\ValueObjectInliner\Source\WithType; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->public() diff --git a/tests/Configuration/ValueObjectInliner/config/config_with_nested_value_objects.php b/tests/Configuration/ValueObjectInliner/config/config_with_nested_value_objects.php index 733b0f7bc9a..3c868a38ecf 100644 --- a/tests/Configuration/ValueObjectInliner/config/config_with_nested_value_objects.php +++ b/tests/Configuration/ValueObjectInliner/config/config_with_nested_value_objects.php @@ -6,13 +6,13 @@ namespace Rector\Core\Tests\Configuration\ValueObjectInliner\config; use PHPStan\Type\IntegerType; use PHPStan\Type\StringType; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\ValueObjectInliner; use Rector\Core\Tests\Configuration\ValueObjectInliner\Source\ServiceWithValueObject; use Rector\Core\Tests\Configuration\ValueObjectInliner\Source\WithType; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->public() diff --git a/tests/DependencyInjection/config/first_config.php b/tests/DependencyInjection/config/first_config.php index 111d59e5868..15baa06b6a7 100644 --- a/tests/DependencyInjection/config/first_config.php +++ b/tests/DependencyInjection/config/first_config.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'old_1' => 'new_1', diff --git a/tests/DependencyInjection/config/main_config_with_only_imports.php b/tests/DependencyInjection/config/main_config_with_only_imports.php index 99943a2591b..632e17e57d3 100644 --- a/tests/DependencyInjection/config/main_config_with_only_imports.php +++ b/tests/DependencyInjection/config/main_config_with_only_imports.php @@ -2,9 +2,9 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(__DIR__ . '/first_config.php'); - $containerConfigurator->import(__DIR__ . '/second_config.php'); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(__DIR__ . '/first_config.php'); + $rectorConfig->import(__DIR__ . '/second_config.php'); }; diff --git a/tests/DependencyInjection/config/main_config_with_override_value.php b/tests/DependencyInjection/config/main_config_with_override_value.php index 161833d1b31..076fcf03f73 100644 --- a/tests/DependencyInjection/config/main_config_with_override_value.php +++ b/tests/DependencyInjection/config/main_config_with_override_value.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->call('configure', [[ 'old_2' => 'new_2', @@ -15,6 +15,6 @@ return static function (ContainerConfigurator $containerConfigurator): void { 'old_4' => 'new_4', ]]); - $containerConfigurator->import(__DIR__ . '/first_config.php'); - $containerConfigurator->import(__DIR__ . '/second_config.php'); + $rectorConfig->import(__DIR__ . '/first_config.php'); + $rectorConfig->import(__DIR__ . '/second_config.php'); }; diff --git a/tests/DependencyInjection/config/main_config_with_own_value.php b/tests/DependencyInjection/config/main_config_with_own_value.php index 08ac5fc3ad8..95b296c46eb 100644 --- a/tests/DependencyInjection/config/main_config_with_own_value.php +++ b/tests/DependencyInjection/config/main_config_with_own_value.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->call('configure', [[ 'old_3' => 'new_3', @@ -15,6 +15,6 @@ return static function (ContainerConfigurator $containerConfigurator): void { 'old_4' => 'new_4', ]]); - $containerConfigurator->import(__DIR__ . '/first_config.php'); - $containerConfigurator->import(__DIR__ . '/second_config.php'); + $rectorConfig->import(__DIR__ . '/first_config.php'); + $rectorConfig->import(__DIR__ . '/second_config.php'); }; diff --git a/tests/DependencyInjection/config/one_set.php b/tests/DependencyInjection/config/one_set.php index d9f6b72ac22..ba508428e59 100644 --- a/tests/DependencyInjection/config/one_set.php +++ b/tests/DependencyInjection/config/one_set.php @@ -2,9 +2,9 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PHPUnit\Set\PHPUnitSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_60); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(PHPUnitSetList::PHPUNIT_60); }; diff --git a/tests/DependencyInjection/config/one_set_with_own_rename.php b/tests/DependencyInjection/config/one_set_with_own_rename.php index 15c4b444434..57f87b82fc2 100644 --- a/tests/DependencyInjection/config/one_set_with_own_rename.php +++ b/tests/DependencyInjection/config/one_set_with_own_rename.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_60); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(PHPUnitSetList::PHPUNIT_60); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'Old' => 'New', diff --git a/tests/DependencyInjection/config/second_config.php b/tests/DependencyInjection/config/second_config.php index a80ac2cfb69..8f2adf3db57 100644 --- a/tests/DependencyInjection/config/second_config.php +++ b/tests/DependencyInjection/config/second_config.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->call('configure', [[ 'old_2' => 'new_2', diff --git a/tests/DependencyInjection/config/two_sets.php b/tests/DependencyInjection/config/two_sets.php index 6cc66fdcfb1..136b79d570b 100644 --- a/tests/DependencyInjection/config/two_sets.php +++ b/tests/DependencyInjection/config/two_sets.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Symfony\Set\TwigSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_60); - $containerConfigurator->import(TwigSetList::TWIG_20); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(PHPUnitSetList::PHPUNIT_60); + $rectorConfig->import(TwigSetList::TWIG_20); }; diff --git a/tests/DependencyInjection/config/two_sets_with_own_rename.php b/tests/DependencyInjection/config/two_sets_with_own_rename.php index 893ef2e5543..1ed5951b0a8 100644 --- a/tests/DependencyInjection/config/two_sets_with_own_rename.php +++ b/tests/DependencyInjection/config/two_sets_with_own_rename.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Symfony\Set\TwigSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_60); - $containerConfigurator->import(TwigSetList::TWIG_20); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(PHPUnitSetList::PHPUNIT_60); + $rectorConfig->import(TwigSetList::TWIG_20); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->call('configure', [[ 'Old' => 'New', diff --git a/tests/Exclusion/config/some_config.php b/tests/Exclusion/config/some_config.php index 2fd71c1527c..60d2cdc08bb 100644 --- a/tests/Exclusion/config/some_config.php +++ b/tests/Exclusion/config/some_config.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector; use Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveEmptyClassMethodRector::class); $services->set(RemoveDeadZeroAndOneOperationRector::class); }; diff --git a/tests/FileSystem/FilesFinder/ExcludePaths/config/config-with-excluded-paths.php b/tests/FileSystem/FilesFinder/ExcludePaths/config/config-with-excluded-paths.php index a9b478f09ec..17dd58cb310 100644 --- a/tests/FileSystem/FilesFinder/ExcludePaths/config/config-with-excluded-paths.php +++ b/tests/FileSystem/FilesFinder/ExcludePaths/config/config-with-excluded-paths.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::SKIP, ['*/ShouldBeExcluded/*']); }; diff --git a/tests/FileSystem/FilesFinder/config/disable_follow_symlinks.php b/tests/FileSystem/FilesFinder/config/disable_follow_symlinks.php index 71a94d0086e..2b88b628638 100644 --- a/tests/FileSystem/FilesFinder/config/disable_follow_symlinks.php +++ b/tests/FileSystem/FilesFinder/config/disable_follow_symlinks.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::FOLLOW_SYMLINKS, false); }; diff --git a/tests/FileSystem/FilesFinder/config/enable_follow_symlinks.php b/tests/FileSystem/FilesFinder/config/enable_follow_symlinks.php index 2cba38a6ec8..c8feb6111cf 100644 --- a/tests/FileSystem/FilesFinder/config/enable_follow_symlinks.php +++ b/tests/FileSystem/FilesFinder/config/enable_follow_symlinks.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::FOLLOW_SYMLINKS, true); }; diff --git a/tests/FileSystem/FilesFinder/config/test_broken_symlinks.php b/tests/FileSystem/FilesFinder/config/test_broken_symlinks.php index cbf49ed12e9..eae5e08418a 100644 --- a/tests/FileSystem/FilesFinder/config/test_broken_symlinks.php +++ b/tests/FileSystem/FilesFinder/config/test_broken_symlinks.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::SKIP, [__DIR__ . '/../SourceWithBrokenSymlinks/folder1']); }; diff --git a/tests/Issues/AliasedImportDouble/config/configured_rule.php b/tests/Issues/AliasedImportDouble/config/configured_rule.php index d6cd347513e..6121ed0dc49 100644 --- a/tests/Issues/AliasedImportDouble/config/configured_rule.php +++ b/tests/Issues/AliasedImportDouble/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Tests\Issues\AliasedImportDouble\Rector\ClassMethod\AddAliasImportRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddAliasImportRector::class); }; diff --git a/tests/Issues/AnnotationImport/config/configured_rule.php b/tests/Issues/AnnotationImport/config/configured_rule.php index 3cbede451a6..1c34f12f30b 100644 --- a/tests/Issues/AnnotationImport/config/configured_rule.php +++ b/tests/Issues/AnnotationImport/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/AutoImportBackslashed/config/configured_rule.php b/tests/Issues/AutoImportBackslashed/config/configured_rule.php index fb3166108ba..77a65322a17 100644 --- a/tests/Issues/AutoImportBackslashed/config/configured_rule.php +++ b/tests/Issues/AutoImportBackslashed/config/configured_rule.php @@ -3,15 +3,15 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExplicitBoolCompareRector::class); $services->set(ReturnTypeDeclarationRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/AutoImportBeforeDocblock/config/configured_rule.php b/tests/Issues/AutoImportBeforeDocblock/config/configured_rule.php index 3cbede451a6..1c34f12f30b 100644 --- a/tests/Issues/AutoImportBeforeDocblock/config/configured_rule.php +++ b/tests/Issues/AutoImportBeforeDocblock/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/AutoImportDocInUse/config/configured_rule.php b/tests/Issues/AutoImportDocInUse/config/configured_rule.php index 3cbede451a6..1c34f12f30b 100644 --- a/tests/Issues/AutoImportDocInUse/config/configured_rule.php +++ b/tests/Issues/AutoImportDocInUse/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/ComplexReadOnly/config/configured_rule.php b/tests/Issues/ComplexReadOnly/config/configured_rule.php index b33ce8898b3..163212681cc 100644 --- a/tests/Issues/ComplexReadOnly/config/configured_rule.php +++ b/tests/Issues/ComplexReadOnly/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php81\Rector\Property\ReadOnlyPropertyRector; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnTypeDeclarationRector::class); $services->set(ReadOnlyPropertyRector::class); }; diff --git a/tests/Issues/ConstructorPromoAnnotationToAttribute/config/configured_rule.php b/tests/Issues/ConstructorPromoAnnotationToAttribute/config/configured_rule.php index afe99060051..bfe9046067c 100644 --- a/tests/Issues/ConstructorPromoAnnotationToAttribute/config/configured_rule.php +++ b/tests/Issues/ConstructorPromoAnnotationToAttribute/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClassPropertyAssignToConstructorPromotionRector::class); $services->set(AnnotationToAttributeRector::class); diff --git a/tests/Issues/CountOnNullExactlyArray/config/configured_rule.php b/tests/Issues/CountOnNullExactlyArray/config/configured_rule.php index e0ea31cb483..1a532355ae9 100644 --- a/tests/Issues/CountOnNullExactlyArray/config/configured_rule.php +++ b/tests/Issues/CountOnNullExactlyArray/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php71\Rector\FuncCall\CountOnNullRector; use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeReadOnlyVariableWithDefaultValueToConstantRector::class); $services->set(CountOnNullRector::class); }; diff --git a/tests/Issues/CovariantTrio/config/covariant_trio.php b/tests/Issues/CovariantTrio/config/covariant_trio.php index 6b09458785d..eafd71cfd5a 100644 --- a/tests/Issues/CovariantTrio/config/covariant_trio.php +++ b/tests/Issues/CovariantTrio/config/covariant_trio.php @@ -2,18 +2,18 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; use Rector\DowngradePhp70\Rector\Coalesce\DowngradeNullCoalesceRector; use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeScalarTypeDeclarationRector; use Rector\DowngradePhp73\Rector\FuncCall\DowngradeArrayKeyFirstLastRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_70); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeArrayKeyFirstLastRector::class); $services->set(DowngradeScalarTypeDeclarationRector::class); $services->set(DowngradeNullCoalesceRector::class); diff --git a/tests/Issues/DoubleImportedTraitUse/config/double_imported_trait_use.php b/tests/Issues/DoubleImportedTraitUse/config/double_imported_trait_use.php index ba0e6dfccd1..e65da199962 100644 --- a/tests/Issues/DoubleImportedTraitUse/config/double_imported_trait_use.php +++ b/tests/Issues/DoubleImportedTraitUse/config/double_imported_trait_use.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\PHPUnit\Rector\Class_\AddProphecyTraitRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(AddProphecyTraitRector::class); $services->set(AddArrayParamDocTypeRector::class); }; diff --git a/tests/Issues/DoubleRun/config/configured_rule.php b/tests/Issues/DoubleRun/config/configured_rule.php index 6016bd87422..f503970baf3 100644 --- a/tests/Issues/DoubleRun/config/configured_rule.php +++ b/tests/Issues/DoubleRun/config/configured_rule.php @@ -2,9 +2,9 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::DEAD_CODE); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::DEAD_CODE); }; diff --git a/tests/Issues/DowngradeNewInArrayInitializerPromotion/config/configured_rule.php b/tests/Issues/DowngradeNewInArrayInitializerPromotion/config/configured_rule.php index 7a9fb9bb275..7ba23022e4a 100644 --- a/tests/Issues/DowngradeNewInArrayInitializerPromotion/config/configured_rule.php +++ b/tests/Issues/DowngradeNewInArrayInitializerPromotion/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector; use Rector\DowngradePhp80\Rector\Class_\DowngradePropertyPromotionRector; use Rector\DowngradePhp81\Rector\FunctionLike\DowngradeNewInInitializerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNewInInitializerRector::class); $services->set(DowngradePropertyPromotionRector::class); $services->set(DowngradeTypedPropertyRector::class); diff --git a/tests/Issues/DowngradeScalarString/config/configured_rule.php b/tests/Issues/DowngradeScalarString/config/configured_rule.php index 1ffebf0a30a..3f077015403 100644 --- a/tests/Issues/DowngradeScalarString/config/configured_rule.php +++ b/tests/Issues/DowngradeScalarString/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeScalarTypeDeclarationRector; use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeStringReturnTypeOnToStringRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeStringReturnTypeOnToStringRector::class); $services->set(DowngradeScalarTypeDeclarationRector::class); }; diff --git a/tests/Issues/EarlyReturnResourceToObject/config/configured_rule.php b/tests/Issues/EarlyReturnResourceToObject/config/configured_rule.php index f883ea736e6..873d024e388 100644 --- a/tests/Issues/EarlyReturnResourceToObject/config/configured_rule.php +++ b/tests/Issues/EarlyReturnResourceToObject/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::EARLY_RETURN); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::EARLY_RETURN); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(Php8ResourceReturnToObjectRector::class); }; diff --git a/tests/Issues/GetCalledClassToSelfAndStatic/config/configured_rule.php b/tests/Issues/GetCalledClassToSelfAndStatic/config/configured_rule.php index bd54b02e6ac..1c00218f6fb 100644 --- a/tests/Issues/GetCalledClassToSelfAndStatic/config/configured_rule.php +++ b/tests/Issues/GetCalledClassToSelfAndStatic/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php55\Rector\FuncCall\GetCalledClassToSelfClassRector; use Rector\Php55\Rector\FuncCall\GetCalledClassToStaticClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(GetCalledClassToSelfClassRector::class); $services->set(GetCalledClassToStaticClassRector::class); }; diff --git a/tests/Issues/IfElseAssignReturnUsed/config/configured_rule.php b/tests/Issues/IfElseAssignReturnUsed/config/configured_rule.php index 60586f39796..e031fa882a7 100644 --- a/tests/Issues/IfElseAssignReturnUsed/config/configured_rule.php +++ b/tests/Issues/IfElseAssignReturnUsed/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class); $services->set(SimplifyIfElseToTernaryRector::class); }; diff --git a/tests/Issues/InfiniteLoop/config/infinite_loop.php b/tests/Issues/InfiniteLoop/config/infinite_loop.php index a933da2a86a..96cfa747022 100644 --- a/tests/Issues/InfiniteLoop/config/infinite_loop.php +++ b/tests/Issues/InfiniteLoop/config/infinite_loop.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\BooleanNot\SimplifyDeMorganBinaryRector; +use Rector\Config\RectorConfig; use Rector\Core\Tests\Issues\InfiniteLoop\Rector\MethodCall\InfinityLoopRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(InfinityLoopRector::class); $services->set(SimplifyDeMorganBinaryRector::class); }; diff --git a/tests/Issues/Issue6420/config/configured_rule.php b/tests/Issues/Issue6420/config/configured_rule.php index 2212790ce0a..9865d89cc44 100644 --- a/tests/Issues/Issue6420/config/configured_rule.php +++ b/tests/Issues/Issue6420/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadStmtRector::class); diff --git a/tests/Issues/Issue6480/config/configured_rule.php b/tests/Issues/Issue6480/config/configured_rule.php index 522ddc3761d..86f7756c481 100644 --- a/tests/Issues/Issue6480/config/configured_rule.php +++ b/tests/Issues/Issue6480/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector; +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadInstanceOfRector::class); $services->set(SwitchNegatedTernaryRector::class); }; diff --git a/tests/Issues/Issue6481/config/configured_rule.php b/tests/Issues/Issue6481/config/configured_rule.php index 972dff85960..ed80e58f36b 100644 --- a/tests/Issues/Issue6481/config/configured_rule.php +++ b/tests/Issues/Issue6481/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector; +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(EncapsedStringsToSprintfRector::class); $services->set(RemoveDeadInstanceOfRector::class); }; diff --git a/tests/Issues/Issue6496/config/configure_rule.php b/tests/Issues/Issue6496/config/configure_rule.php index 66400cfbcf3..f5384a64ed4 100644 --- a/tests/Issues/Issue6496/config/configure_rule.php +++ b/tests/Issues/Issue6496/config/configure_rule.php @@ -2,14 +2,14 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Symfony\Rector\ClassMethod\ReplaceSensioRouteAnnotationWithSymfonyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(ReplaceSensioRouteAnnotationWithSymfonyRector::class); }; diff --git a/tests/Issues/Issue6557/config/configured_rule.php b/tests/Issues/Issue6557/config/configured_rule.php index 23344e00a2a..70520bc1ee3 100644 --- a/tests/Issues/Issue6557/config/configured_rule.php +++ b/tests/Issues/Issue6557/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\FunctionLike\RemoveOverriddenValuesRector; use Rector\Naming\Rector\ClassMethod\RenameVariableToMatchNewTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveOverriddenValuesRector::class); $services->set(RenameVariableToMatchNewTypeRector::class); }; diff --git a/tests/Issues/Issue6561/config/configured_rule.php b/tests/Issues/Issue6561/config/configured_rule.php index 1020a911d10..72e4bc56d59 100644 --- a/tests/Issues/Issue6561/config/configured_rule.php +++ b/tests/Issues/Issue6561/config/configured_rule.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExplicitBoolCompareRector::class); $services->set(CountArrayToEmptyArrayComparisonRector::class); }; diff --git a/tests/Issues/Issue6670/config/configured_rule.php b/tests/Issues/Issue6670/config/configured_rule.php index 57676d915a3..d959ffc3d1f 100644 --- a/tests/Issues/Issue6670/config/configured_rule.php +++ b/tests/Issues/Issue6670/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedPrivateMethodRector::class); $services->set(RemoveAlwaysElseRector::class); }; diff --git a/tests/Issues/Issue6675/config/configured_rule.php b/tests/Issues/Issue6675/config/configured_rule.php index 84f5529bac9..8573f488002 100644 --- a/tests/Issues/Issue6675/config/configured_rule.php +++ b/tests/Issues/Issue6675/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::MYSQL_TO_MYSQLI); - $containerConfigurator->import(SetList::DEAD_CODE); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->import(SetList::MYSQL_TO_MYSQLI); + $rectorConfig->import(SetList::DEAD_CODE); }; diff --git a/tests/Issues/Issue6677/config/configured_rule.php b/tests/Issues/Issue6677/config/configured_rule.php index 0fe9e01cb6c..609be4d1e7d 100644 --- a/tests/Issues/Issue6677/config/configured_rule.php +++ b/tests/Issues/Issue6677/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp71\Rector\Array_\SymmetricArrayDestructuringToListRector; use Rector\DowngradePhp80\Rector\MethodCall\DowngradeNamedArgumentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SymmetricArrayDestructuringToListRector::class); $services->set(DowngradeNamedArgumentRector::class); }; diff --git a/tests/Issues/Issue6708/config/configured_rule.php b/tests/Issues/Issue6708/config/configured_rule.php index 33766c1df40..43227fb5983 100644 --- a/tests/Issues/Issue6708/config/configured_rule.php +++ b/tests/Issues/Issue6708/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp74\Rector\Array_\DowngradeArraySpreadRector; use Rector\DowngradePhp80\Rector\Expression\DowngradeMatchToSwitchRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeMatchToSwitchRector::class); $services->set(DowngradeArraySpreadRector::class); }; diff --git a/tests/Issues/Issue6840/config/configured_rule.php b/tests/Issues/Issue6840/config/configured_rule.php index 474558b3fde..81b0b76b187 100644 --- a/tests/Issues/Issue6840/config/configured_rule.php +++ b/tests/Issues/Issue6840/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector; +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClassPropertyAssignToConstructorPromotionRector::class); $services->set(NewlineAfterStatementRector::class); }; diff --git a/tests/Issues/Issue6972/config/configured_rule.php b/tests/Issues/Issue6972/config/configured_rule.php index 98007c6da51..09121f9c559 100644 --- a/tests/Issues/Issue6972/config/configured_rule.php +++ b/tests/Issues/Issue6972/config/configured_rule.php @@ -3,12 +3,12 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector; +use Rector\Config\RectorConfig; use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector; use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExceptionHandlerTypehintRector::class); $services->set(CatchExceptionNameMatchingTypeRector::class); $services->set(AddDefaultValueForUndefinedVariableRector::class); diff --git a/tests/Issues/Issue7023/config/configured_rule.php b/tests/Issues/Issue7023/config/configured_rule.php index f1f3f047117..9239588ebad 100644 --- a/tests/Issues/Issue7023/config/configured_rule.php +++ b/tests/Issues/Issue7023/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Doctrine\Rector\Property\TypedPropertyFromToOneRelationTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromToOneRelationTypeRector::class); }; diff --git a/tests/Issues/Issue7023/config/configured_rule_73.php b/tests/Issues/Issue7023/config/configured_rule_73.php index 0c0fc309120..d43ae9a2aa5 100644 --- a/tests/Issues/Issue7023/config/configured_rule_73.php +++ b/tests/Issues/Issue7023/config/configured_rule_73.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Doctrine\Rector\Property\TypedPropertyFromToOneRelationTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::TYPED_PROPERTIES - 1); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(TypedPropertyFromToOneRelationTypeRector::class); }; diff --git a/tests/Issues/Issue7099/config/configured_rule.php b/tests/Issues/Issue7099/config/configured_rule.php index 06a3b4adb52..441d7a60ea6 100644 --- a/tests/Issues/Issue7099/config/configured_rule.php +++ b/tests/Issues/Issue7099/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector; use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; use Rector\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveDeadInstanceOfRector::class); $services->set(BooleanInTernaryOperatorRuleFixerRector::class) diff --git a/tests/Issues/IssueAndIfCompleteDeMorgan/config/configured_rule.php b/tests/Issues/IssueAndIfCompleteDeMorgan/config/configured_rule.php index 7af693b75ea..c0f7bbf02cb 100644 --- a/tests/Issues/IssueAndIfCompleteDeMorgan/config/configured_rule.php +++ b/tests/Issues/IssueAndIfCompleteDeMorgan/config/configured_rule.php @@ -4,11 +4,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\BooleanNot\SimplifyDeMorganBinaryRector; use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeAndIfToEarlyReturnRector::class); $services->set(CompleteDynamicPropertiesRector::class); $services->set(SimplifyDeMorganBinaryRector::class); diff --git a/tests/Issues/IssueAnnotation/config/configured_rule.php b/tests/Issues/IssueAnnotation/config/configured_rule.php index 485dbdbc018..164b16f923a 100644 --- a/tests/Issues/IssueAnnotation/config/configured_rule.php +++ b/tests/Issues/IssueAnnotation/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp80\Rector\MethodCall\DowngradeNamedArgumentRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeNamedArgumentRector::class); }; diff --git a/tests/Issues/IssueChangeAndIfAndDateTimeAndDeMorgan/config/configured_rule.php b/tests/Issues/IssueChangeAndIfAndDateTimeAndDeMorgan/config/configured_rule.php index 9add0b924c5..37eb6ba7e4b 100644 --- a/tests/Issues/IssueChangeAndIfAndDateTimeAndDeMorgan/config/configured_rule.php +++ b/tests/Issues/IssueChangeAndIfAndDateTimeAndDeMorgan/config/configured_rule.php @@ -4,11 +4,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\BooleanNot\SimplifyDeMorganBinaryRector; use Rector\CodeQuality\Rector\ClassMethod\DateTimeToDateTimeInterfaceRector; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SimplifyDeMorganBinaryRector::class); $services->set(ChangeAndIfToEarlyReturnRector::class); $services->set(DateTimeToDateTimeInterfaceRector::class); diff --git a/tests/Issues/IssueChangeAndIfReturnContinueDateTime/config/configured_rule.php b/tests/Issues/IssueChangeAndIfReturnContinueDateTime/config/configured_rule.php index 911f0b69b46..96b98791bef 100644 --- a/tests/Issues/IssueChangeAndIfReturnContinueDateTime/config/configured_rule.php +++ b/tests/Issues/IssueChangeAndIfReturnContinueDateTime/config/configured_rule.php @@ -3,12 +3,12 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\ClassMethod\DateTimeToDateTimeInterfaceRector; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DateTimeToDateTimeInterfaceRector::class); $services->set(ChangeAndIfToEarlyReturnRector::class); diff --git a/tests/Issues/IssueConstructorPromotionRename/config/configured_rule.php b/tests/Issues/IssueConstructorPromotionRename/config/configured_rule.php index e3c77832060..a27f7d72c34 100644 --- a/tests/Issues/IssueConstructorPromotionRename/config/configured_rule.php +++ b/tests/Issues/IssueConstructorPromotionRename/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ClassPropertyAssignToConstructorPromotionRector::class); $services->set(RenamePropertyToMatchTypeRector::class); }; diff --git a/tests/Issues/IssueCreatePublicPropertyOnRename/config/configured_rule.php b/tests/Issues/IssueCreatePublicPropertyOnRename/config/configured_rule.php index 2cd4ce919ae..9590b5aec78 100644 --- a/tests/Issues/IssueCreatePublicPropertyOnRename/config/configured_rule.php +++ b/tests/Issues/IssueCreatePublicPropertyOnRename/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector; +use Rector\Config\RectorConfig; use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenamePropertyToMatchTypeRector::class); $services->set(CompleteDynamicPropertiesRector::class); }; diff --git a/tests/Issues/IssueDefaultValueRenameParam/config/configured_rule.php b/tests/Issues/IssueDefaultValueRenameParam/config/configured_rule.php index c171f674b05..8ec51a32985 100644 --- a/tests/Issues/IssueDefaultValueRenameParam/config/configured_rule.php +++ b/tests/Issues/IssueDefaultValueRenameParam/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector; use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddDefaultValueForUndefinedVariableRector::class); $services->set(RenameParamToMatchTypeRector::class); }; diff --git a/tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/config/configure_rule.php b/tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/config/configure_rule.php index 3cbede451a6..1c34f12f30b 100644 --- a/tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/config/configure_rule.php +++ b/tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/config/configure_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/IssueDowngradeMixedType/config/configured_rule.php b/tests/Issues/IssueDowngradeMixedType/config/configured_rule.php index d7d78fbec6b..38e5316c1bb 100644 --- a/tests/Issues/IssueDowngradeMixedType/config/configured_rule.php +++ b/tests/Issues/IssueDowngradeMixedType/config/configured_rule.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector; use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeMixedTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(DowngradeTypedPropertyRector::class); $services->set(DowngradeMixedTypeDeclarationRector::class); }; diff --git a/tests/Issues/IssueDowngradeThrowableType/config/configured_rule.php b/tests/Issues/IssueDowngradeThrowableType/config/configured_rule.php index 495da6d72d0..e2ed8a5ebc4 100644 --- a/tests/Issues/IssueDowngradeThrowableType/config/configured_rule.php +++ b/tests/Issues/IssueDowngradeThrowableType/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp70\Rector\FunctionLike\DowngradeThrowableTypeDeclarationRector; use Rector\DowngradePhp74\Rector\ArrowFunction\ArrowFunctionToAnonymousFunctionRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ArrowFunctionToAnonymousFunctionRector::class); $services->set(DowngradeThrowableTypeDeclarationRector::class); }; diff --git a/tests/Issues/IssueEarlyReturnAndOr/config/configured_rule.php b/tests/Issues/IssueEarlyReturnAndOr/config/configured_rule.php index a766c141ba8..95e9147e799 100644 --- a/tests/Issues/IssueEarlyReturnAndOr/config/configured_rule.php +++ b/tests/Issues/IssueEarlyReturnAndOr/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeOrIfReturnToEarlyReturnRector::class); $services->set(ChangeAndIfToEarlyReturnRector::class); }; diff --git a/tests/Issues/IssueEarlyReturnAndOrDatetime/config/configured_rule.php b/tests/Issues/IssueEarlyReturnAndOrDatetime/config/configured_rule.php index a108024bd1b..d12cfb076a5 100644 --- a/tests/Issues/IssueEarlyReturnAndOrDatetime/config/configured_rule.php +++ b/tests/Issues/IssueEarlyReturnAndOrDatetime/config/configured_rule.php @@ -3,12 +3,12 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\ClassMethod\DateTimeToDateTimeInterfaceRector; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeOrIfReturnToEarlyReturnRector::class); $services->set(ChangeAndIfToEarlyReturnRector::class); $services->set(DateTimeToDateTimeInterfaceRector::class); diff --git a/tests/Issues/IssueImportedReturn/config/configured_rule.php b/tests/Issues/IssueImportedReturn/config/configured_rule.php index 7d00c5d9e98..6865c9481b8 100644 --- a/tests/Issues/IssueImportedReturn/config/configured_rule.php +++ b/tests/Issues/IssueImportedReturn/config/configured_rule.php @@ -2,16 +2,16 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Privatization\Rector\Class_\RepeatedLiteralToClassConstantRector; use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RepeatedLiteralToClassConstantRector::class); $services->set(ReturnTypeDeclarationRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/IssueOrIfExplicitBoolCompare/config/configured_rule.php b/tests/Issues/IssueOrIfExplicitBoolCompare/config/configured_rule.php index f2b1afb9139..d57c7cd094e 100644 --- a/tests/Issues/IssueOrIfExplicitBoolCompare/config/configured_rule.php +++ b/tests/Issues/IssueOrIfExplicitBoolCompare/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector; +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ExplicitBoolCompareRector::class); $services->set(ChangeOrIfReturnToEarlyReturnRector::class); }; diff --git a/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_and.php b/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_and.php index 10e4120034e..da34eb85d4d 100644 --- a/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_and.php +++ b/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_and.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeAndIfToEarlyReturnRector::class); $services->set(RemoveAlwaysElseRector::class); }; diff --git a/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_or.php b/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_or.php index 5284d321756..e9f58435db1 100644 --- a/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_or.php +++ b/tests/Issues/IssueReturnBeforeElseIf/config/configured_rule_or.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeOrIfReturnToEarlyReturnRector::class); $services->set(RemoveAlwaysElseRector::class); }; diff --git a/tests/Issues/IssueVarConstantNewline/config/configured_rule.php b/tests/Issues/IssueVarConstantNewline/config/configured_rule.php index 8e4e521abf2..06448ecfb27 100644 --- a/tests/Issues/IssueVarConstantNewline/config/configured_rule.php +++ b/tests/Issues/IssueVarConstantNewline/config/configured_rule.php @@ -4,10 +4,10 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector; use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(VarConstantCommentRector::class); $services->set(NewlineAfterStatementRector::class); }; diff --git a/tests/Issues/JsonThrowWithChangeAndIf/config/configured_rule.php b/tests/Issues/JsonThrowWithChangeAndIf/config/configured_rule.php index c23deecf3a3..0490bcfeba7 100644 --- a/tests/Issues/JsonThrowWithChangeAndIf/config/configured_rule.php +++ b/tests/Issues/JsonThrowWithChangeAndIf/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector; use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(JsonThrowOnErrorRector::class); $services->set(ChangeAndIfToEarlyReturnRector::class); }; diff --git a/tests/Issues/NullableParamNamespaced/config/configured_rule.php b/tests/Issues/NullableParamNamespaced/config/configured_rule.php index ec021754f60..cb0cf76143b 100644 --- a/tests/Issues/NullableParamNamespaced/config/configured_rule.php +++ b/tests/Issues/NullableParamNamespaced/config/configured_rule.php @@ -2,18 +2,18 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector; use Rector\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AddArrayParamDocTypeRector::class); $services->set(RemoveUnusedPrivateMethodParameterRector::class); $services->set(RemoveUnreachableStatementRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); }; diff --git a/tests/Issues/PhpTagsAddedToBlade/config/php_tags_added_to_blade.php b/tests/Issues/PhpTagsAddedToBlade/config/php_tags_added_to_blade.php index de830cccafd..f357b25082b 100644 --- a/tests/Issues/PhpTagsAddedToBlade/config/php_tags_added_to_blade.php +++ b/tests/Issues/PhpTagsAddedToBlade/config/php_tags_added_to_blade.php @@ -3,15 +3,15 @@ declare(strict_types=1); use Rector\Caching\ValueObject\Storage\MemoryCacheStorage; +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TernaryToNullCoalescingRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PARALLEL, false); // to invalidate cache and change file everytime diff --git a/tests/Issues/PrintStmtsIndex/config/configured_rule.php b/tests/Issues/PrintStmtsIndex/config/configured_rule.php index 178c430b306..5c7f6e292fd 100644 --- a/tests/Issues/PrintStmtsIndex/config/configured_rule.php +++ b/tests/Issues/PrintStmtsIndex/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ diff --git a/tests/Issues/PrintStmtsIndexAutoImport/config/configured_rule.php b/tests/Issues/PrintStmtsIndexAutoImport/config/configured_rule.php index 045a42da0d1..3ef8b590070 100644 --- a/tests/Issues/PrintStmtsIndexAutoImport/config/configured_rule.php +++ b/tests/Issues/PrintStmtsIndexAutoImport/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $services = $containerConfigurator->services(); + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'Route' => 'Illuminate\Support\Facades\Route', diff --git a/tests/Issues/RemoveNullWithStrictGetter/config/configured_rule.php b/tests/Issues/RemoveNullWithStrictGetter/config/configured_rule.php index 8ba0a88dabf..be66f7e445c 100644 --- a/tests/Issues/RemoveNullWithStrictGetter/config/configured_rule.php +++ b/tests/Issues/RemoveNullWithStrictGetter/config/configured_rule.php @@ -2,15 +2,15 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector; use Rector\Php74\Rector\Property\TypedPropertyRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyRector::class); $services->set(TypedPropertyFromStrictGetterMethodReturnTypeRector::class); @@ -18,6 +18,6 @@ return static function (ContainerConfigurator $containerConfigurator): void { // should be ignored if typed property is used $services->set(RemoveNullPropertyInitializationRector::class); - $parameters = $containerConfigurator->parameters(); + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::UNION_TYPES - 1); }; diff --git a/tests/Issues/RemoveReadonlyLocalVariable/config/configured_rule.php b/tests/Issues/RemoveReadonlyLocalVariable/config/configured_rule.php index b6fcc185d36..591de592075 100644 --- a/tests/Issues/RemoveReadonlyLocalVariable/config/configured_rule.php +++ b/tests/Issues/RemoveReadonlyLocalVariable/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector; use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ChangeReadOnlyVariableWithDefaultValueToConstantRector::class); $services->set(RemoveUnusedVariableAssignRector::class); }; diff --git a/tests/Issues/RemoveUnusedParamInMiddle/config/configured_rule.php b/tests/Issues/RemoveUnusedParamInMiddle/config/configured_rule.php index a98871ce9d0..4a5515380c1 100644 --- a/tests/Issues/RemoveUnusedParamInMiddle/config/configured_rule.php +++ b/tests/Issues/RemoveUnusedParamInMiddle/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedConstructorParamRector::class); $services->set(RemoveUnusedPrivatePropertyRector::class); }; diff --git a/tests/Issues/RemoveUnusedVariableAlwaysElse/config/configured_rule.php b/tests/Issues/RemoveUnusedVariableAlwaysElse/config/configured_rule.php index aced355be19..8cd74434cc6 100644 --- a/tests/Issues/RemoveUnusedVariableAlwaysElse/config/configured_rule.php +++ b/tests/Issues/RemoveUnusedVariableAlwaysElse/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RemoveUnusedVariableAssignRector::class); $services->set(RemoveAlwaysElseRector::class); }; diff --git a/tests/Issues/RenameClassInCallbackFromAssertAnnotation/config/configured_rule.php b/tests/Issues/RenameClassInCallbackFromAssertAnnotation/config/configured_rule.php index 8f0c02cfeb8..14d0429a164 100644 --- a/tests/Issues/RenameClassInCallbackFromAssertAnnotation/config/configured_rule.php +++ b/tests/Issues/RenameClassInCallbackFromAssertAnnotation/config/configured_rule.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassRector::class) ->configure([ 'Some\\Random\\Class_' => 'Some\\Other\\Random\\Class_', diff --git a/tests/Issues/RenameParamDefaultInit/config/configured_rule.php b/tests/Issues/RenameParamDefaultInit/config/configured_rule.php index 56ef852fc8b..f8203ef5877 100644 --- a/tests/Issues/RenameParamDefaultInit/config/configured_rule.php +++ b/tests/Issues/RenameParamDefaultInit/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector; use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameParamToMatchTypeRector::class); $services->set(AddDefaultValueForUndefinedVariableRector::class); }; diff --git a/tests/Issues/ReturnEmptyNodes/config/configured_rule.php b/tests/Issues/ReturnEmptyNodes/config/configured_rule.php index f4ed937518a..0087997cca1 100644 --- a/tests/Issues/ReturnEmptyNodes/config/configured_rule.php +++ b/tests/Issues/ReturnEmptyNodes/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Tests\Issues\ReturnEmptyNodes\Source\ReturnEmptyStmtsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(ReturnEmptyStmtsRector::class); }; diff --git a/tests/Issues/SplitMultiAssignRemovePrivate/config/configured_rule.php b/tests/Issues/SplitMultiAssignRemovePrivate/config/configured_rule.php index 380eead785e..dcf1462bae4 100644 --- a/tests/Issues/SplitMultiAssignRemovePrivate/config/configured_rule.php +++ b/tests/Issues/SplitMultiAssignRemovePrivate/config/configured_rule.php @@ -3,11 +3,11 @@ declare(strict_types=1); use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector; +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(SplitDoubleAssignRector::class); $services->set(RemoveUnusedPrivatePropertyRector::class); }; diff --git a/tests/Issues/StringableTypedProperty/config/configured_rule.php b/tests/Issues/StringableTypedProperty/config/configured_rule.php index d0d6ad1a840..d5b440ee6b0 100644 --- a/tests/Issues/StringableTypedProperty/config/configured_rule.php +++ b/tests/Issues/StringableTypedProperty/config/configured_rule.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\StringableForToStringRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(StringableForToStringRector::class); $services->set(TypedPropertyFromStrictGetterMethodReturnTypeRector::class); }; diff --git a/tests/NonPhpFile/Rector/RenameClassNonPhpRector/config/configured_rule.php b/tests/NonPhpFile/Rector/RenameClassNonPhpRector/config/configured_rule.php index 340713443b0..da1dfedb2e1 100644 --- a/tests/NonPhpFile/Rector/RenameClassNonPhpRector/config/configured_rule.php +++ b/tests/NonPhpFile/Rector/RenameClassNonPhpRector/config/configured_rule.php @@ -2,13 +2,13 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\NonPhpFile\Rector\RenameClassNonPhpRector; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\NewClass; use Rector\Tests\Renaming\Rector\Name\RenameClassRector\Source\OldClass; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(RenameClassNonPhpRector::class) ->configure([ diff --git a/tests/Php/config/invalid_input.php b/tests/Php/config/invalid_input.php index 6a44ae48bb4..7c609dbeb22 100644 --- a/tests/Php/config/invalid_input.php +++ b/tests/Php/config/invalid_input.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, '10000'); }; diff --git a/tests/Php/config/invalid_number_input.php b/tests/Php/config/invalid_number_input.php index 09ef0b38ae0..bb7e78820ec 100644 --- a/tests/Php/config/invalid_number_input.php +++ b/tests/Php/config/invalid_number_input.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, 291_084_902_184); }; diff --git a/tests/Php/config/invalid_php_4_number.php b/tests/Php/config/invalid_php_4_number.php index 331950b169a..4485bc83e75 100644 --- a/tests/Php/config/invalid_php_4_number.php +++ b/tests/Php/config/invalid_php_4_number.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, 40000); }; diff --git a/tests/Php/config/invalid_string_input.php b/tests/Php/config/invalid_string_input.php index a008353e0d6..3649589b110 100644 --- a/tests/Php/config/invalid_string_input.php +++ b/tests/Php/config/invalid_string_input.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, '7.3'); }; diff --git a/tests/Php/config/valid_explicit_value.php b/tests/Php/config/valid_explicit_value.php index c168c4853cc..0f3a0c695ee 100644 --- a/tests/Php/config/valid_explicit_value.php +++ b/tests/Php/config/valid_explicit_value.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, 100000); }; diff --git a/tests/Php/config/valid_minus_value.php b/tests/Php/config/valid_minus_value.php index 25af1f4a684..3b1299cf803 100644 --- a/tests/Php/config/valid_minus_value.php +++ b/tests/Php/config/valid_minus_value.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersionFeature; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $parameters = $containerConfigurator->parameters(); +return static function (RectorConfig $rectorConfig): void { + $parameters = $rectorConfig->parameters(); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::ARRAY_KEY_FIRST_LAST - 1); }; diff --git a/tests/PhpParser/Printer/CommentPreserving/config/configured_rule.php b/tests/PhpParser/Printer/CommentPreserving/config/configured_rule.php index 2d595d385cc..34f2dd0b210 100644 --- a/tests/PhpParser/Printer/CommentPreserving/config/configured_rule.php +++ b/tests/PhpParser/Printer/CommentPreserving/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(TypedPropertyFromAssignsRector::class); }; diff --git a/tests/PhpUnit/MultipleFilesChangedTrait/config/configured_rule.php b/tests/PhpUnit/MultipleFilesChangedTrait/config/configured_rule.php index bd211952b50..23d91a64e99 100644 --- a/tests/PhpUnit/MultipleFilesChangedTrait/config/configured_rule.php +++ b/tests/PhpUnit/MultipleFilesChangedTrait/config/configured_rule.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Core\Tests\PhpUnit\MultipleFilesChangedTrait\Rector\Class_\CreateJsonWithNamesForClassRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(CreateJsonWithNamesForClassRector::class); }; diff --git a/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_has_values.php b/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_has_values.php index ad801fb3196..3fb619c842a 100644 --- a/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_has_values.php +++ b/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_has_values.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AnnotationToAttributeRector::class) ->configure([new AnnotationToAttribute('Symfony\Component\Routing\Annotation\Route')]); diff --git a/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_missing.php b/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_missing.php index abdc18e0273..c9b71b6260c 100644 --- a/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_missing.php +++ b/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/configurable_array_missing.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AnnotationToAttributeRector::class); }; diff --git a/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/empty_configure.php b/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/empty_configure.php index fcf50b34426..26076453d02 100644 --- a/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/empty_configure.php +++ b/tests/Validation/Collector/EmptyConfigurableRectorCollector/config/empty_configure.php @@ -2,11 +2,11 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(AnnotationToAttributeRector::class) ->configure([]); diff --git a/tests/config/downgrade-phpstan-parser.php b/tests/config/downgrade-phpstan-parser.php index ac943738d35..b3dec69fd9f 100644 --- a/tests/config/downgrade-phpstan-parser.php +++ b/tests/config/downgrade-phpstan-parser.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Rector\Config\RectorConfig; use Rector\DowngradePhp72\Rector\FuncCall\DowngradeJsonDecodeNullAssociativeArgRector; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->set(DowngradeJsonDecodeNullAssociativeArgRector::class); }; diff --git a/utils/compiler/config/config.php b/utils/compiler/config/config.php index ab73fd8bd8a..1fef3f6e115 100644 --- a/utils/compiler/config/config.php +++ b/utils/compiler/config/config.php @@ -2,10 +2,10 @@ declare(strict_types=1); -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Rector\Config\RectorConfig; -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); +return static function (RectorConfig $rectorConfig): void { + $services = $rectorConfig->services(); $services->defaults() ->public()