[CodingStyle] Move ArraySpreadInsteadOfArrayMergeRector from php74 to…

… codingstyle sets list (#5230) * [CodingStyle] Move ArraySpreadInsteadOfArrayMergeRector from php74 to codingstyle sets list * regenerate docs
rectorphp · Nov 7, 2023 · 9adc7a0 · 9adc7a0
1 parent bd191f0
commit 9adc7a0
Show file tree

Hide file tree

Showing 33 changed files with 73 additions and 74 deletions.
diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md
@@ -8,7 +8,7 @@
 
 - [CodeQuality](#codequality) (72)
 
-- [CodingStyle](#codingstyle) (28)
+- [CodingStyle](#codingstyle) (29)
 
 - [DeadCode](#deadcode) (42)
 
@@ -36,7 +36,7 @@
 
 - [Php73](#php73) (9)
 
-- [Php74](#php74) (13)
+- [Php74](#php74) (12)
 
 - [Php80](#php80) (16)
 
@@ -1597,6 +1597,32 @@ Adds array default value to property to prevent foreach over null error
 
 <br>
 
+### ArraySpreadInsteadOfArrayMergeRector
+
+Change `array_merge()` to spread operator
+
+- class: [`Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector`](../rules/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php)
+
+```diff
+ class SomeClass
+ {
+     public function run($iter1, $iter2)
+     {
+-        $values = array_merge(iterator_to_array($iter1), iterator_to_array($iter2));
++        $values = [...$iter1, ...$iter2];
+
+         // Or to generalize to all iterables
+-        $anotherValues = array_merge(
+-            is_array($iter1) ? $iter1 : iterator_to_array($iter1),
+-            is_array($iter2) ? $iter2 : iterator_to_array($iter2)
+-        );
++        $anotherValues = [...$iter1, ...$iter2];
+     }
+ }
+```
+
+<br>
+
 ### BinarySwitchToIfElseRector
 
 Changes switch with 2 options to if-else
@@ -4483,32 +4509,6 @@ Change `array_key_exists()` on property to `property_exists()`
 
 <br>
 
-### ArraySpreadInsteadOfArrayMergeRector
-
-Change `array_merge()` to spread operator
-
-- class: [`Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector`](../rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php)
-
-```diff
- class SomeClass
- {
-     public function run($iter1, $iter2)
-     {
--        $values = array_merge(iterator_to_array($iter1), iterator_to_array($iter2));
-+        $values = [...$iter1, ...$iter2];
-
-         // Or to generalize to all iterables
--        $anotherValues = array_merge(
--            is_array($iter1) ? $iter1 : iterator_to_array($iter1),
--            is_array($iter2) ? $iter2 : iterator_to_array($iter2)
--        );
-+        $anotherValues = [...$iter1, ...$iter2];
-     }
- }
-```
-
-<br>
-
 ### ClosureToArrowFunctionRector
 
 Change closure to arrow function

diff --git a/config/set/coding-style.php b/config/set/coding-style.php
@@ -14,6 +14,7 @@
 use Rector\CodingStyle\Rector\Closure\StaticClosureRector;
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector;
+use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector;
 use Rector\CodingStyle\Rector\FuncCall\CallUserFuncToMethodCallRector;
 use Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector;
@@ -71,5 +72,6 @@
         SplitGroupedPropertiesRector::class,
         SplitGroupedClassConstantsRector::class,
         ExplicitPublicClassMethodRector::class,
+        ArraySpreadInsteadOfArrayMergeRector::class,
     ]);
 };
diff --git a/phpstan.neon b/phpstan.neon
@@ -528,7 +528,6 @@ parameters:
         - '#Fetching class constant class of deprecated class Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromStrictConstructorReadonlyClassRector#'
         - '#Class "Rector\\Php71\\Rector\\FuncCall\\CountOnNullRector" is missing @see annotation with test case class reference#'
         - '#Register "Rector\\Php71\\Rector\\FuncCall\\CountOnNullRector" service to "php71\.php" config set#'
-        - '#Register "Rector\\Php74\\Rector\\FuncCall\\ArraySpreadInsteadOfArrayMergeRector" service to "php74\.php" config set#'
 
         # dev rule
         - '#Class "Rector\\Utils\\Rector\\MoveAbstractRectorToChildrenRector" is missing @see annotation with test case class reference#'

diff --git a/...explicit_array_and_explicit_array.php.inc → ...explicit_array_and_explicit_array.php.inc b/...explicit_array_and_explicit_array.php.inc → ...explicit_array_and_explicit_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class DemoFile
 {
@@ -14,7 +14,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class DemoFile
 {

diff --git a/...atten_explicit_array_and_variable.php.inc → ...atten_explicit_array_and_variable.php.inc b/...atten_explicit_array_and_variable.php.inc → ...atten_explicit_array_and_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class DemoFile
 {
@@ -16,7 +16,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class DemoFile
 {

diff --git a/...atten_variable_and_explicit_array.php.inc → ...atten_variable_and_explicit_array.php.inc b/...atten_variable_and_explicit_array.php.inc → ...atten_variable_and_explicit_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class DemoFile
 {
@@ -16,7 +16,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class DemoFile
 {

diff --git a/...eRector/FixturePhp81/integer_keys.php.inc → ...eRector/FixturePhp74/integer_keys.php.inc b/...eRector/FixturePhp81/integer_keys.php.inc → ...eRector/FixturePhp74/integer_keys.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 class IntegerKeys
 {
@@ -17,7 +17,7 @@ class IntegerKeys
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 class IntegerKeys
 {

diff --git a/...or/FixturePhp81/skip_get_iterator.php.inc → ...or/FixturePhp74/skip_get_iterator.php.inc b/...or/FixturePhp81/skip_get_iterator.php.inc → ...or/FixturePhp74/skip_get_iterator.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 use Symfony\Component\Finder\Finder;
 

diff --git a/...xturePhp81/skip_iterator_to_array.php.inc → ...xturePhp74/skip_iterator_to_array.php.inc b/...xturePhp81/skip_iterator_to_array.php.inc → ...xturePhp74/skip_iterator_to_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 final class SkipIteratorToArray
 {

diff --git a/...ector/FixturePhp74/skip_parse_url.php.inc → ...ector/FixturePhp74/skip_parse_url.php.inc b/...ector/FixturePhp74/skip_parse_url.php.inc → ...ector/FixturePhp74/skip_parse_url.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 class SkipParseUrl
 {

diff --git a/...turePhp81/skip_simple_array_merge.php.inc → ...turePhp74/skip_simple_array_merge.php.inc b/...turePhp81/skip_simple_array_merge.php.inc → ...turePhp74/skip_simple_array_merge.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 class SkipSimpleArrayMerge
 {

diff --git a/...turePhp74/skip_spread_array_merge.php.inc → ...turePhp74/skip_spread_array_merge.php.inc b/...turePhp74/skip_spread_array_merge.php.inc → ...turePhp74/skip_spread_array_merge.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 use stdClass;
 

diff --git a/...tor/FixturePhp74/skip_string_keys.php.inc → ...tor/FixturePhp74/skip_string_keys.php.inc b/...tor/FixturePhp74/skip_string_keys.php.inc → ...tor/FixturePhp74/skip_string_keys.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 class SkipStringKeys
 {

diff --git a/...4/skip_string_keys_from_functions.php.inc → ...4/skip_string_keys_from_functions.php.inc b/...4/skip_string_keys_from_functions.php.inc → ...4/skip_string_keys_from_functions.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
 
 function x(): array
 {

diff --git a/...yMergeRector/FixturePhp81/any_key.php.inc → ...yMergeRector/FixturePhp81/any_key.php.inc b/...yMergeRector/FixturePhp81/any_key.php.inc → ...yMergeRector/FixturePhp81/any_key.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class AnyKey
 {
@@ -33,7 +33,7 @@ class AnyKey
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class AnyKey
 {

diff --git a/...explicit_array_and_explicit_array.php.inc → ...explicit_array_and_explicit_array.php.inc b/...explicit_array_and_explicit_array.php.inc → ...explicit_array_and_explicit_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class DemoFile
 {
@@ -14,7 +14,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class DemoFile
 {

diff --git a/...atten_explicit_array_and_variable.php.inc → ...atten_explicit_array_and_variable.php.inc b/...atten_explicit_array_and_variable.php.inc → ...atten_explicit_array_and_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class DemoFile
 {
@@ -16,7 +16,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class DemoFile
 {

diff --git a/...atten_variable_and_explicit_array.php.inc → ...atten_variable_and_explicit_array.php.inc b/...atten_variable_and_explicit_array.php.inc → ...atten_variable_and_explicit_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class DemoFile
 {
@@ -16,7 +16,7 @@ final class DemoFile
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class DemoFile
 {

diff --git a/...eRector/FixturePhp74/integer_keys.php.inc → ...eRector/FixturePhp81/integer_keys.php.inc b/...eRector/FixturePhp74/integer_keys.php.inc → ...eRector/FixturePhp81/integer_keys.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class IntegerKeys
 {
@@ -17,7 +17,7 @@ class IntegerKeys
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class IntegerKeys
 {

diff --git a/...ergeRector/FixturePhp81/parse_url.php.inc → ...ergeRector/FixturePhp81/parse_url.php.inc b/...ergeRector/FixturePhp81/parse_url.php.inc → ...ergeRector/FixturePhp81/parse_url.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class ParseUrl
 {
@@ -23,7 +23,7 @@ class ParseUrl
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class ParseUrl
 {

diff --git a/...rePhp81/skip_first_class_callable.php.inc → ...rePhp81/skip_first_class_callable.php.inc b/...rePhp81/skip_first_class_callable.php.inc → ...rePhp81/skip_first_class_callable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class SkipFirstClassCallable
 {

diff --git a/...or/FixturePhp74/skip_get_iterator.php.inc → ...or/FixturePhp81/skip_get_iterator.php.inc b/...or/FixturePhp74/skip_get_iterator.php.inc → ...or/FixturePhp81/skip_get_iterator.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 use Symfony\Component\Finder\Finder;
 

diff --git a/...xturePhp74/skip_iterator_to_array.php.inc → ...xturePhp81/skip_iterator_to_array.php.inc b/...xturePhp74/skip_iterator_to_array.php.inc → ...xturePhp81/skip_iterator_to_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 final class SkipIteratorToArray
 {

diff --git a/...turePhp74/skip_simple_array_merge.php.inc → ...turePhp81/skip_simple_array_merge.php.inc b/...turePhp74/skip_simple_array_merge.php.inc → ...turePhp81/skip_simple_array_merge.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp74;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class SkipSimpleArrayMerge
 {

diff --git a/...turePhp81/skip_spread_array_merge.php.inc → ...turePhp81/skip_spread_array_merge.php.inc b/...turePhp81/skip_spread_array_merge.php.inc → ...turePhp81/skip_spread_array_merge.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 use stdClass;
 

diff --git a/...geRector/FixturePhp81/string_keys.php.inc → ...geRector/FixturePhp81/string_keys.php.inc b/...geRector/FixturePhp81/string_keys.php.inc → ...geRector/FixturePhp81/string_keys.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class StringKeys
 {
@@ -24,7 +24,7 @@ class StringKeys
 -----
 <?php
 
-namespace Rector\Tests\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector\FixturePhp81;
 
 class StringKeys
 {