Replace deprecated classes with their successors

Author: leofeyer

config/contao.php

@@ -39,6 +39,7 @@
 use PhpCsFixer\Fixer\ControlStructure\NoSuperfluousElseifFixer;
 use PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer;
 use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
+use PhpCsFixer\Fixer\FunctionNotation\MultilinePromotedPropertiesFixer;
 use PhpCsFixer\Fixer\FunctionNotation\NullableTypeDeclarationForDefaultNullValueFixer;
 use PhpCsFixer\Fixer\FunctionNotation\RegularCallableCallFixer;
 use PhpCsFixer\Fixer\FunctionNotation\StaticLambdaFixer;
@@ -78,7 +79,6 @@
 use PhpCsFixer\Fixer\Whitespace\BlankLineBeforeStatementFixer;
 use PhpCsFixer\Fixer\Whitespace\HeredocIndentationFixer;
 use PhpCsFixer\Fixer\Whitespace\MethodChainingIndentationFixer;
-use PhpCsFixerCustomFixers\Fixer\MultilinePromotedPropertiesFixer;
 use PhpCsFixerCustomFixers\Fixer\PhpdocTypesCommaSpacesFixer;
 use PhpCsFixerCustomFixers\Fixer\PhpUnitAssertArgumentsOrderFixer;
 use SlevomatCodingStandard\Sniffs\Functions\UnusedInheritedVariablePassedToClosureSniff;

config/set/psr12.php

@@ -15,9 +15,9 @@
 use PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer;
 use PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer;
 use PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer;
+use PhpCsFixer\Fixer\ClassNotation\ModifierKeywordsFixer;
 use PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer;
 use PhpCsFixer\Fixer\ClassNotation\SingleTraitInsertPerStatementFixer;
-use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use PhpCsFixer\Fixer\FunctionNotation\NoUnreachableDefaultArgumentValueFixer;
 use PhpCsFixer\Fixer\FunctionNotation\ReturnTypeDeclarationFixer;
 use PhpCsFixer\Fixer\Import\NoLeadingImportSlashFixer;
@@ -49,6 +49,7 @@
         DeclareEqualNormalizeFixer::class,
         LowercaseCastFixer::class,
         LowercaseStaticReferenceFixer::class,
+        ModifierKeywordsFixer::class,
         NewWithParenthesesFixer::class,
         NoBlankLinesAfterClassOpeningFixer::class,
         NoLeadingImportSlashFixer::class,
@@ -59,7 +60,6 @@
         ShortScalarCastFixer::class,
         SingleTraitInsertPerStatementFixer::class,
         TernaryOperatorSpacesFixer::class,
-        VisibilityRequiredFixer::class,
     ])
     ->withConfiguredRule(BracesPositionFixer::class, ['allow_single_line_empty_anonymous_classes' => true])
     ->withConfiguredRule(ClassDefinitionFixer::class, ['inline_constructor_arguments' => false, 'space_before_parenthesis' => true])

config/set/psr2.php

@@ -15,8 +15,8 @@
 use PhpCsFixer\Fixer\Casing\ConstantCaseFixer;
 use PhpCsFixer\Fixer\Casing\LowercaseKeywordsFixer;
 use PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer;
+use PhpCsFixer\Fixer\ClassNotation\ModifierKeywordsFixer;
 use PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer;
-use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use PhpCsFixer\Fixer\Comment\NoTrailingWhitespaceInCommentFixer;
 use PhpCsFixer\Fixer\ControlStructure\ControlStructureBracesFixer;
 use PhpCsFixer\Fixer\ControlStructure\ControlStructureContinuationPositionFixer;
@@ -69,6 +69,6 @@
         SwitchCaseSpaceFixer::class,
     ])
     ->withConfiguredRule(MethodArgumentSpaceFixer::class, ['on_multiline' => 'ensure_fully_multiline'])
+    ->withConfiguredRule(ModifierKeywordsFixer::class, ['elements' => ['method', 'property']])
     ->withConfiguredRule(SingleClassElementPerStatementFixer::class, ['elements' => ['property']])
-    ->withConfiguredRule(VisibilityRequiredFixer::class, ['elements' => ['method', 'property']])
 ;