Merge pull request #241 from ergebnis/fix/deprecated

Fix: Do not enable deprecated fixers

CHANGELOG.md

@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
-For a full diff see [`2.5.1...main`][2.5.1...main].
+For a full diff see [`2.5.2...main`][2.5.2...main].
+
+## [`2.5.2`][2.5.2]
+
+For a full diff see [`2.5.1...2.5.2`][2.5.1...2.5.2].
+
+### Fixed
+
+* Enabled and configured proxied instead of deprecated fixers ([#241]), by [@dependabot]
 
 ## [`2.5.1`][2.5.1]
 
@@ -130,6 +138,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [2.4.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.4.0
 [2.5.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.0
 [2.5.1]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.1
+[2.5.2]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/2.5.2
 
 [d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0
 [1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0
@@ -145,7 +154,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [2.3.0...2.4.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.3.0...2.4.0
 [2.4.0...2.5.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.4.0...2.5.0
 [2.5.0...2.5.1]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.0...2.5.1
-[2.5.1...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.1...main
+[2.5.1...2.5.2]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.1...2.5.2
+[2.5.2...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/2.5.2...main
 
 [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14
@@ -160,6 +170,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#215]: https://github.com/ergebnis/php-cs-fixer-config/pull/215
 [#220]: https://github.com/ergebnis/php-cs-fixer-config/pull/220
 [#226]: https://github.com/ergebnis/php-cs-fixer-config/pull/226
+[#241]: https://github.com/ergebnis/php-cs-fixer-config/pull/241
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

psalm-baseline.xml

@@ -11,6 +11,9 @@
       <code>getFixers</code>
       <code>registerBuiltInFixers</code>
     </InternalMethod>
+    <MissingClosureParamType occurrences="1">
+      <code>$ruleConfiguration</code>
+    </MissingClosureParamType>
     <MixedMethodCall occurrences="1">
       <code>getRules</code>
     </MixedMethodCall>

src/RuleSet/Laravel6.php

@@ -101,7 +101,7 @@ final class Laravel6 extends AbstractRuleSet
         'list_syntax' => false,
         'logical_operators' => false,
         'lowercase_cast' => true,
-        'lowercase_constants' => true,
+        'lowercase_constants' => false,
         'lowercase_keywords' => true,
         'lowercase_static_reference' => true, // added from Symfony
         'magic_constant_casing' => true,

src/RuleSet/Php71.php

@@ -121,7 +121,7 @@ final class Php71 extends AbstractRuleSet
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => false,
         'global_namespace_import' => false,
-        'hash_to_slash_comment' => true,
+        'hash_to_slash_comment' => false,
         'header_comment' => false,
         'heredoc_indentation' => false,
         'heredoc_to_nowdoc' => true,
@@ -337,7 +337,11 @@ final class Php71 extends AbstractRuleSet
         ],
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
-        'single_line_comment_style' => false,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
         'single_line_throw' => false,
         'single_quote' => true,
         'single_trait_insert_per_statement' => true,

src/RuleSet/Php73.php

@@ -121,7 +121,7 @@ final class Php73 extends AbstractRuleSet
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => false,
         'global_namespace_import' => false,
-        'hash_to_slash_comment' => true,
+        'hash_to_slash_comment' => false,
         'header_comment' => false,
         'heredoc_indentation' => true,
         'heredoc_to_nowdoc' => true,
@@ -337,7 +337,11 @@ final class Php73 extends AbstractRuleSet
         ],
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
-        'single_line_comment_style' => false,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
         'single_line_throw' => false,
         'single_quote' => true,
         'single_trait_insert_per_statement' => true,

src/RuleSet/Php74.php

@@ -121,7 +121,7 @@ final class Php74 extends AbstractRuleSet
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => false,
         'global_namespace_import' => false,
-        'hash_to_slash_comment' => true,
+        'hash_to_slash_comment' => false,
         'header_comment' => false,
         'heredoc_indentation' => true,
         'heredoc_to_nowdoc' => true,
@@ -337,7 +337,11 @@ final class Php74 extends AbstractRuleSet
         ],
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
-        'single_line_comment_style' => false,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
         'single_line_throw' => false,
         'single_quote' => true,
         'single_trait_insert_per_statement' => true,

test/Unit/RuleSet/AbstractRuleSetTestCase.php

@@ -168,6 +168,37 @@ final public function testRulesDoNotContainRuleSets(): void
         ));
     }
 
+    final public function testRulesDoNotEnableDeprecatedFixers(): void
+    {
+        $fixers = self::builtInFixers();
+
+        $rulesEnablingDeprecatedFixers = \array_filter(
+            self::createRuleSet()->rules(),
+            static function ($ruleConfiguration, string $ruleName) use ($fixers): bool {
+                if (false === $ruleConfiguration) {
+                    return false;
+                }
+
+                if (!\array_key_exists($ruleName, $fixers)) {
+                    return false;
+                }
+
+                $fixer = $fixers[$ruleName];
+
+                return $fixer instanceof Fixer\DeprecatedFixerInterface;
+            },
+            \ARRAY_FILTER_USE_BOTH
+        );
+
+        $namesOfEnabledDeprecatedFixers = \array_keys($rulesEnablingDeprecatedFixers);
+
+        self::assertEmpty($namesOfEnabledDeprecatedFixers, \sprintf(
+            "Failed asserting that deprecated fixers with names\n\n%s\n\nare not enabled in rule set \"%s\".",
+            ' - ' . \implode("\n - ", $namesOfEnabledDeprecatedFixers),
+            static::className()
+        ));
+    }
+
     /**
      * @phpstan-return class-string
      *
@@ -228,20 +259,33 @@ final protected static function createRuleSet(?string $header = null): Config\Ru
     }
 
     /**
-     * @return array<int, string>
+     * @return array<string, Fixer\FixerInterface>
      */
-    private static function builtInFixerNames(): array
+    private static function builtInFixers(): array
     {
         $fixerFactory = FixerFactory::create();
 
         $fixerFactory->registerBuiltInFixers();
 
-        /** @var array<int, string> $builtInFixerNames */
-        $builtInFixerNames = \array_values(\array_map(static function (Fixer\FixerInterface $fixer): string {
-            return $fixer->getName();
-        }, $fixerFactory->getFixers()));
+        $fixers = $fixerFactory->getFixers();
+
+        /** @var array<string, Fixer\FixerInterface> $builtInFixers */
+        $builtInFixers = \array_combine(
+            \array_map(static function (Fixer\FixerInterface $fixer): string {
+                return $fixer->getName();
+            }, $fixers),
+            $fixers
+        );
+
+        return $builtInFixers;
+    }
 
-        return $builtInFixerNames;
+    /**
+     * @return array<int, string>
+     */
+    private static function builtInFixerNames(): array
+    {
+        return \array_keys(self::builtInFixers());
     }
 
     /**

test/Unit/RuleSet/Laravel6Test.php

@@ -104,7 +104,7 @@ final class Laravel6Test extends AbstractRuleSetTestCase
         'list_syntax' => false,
         'logical_operators' => false,
         'lowercase_cast' => true,
-        'lowercase_constants' => true,
+        'lowercase_constants' => false,
         'lowercase_keywords' => true,
         'lowercase_static_reference' => true, // added from Symfony
         'magic_constant_casing' => true,

test/Unit/RuleSet/Php71Test.php

@@ -127,7 +127,7 @@ final class Php71Test extends AbstractRuleSetTestCase
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => false,
         'global_namespace_import' => false,
-        'hash_to_slash_comment' => true,
+        'hash_to_slash_comment' => false,
         'header_comment' => false,
         'heredoc_indentation' => false,
         'heredoc_to_nowdoc' => true,
@@ -343,7 +343,11 @@ final class Php71Test extends AbstractRuleSetTestCase
         ],
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
-        'single_line_comment_style' => false,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
         'single_line_throw' => false,
         'single_quote' => true,
         'single_trait_insert_per_statement' => true,

test/Unit/RuleSet/Php73Test.php

@@ -127,7 +127,7 @@ final class Php73Test extends AbstractRuleSetTestCase
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => false,
         'global_namespace_import' => false,
-        'hash_to_slash_comment' => true,
+        'hash_to_slash_comment' => false,
         'header_comment' => false,
         'heredoc_indentation' => true,
         'heredoc_to_nowdoc' => true,
@@ -343,7 +343,11 @@ final class Php73Test extends AbstractRuleSetTestCase
         ],
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
-        'single_line_comment_style' => false,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
         'single_line_throw' => false,
         'single_quote' => true,
         'single_trait_insert_per_statement' => true,

test/Unit/RuleSet/Php74Test.php

@@ -127,7 +127,7 @@ final class Php74Test extends AbstractRuleSetTestCase
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => false,
         'global_namespace_import' => false,
-        'hash_to_slash_comment' => true,
+        'hash_to_slash_comment' => false,
         'header_comment' => false,
         'heredoc_indentation' => true,
         'heredoc_to_nowdoc' => true,
@@ -343,7 +343,11 @@ final class Php74Test extends AbstractRuleSetTestCase
         ],
         'single_import_per_statement' => true,
         'single_line_after_imports' => true,
-        'single_line_comment_style' => false,
+        'single_line_comment_style' => [
+            'comment_types' => [
+                'hash',
+            ],
+        ],
         'single_line_throw' => false,
         'single_quote' => true,
         'single_trait_insert_per_statement' => true,