ClassDefinitionFixer - rename constructor arguments option

doc/list.rst

@@ -196,7 +196,7 @@ List of Available Rules
      | Whether there should be a single space after the parenthesis of anonymous class (PSR12) or not.
      | Allowed types: ``bool``
      | Default value: ``false``
-   - | ``fix_constructor_arguments``
+   - | ``inline_constructor_arguments``
      | Whether constructor argument list in anonymous classes should be single line.
      | Allowed types: ``bool``
      | Default value: ``true``

doc/ruleSets/PSR12.rst

@@ -14,7 +14,7 @@ Rules
   ``['allow_single_line_anonymous_class_with_empty_body' => true]``
 - `class_definition <./../rules/class_notation/class_definition.rst>`_
   config:
-  ``['fix_constructor_arguments' => false, 'space_before_parenthesis' => true]``
+  ``['inline_constructor_arguments' => false, 'space_before_parenthesis' => true]``
 - `compact_nullable_typehint <./../rules/whitespace/compact_nullable_typehint.rst>`_
 - `declare_equal_normalize <./../rules/language_construct/declare_equal_normalize.rst>`_
 - `lowercase_cast <./../rules/cast_notation/lowercase_cast.rst>`_

doc/rules/class_notation/class_definition.rst

@@ -45,8 +45,8 @@ Allowed types: ``bool``
 
 Default value: ``false``
 
-``fix_constructor_arguments``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``inline_constructor_arguments``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Whether constructor argument list in anonymous classes should be single line.
 
@@ -154,7 +154,7 @@ With configuration: ``['space_before_parenthesis' => true]``.
 Example #6
 ~~~~~~~~~~
 
-With configuration: ``['fix_constructor_arguments' => true]``.
+With configuration: ``['inline_constructor_arguments' => true]``.
 
 .. code-block:: diff
 
@@ -175,7 +175,7 @@ The rule is part of the following rule sets:
 @PSR12
   Using the `@PSR12 <./../../ruleSets/PSR12.rst>`_ rule set will enable the ``class_definition`` rule with the config below:
 
-  ``['fix_constructor_arguments' => false, 'space_before_parenthesis' => true]``
+  ``['inline_constructor_arguments' => false, 'space_before_parenthesis' => true]``
 
 @PSR2
   Using the `@PSR2 <./../../ruleSets/PSR2.rst>`_ rule set will enable the ``class_definition`` rule with the default config.

src/Fixer/ClassNotation/ClassDefinitionFixer.php

@@ -95,7 +95,7 @@ interface Bar extends
                 ),
                 new CodeSample(
                     "<?php\n\$foo = new class(\n    \$bar,\n    \$baz\n) {};\n",
-                    ['fix_constructor_arguments' => true]
+                    ['inline_constructor_arguments' => true]
                 ),
             ]
         );
@@ -155,7 +155,7 @@ protected function createConfigurationDefinition(): FixerConfigurationResolverIn
                 ->setAllowedTypes(['bool'])
                 ->setDefault(false)
                 ->getOption(),
-            (new FixerOptionBuilder('fix_constructor_arguments', 'Whether constructor argument list in anonymous classes should be single line.'))
+            (new FixerOptionBuilder('inline_constructor_arguments', 'Whether constructor argument list in anonymous classes should be single line.'))
                 ->setAllowedTypes(['bool'])
                 ->setDefault(true)
                 ->getOption(),
@@ -335,7 +335,7 @@ private function getClassyInheritanceInfo(Tokens $tokens, int $startIndex, strin
     private function makeClassyDefinitionSingleLine(Tokens $tokens, int $startIndex, int $endIndex): void
     {
         for ($i = $endIndex; $i >= $startIndex; --$i) {
-            if (!$this->configuration['fix_constructor_arguments'] && $tokens[$i]->equals(')')) {
+            if (!$this->configuration['inline_constructor_arguments'] && $tokens[$i]->equals(')')) {
                 $i = $tokens->findBlockStart(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $i);
 
                 continue;

src/RuleSet/Sets/PSR12Set.php

@@ -30,7 +30,7 @@ public function getRules(): array
                 'allow_single_line_anonymous_class_with_empty_body' => true,
             ],
             'class_definition' => [
-                'fix_constructor_arguments' => false, // handled by method_argument_space fixer
+                'inline_constructor_arguments' => false, // handled by method_argument_space fixer
                 'space_before_parenthesis' => true, // defined in PSR12 ¶8. Anonymous Classes
             ],
             'compact_nullable_typehint' => true,

tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php

@@ -34,7 +34,7 @@ public function testConfigureDefaultToFalse(): void
             'single_item_single_line' => false,
             'single_line' => false,
             'space_before_parenthesis' => false,
-            'fix_constructor_arguments' => true,
+            'inline_constructor_arguments' => true,
         ];
 
         $fixer = new ClassDefinitionFixer();
@@ -103,7 +103,7 @@ public function testInvalidConfigurationKey(): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
         $this->expectExceptionMessageMatches(
-            '/^\[class_definition\] Invalid configuration: The option "a" does not exist\. Defined options are: "fix_constructor_arguments", "multi_line_extends_each_single_line", "single_item_single_line", "single_line", "space_before_parenthesis"\.$/'
+            '/^\[class_definition\] Invalid configuration: The option "a" does not exist\. Defined options are: "inline_constructor_arguments", "multi_line_extends_each_single_line", "single_item_single_line", "single_line", "space_before_parenthesis"\.$/'
         );
 
         $fixer = new ClassDefinitionFixer();
@@ -157,12 +157,12 @@ public function provideAnonymousClassesCases(): array
             [
                 '<?php $a = new class(  ) {};',
                 "<?php \$a = new\n class  (  ){};",
-                ['fix_constructor_arguments' => false],
+                ['inline_constructor_arguments' => false],
             ],
             [
                 '<?php $a = new class( $this->foo() , bar ( $a) ) {};',
                 "<?php \$a = new\n class  ( \$this->foo() , bar ( \$a) ){};",
-                ['fix_constructor_arguments' => false],
+                ['inline_constructor_arguments' => false],
             ],
             [
                 '<?php $a = new class(10, 1, /**/ 2) {};',
@@ -171,7 +171,7 @@ public function provideAnonymousClassesCases(): array
             [
                 '<?php $a = new class(  10, 1,/**/2  ) {};',
                 '<?php $a = new class(  10, 1,/**/2  ){};',
-                ['fix_constructor_arguments' => false],
+                ['inline_constructor_arguments' => false],
             ],
             [
                 '<?php $a = new class(2) {};',
@@ -184,7 +184,7 @@ public function provideAnonymousClassesCases(): array
             [
                 '<?php $a = new class(   $this->prop   ) {};',
                 '<?php $a = new class(   $this->prop   ){};',
-                ['fix_constructor_arguments' => false],
+                ['inline_constructor_arguments' => false],
             ],
             [
                 '<?php $a = new class($this->prop, $v[3], 4) {};',
@@ -295,10 +295,10 @@ class#
                 '<?php $z = new class   ()  {};',
                 ['space_before_parenthesis' => true],
             ],
-            'space_before_parenthesis and fix_constructor_arguments' => [
+            'space_before_parenthesis and inline_constructor_arguments' => [
                 '<?php $z = new class ( static::foo($this->bar())  ,baz() ) {};',
                 '<?php $z = new class   ( static::foo($this->bar())  ,baz() )  {};',
-                ['space_before_parenthesis' => true, 'fix_constructor_arguments' => false],
+                ['space_before_parenthesis' => true, 'inline_constructor_arguments' => false],
             ],
         ];
     }