DX: add `YieldFromArrayToYieldsFixer` to `PhpCsFixer` set (#7115)

Co-authored-by: Dariusz Rumiński <dariusz.ruminski@gmail.com>

doc/list.rst

@@ -3299,6 +3299,8 @@ List of Available Rules
    The conversion will make the array in ``yield from`` changed in arrays of 1
    less dimension.
 
+   Part of rule set `@PhpCsFixer <./ruleSets/PhpCsFixer.rst>`_
+
    `Source PhpCsFixer\\Fixer\\ArrayNotation\\YieldFromArrayToYieldsFixer <./../src/Fixer/ArrayNotation/YieldFromArrayToYieldsFixer.php>`_
 -  `yoda_style <./rules/control_structure/yoda_style.rst>`_
 

doc/ruleSets/PhpCsFixer.rst

@@ -55,6 +55,7 @@ Rules
 - `whitespace_after_comma_in_array <./../rules/array_notation/whitespace_after_comma_in_array.rst>`_
   config:
   ``['ensure_single_space' => true]``
+- `yield_from_array_to_yields <./../rules/array_notation/yield_from_array_to_yields.rst>`_
 
 Disabled rules
 --------------

doc/rules/array_notation/yield_from_array_to_yields.rst

@@ -32,3 +32,11 @@ Example #1
    +        yield 3;
    +    
     }
+
+Rule sets
+---------
+
+The rule is part of the following rule set:
+
+@PhpCsFixer
+  Using the `@PhpCsFixer <./../../ruleSets/PhpCsFixer.rst>`_ rule set will enable the ``yield_from_array_to_yields`` rule.

src/RuleSet/Sets/PhpCsFixerSet.php

@@ -117,6 +117,7 @@ final class PhpCsFixerSet extends AbstractRuleSetDescription
             'single_line_comment_style' => true,
             'single_line_throw' => false,
             'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
+            'yield_from_array_to_yields' => true,
         ];
     }
 

tests/Fixer/Alias/NoMixedEchoPrintFixerTest.php

@@ -38,98 +38,107 @@ final class NoMixedEchoPrintFixerTest extends AbstractFixerTestCase
 
     public static function provideFixEchoToPrintCases(): iterable
     {
-        yield from [
-            [
-                '<?php
+        yield [
+            '<?php
                 print "test";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print ("test");
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print("test");
                 ',
-            ],
-            // `echo` can take multiple parameters (although such usage is rare) while `print` can take only one argument,
-            // @see https://php.net/manual/en/function.echo.php and @see https://php.net/manual/en/function.print.php
-            [
-                '<?php
+        ];
+        // `echo` can take multiple parameters (although such usage is rare) while `print` can take only one argument,
+        // @see https://php.net/manual/en/function.echo.php and @see https://php.net/manual/en/function.print.php
+        yield [
+            '<?php
                 echo "This ", "string ", "was ", "made ", "with multiple parameters.";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print "test";
                 ',
-                '<?php
+            '<?php
                 echo "test";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print ("test");
                 ',
-                '<?php
+            '<?php
                 echo ("test");
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print("test");
                 ',
-                '<?php
+            '<?php
                 echo("test");
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print foo(1, 2);
                 ',
-                '<?php
+            '<?php
                 echo foo(1, 2);
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print ["foo", "bar", "baz"][$x];
                 ',
-                '<?php
+            '<?php
                 echo ["foo", "bar", "baz"][$x];
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 print $foo ? "foo" : "bar";
                 ',
-                '<?php
+            '<?php
                 echo $foo ? "foo" : "bar";
                 ',
-            ],
-            [
-                "<?php print 'foo' ?>...<?php echo 'bar', 'baz' ?>",
-                "<?php echo 'foo' ?>...<?php echo 'bar', 'baz' ?>",
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            "<?php print 'foo' ?>...<?php echo 'bar', 'baz' ?>",
+            "<?php echo 'foo' ?>...<?php echo 'bar', 'baz' ?>",
+        ];
+
+        yield [
+            '<?php
                 if ($foo) {
                     print "foo";
                 }
                 print "bar";
                 ',
-                '<?php
+            '<?php
                 if ($foo) {
                     echo "foo";
                 }
                 echo "bar";
                 ',
-            ],
-            [
-                '<?=$foo?>',
-            ],
+        ];
+
+        yield [
+            '<?=$foo?>',
         ];
 
         foreach (self::getCodeSnippetsToConvertBothWays() as $codeSnippet) {
@@ -151,42 +160,45 @@ final class NoMixedEchoPrintFixerTest extends AbstractFixerTestCase
 
     public static function provideFixPrintToEchoCases(): iterable
     {
-        yield from [
-            [
-                '<?php
+        yield [
+            '<?php
                 echo "test";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo ("test");
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo("test");
                 ',
-            ],
-            // https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/1502#issuecomment-156436229
-            [
-                '<?php
+        ];
+        // https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/1502#issuecomment-156436229
+        yield [
+            '<?php
                 ($some_var) ? print "true" : print "false";
                 ',
-            ],
-            // echo has no return value while print has a return value of 1 so it can be used in expressions.
-            // https://www.w3schools.com/php/php_echo_print.asp
-            [
-                '<?php
+        ];
+        // echo has no return value while print has a return value of 1 so it can be used in expressions.
+        // https://www.w3schools.com/php/php_echo_print.asp
+        yield [
+            '<?php
                 $ret = print "test";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 @print foo();
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 function testFunction() {
                     return print("test");
                 }
@@ -199,71 +211,77 @@ final class NoMixedEchoPrintFixerTest extends AbstractFixerTestCase
                 switch(print(\'a\')) {}
                 if (1 === print($a)) {}
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 some_function_call();
                 echo "test";
                 ',
-                '<?php
+            '<?php
                 some_function_call();
                 print "test";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo "test";
                 ',
-                '<?php
+            '<?php
                 print "test";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo ("test");
                 ',
-                '<?php
+            '<?php
                 print ("test");
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo("test");
                 ',
-                '<?php
+            '<?php
                 print("test");
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo foo(1, 2);
                 ',
-                '<?php
+            '<?php
                 print foo(1, 2);
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 echo $foo ? "foo" : "bar";
                 ',
-                '<?php
+            '<?php
                 print $foo ? "foo" : "bar";
                 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 if ($foo) {
                     echo "foo";
                 }
                 echo "bar";
                 ',
-                '<?php
+            '<?php
                 if ($foo) {
                     print "foo";
                 }
                 print "bar";
                 ',
-            ],
         ];
 
         foreach (self::getCodeSnippetsToConvertBothWays() as $codeSnippet) {

tests/Fixer/Alias/PowToExponentiationFixerTest.php

@@ -34,206 +34,245 @@ final class PowToExponentiationFixerTest extends AbstractFixerTestCase
 
     public static function provideFixCases(): iterable
     {
-        yield from [
-            [
-                '<?php 1**2;',
-                '<?php pow(1,2);',
-            ],
-            [
-                '<?php 1**2?>',
-                '<?php pow(1,2)?>',
-            ],
-            [
-                '<?php 1.2**2.3;',
-                '<?php pow(1.2,2.3);',
-            ],
-            [
-                '<?php echo (-2)** 3;',
-                '<?php echo pow(-2, 3);',
-            ],
-            [
-                '<?php echo (-2)**( -3);',
-                '<?php echo pow(-2, -3);',
-            ],
-            [
-                '<?php echo (-2)**( 1-3);',
-                '<?php echo pow(-2, 1-3);',
-            ],
-            [
-                '<?php echo (-2)**( -1-3);',
-                '<?php echo pow(-2, -1-3);',
-            ],
-            [
-                '<?php $a = 3** +2;',
-                '<?php $a = pow(3, +2);',
-            ],
-            [
-                '<?php $a--**++$b;',
-                '<?php pow($a--,++$b);',
-            ],
-            [
-                '<?php 1//
+        yield [
+            '<?php 1**2;',
+            '<?php pow(1,2);',
+        ];
+
+        yield [
+            '<?php 1**2?>',
+            '<?php pow(1,2)?>',
+        ];
+
+        yield [
+            '<?php 1.2**2.3;',
+            '<?php pow(1.2,2.3);',
+        ];
+
+        yield [
+            '<?php echo (-2)** 3;',
+            '<?php echo pow(-2, 3);',
+        ];
+
+        yield [
+            '<?php echo (-2)**( -3);',
+            '<?php echo pow(-2, -3);',
+        ];
+
+        yield [
+            '<?php echo (-2)**( 1-3);',
+            '<?php echo pow(-2, 1-3);',
+        ];
+
+        yield [
+            '<?php echo (-2)**( -1-3);',
+            '<?php echo pow(-2, -1-3);',
+        ];
+
+        yield [
+            '<?php $a = 3** +2;',
+            '<?php $a = pow(3, +2);',
+        ];
+
+        yield [
+            '<?php $a--**++$b;',
+            '<?php pow($a--,++$b);',
+        ];
+
+        yield [
+            '<?php 1//
                 #
                 **2/**/ /**  */;',
-                '<?php pow(1//
+            '<?php pow(1//
                 #
                 ,2/**/ /**  */);',
-            ],
-            [
-                '<?php /**/a(3/**/,4)**$pow;//pow(1,2);',
-                '<?php pow/**/(a(3/**/,4),$pow);//pow(1,2);',
-            ],
-            [
-                '<?php \a\pow(5,6);7**8?>',
-                '<?php \a\pow(5,6);pow(7,8)?>',
-            ],
-            [
-                '<?php (9**10)**(11**12);',
-                '<?php pow(pow(9,10),pow(11,12));',
-            ],
-            [
-                '<?php (1 + 2)**( 3 * 4);',
-                '<?php pow(1 + 2, 3 * 4);',
-            ],
-            [
-                '<?php ($b = 4)** 3;',
-                '<?php pow($b = 4, 3);',
-            ],
-            [
-                '<?php 13**14;',
-                '<?php \pow(13,14);',
-            ],
-            [
-                '<?php $a = 15 + (16** 17)** 18;',
-                '<?php $a = 15 + \pow(\pow(16, 17), 18);',
-            ],
-            [
-                '<?php $a = $b** $c($d + 1);',
-                '<?php $a = pow($b, $c($d + 1));',
-            ],
-            [
-                '<?php $a = ($a+$b)** ($c-$d);',
-                '<?php $a = pow(($a+$b), ($c-$d));',
-            ],
-            [
-                "<?php \$a = 2**( '1'.'2'). 2;",
-                "<?php \$a = pow(2, '1'.'2'). 2;",
-            ],
-            [
-                '<?php A::B** 2;\A\B\C::B** 2;',
-                '<?php pow(A::B, 2);pow(\A\B\C::B, 2);',
-            ],
-            [
-                '<?php $obj->{$bar}** $obj->{$foo};',
-                '<?php pow($obj->{$bar}, $obj->{$foo});',
-            ],
-            [
-                '<?php echo ${$bar}** ${$foo};',
-                '<?php echo pow(${$bar}, ${$foo});',
-            ],
-            [
-                '<?php echo $a[2^3+1]->test(1,2)** $b[2+$c];',
-                '<?php echo pow($a[2^3+1]->test(1,2), $b[2+$c]);',
-            ],
-            [
-                '<?php (int)"2"**(float)"3.0";',
-                '<?php pow((int)"2",(float)"3.0");',
-            ],
-            [
-                '<?php namespace\Foo::BAR** 2;',
-                '<?php pow(namespace\Foo::BAR, 2);',
-            ],
-            [
-                '<?php (-1)**( (-2)**( (-3)**( (-4)**( (-5)**( (-6)**( (-7)**( (-8)**( (-9)** 3))))))));',
-                '<?php pow(-1, pow(-2, pow(-3, pow(-4, pow(-5, pow(-6, pow(-7, pow(-8, pow(-9, 3)))))))));',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php /**/a(3/**/,4)**$pow;//pow(1,2);',
+            '<?php pow/**/(a(3/**/,4),$pow);//pow(1,2);',
+        ];
+
+        yield [
+            '<?php \a\pow(5,6);7**8?>',
+            '<?php \a\pow(5,6);pow(7,8)?>',
+        ];
+
+        yield [
+            '<?php (9**10)**(11**12);',
+            '<?php pow(pow(9,10),pow(11,12));',
+        ];
+
+        yield [
+            '<?php (1 + 2)**( 3 * 4);',
+            '<?php pow(1 + 2, 3 * 4);',
+        ];
+
+        yield [
+            '<?php ($b = 4)** 3;',
+            '<?php pow($b = 4, 3);',
+        ];
+
+        yield [
+            '<?php 13**14;',
+            '<?php \pow(13,14);',
+        ];
+
+        yield [
+            '<?php $a = 15 + (16** 17)** 18;',
+            '<?php $a = 15 + \pow(\pow(16, 17), 18);',
+        ];
+
+        yield [
+            '<?php $a = $b** $c($d + 1);',
+            '<?php $a = pow($b, $c($d + 1));',
+        ];
+
+        yield [
+            '<?php $a = ($a+$b)** ($c-$d);',
+            '<?php $a = pow(($a+$b), ($c-$d));',
+        ];
+
+        yield [
+            "<?php \$a = 2**( '1'.'2'). 2;",
+            "<?php \$a = pow(2, '1'.'2'). 2;",
+        ];
+
+        yield [
+            '<?php A::B** 2;\A\B\C::B** 2;',
+            '<?php pow(A::B, 2);pow(\A\B\C::B, 2);',
+        ];
+
+        yield [
+            '<?php $obj->{$bar}** $obj->{$foo};',
+            '<?php pow($obj->{$bar}, $obj->{$foo});',
+        ];
+
+        yield [
+            '<?php echo ${$bar}** ${$foo};',
+            '<?php echo pow(${$bar}, ${$foo});',
+        ];
+
+        yield [
+            '<?php echo $a[2^3+1]->test(1,2)** $b[2+$c];',
+            '<?php echo pow($a[2^3+1]->test(1,2), $b[2+$c]);',
+        ];
+
+        yield [
+            '<?php (int)"2"**(float)"3.0";',
+            '<?php pow((int)"2",(float)"3.0");',
+        ];
+
+        yield [
+            '<?php namespace\Foo::BAR** 2;',
+            '<?php pow(namespace\Foo::BAR, 2);',
+        ];
+
+        yield [
+            '<?php (-1)**( (-2)**( (-3)**( (-4)**( (-5)**( (-6)**( (-7)**( (-8)**( (-9)** 3))))))));',
+            '<?php pow(-1, pow(-2, pow(-3, pow(-4, pow(-5, pow(-6, pow(-7, pow(-8, pow(-9, 3)))))))));',
+        ];
+
+        yield [
+            '<?php
                     $z = 1**2;
                     $a = 1**( 2**( 3**( 4**( 5**( 6**( 7**( 8**( 9** 3))))))));
                     $b = 1**( 2**( 3**( 4**( 5**( 6**( 7**( 8**( 9** 3))))))));
                     $d = 1**2;
                 ',
-                '<?php
+            '<?php
                     $z = pow(1,2);
                     $a = \pow(1, \poW(2, \pOw(3, \pOW(4, \Pow(5, \PoW(6, \POw(7, \POW(8, \pow(9, 3)))))))));
                     $b = \pow(1, \pow(2, \pow(3, \pow(4, \pow(5, \pow(6, \pow(7, \pow(8, \pow(9, 3)))))))));
                     $d = pow(1,2);
                 ',
-            ],
-            [
-                '<?php $b = 3** __LINE__;',
-                '<?php $b = pow(3, __LINE__);',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php $b = 3** __LINE__;',
+            '<?php $b = pow(3, __LINE__);',
+        ];
+
+        yield [
+            '<?php
                     ($a-$b)**(
                     ($a-$b)**(
                     ($a-$b)**(
                     ($a-$b)**(
                     ($a-$b)**($a-$b)
                 ))));',
-                '<?php
+            '<?php
                     pow($a-$b,
                     pow($a-$b,
                     pow($a-$b,
                     pow($a-$b,
                     pow($a-$b,$a-$b)
                 ))));',
-            ],
-            [
-                '<?php (-1)**( $a** pow(1,2,3, ($a-3)** 4));',
-                '<?php pow(-1, pow($a, pow(1,2,3, pow($a-3, 4))));',
-            ],
-            [
-                '<?php 1**2    /**/ ?>',
-                '<?php pow(1,2)    /**/ ?>',
-            ],
-            [
-                '<?php ($$a)**( $$b);',
-                '<?php pow($$a, $$b);',
-            ],
-            [
-                '<?php [1, 2, 3, 4][$x]** 2;',
-                '<?php pow([1, 2, 3, 4][$x], 2);',
-            ],
-            [
-                '<?php echo +$a** 2;',
-                '<?php echo pow(+$a, 2);',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php (-1)**( $a** pow(1,2,3, ($a-3)** 4));',
+            '<?php pow(-1, pow($a, pow(1,2,3, pow($a-3, 4))));',
+        ];
+
+        yield [
+            '<?php 1**2    /**/ ?>',
+            '<?php pow(1,2)    /**/ ?>',
+        ];
+
+        yield [
+            '<?php ($$a)**( $$b);',
+            '<?php pow($$a, $$b);',
+        ];
+
+        yield [
+            '<?php [1, 2, 3, 4][$x]** 2;',
+            '<?php pow([1, 2, 3, 4][$x], 2);',
+        ];
+
+        yield [
+            '<?php echo +$a** 2;',
+            '<?php echo pow(+$a, 2);',
+        ];
+
+        yield [
+            '<?php
                 interface Test
                 {
                     public function pow($a, $b);
                 }',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                 interface Test
                 {
                     public function &pow($a, $b);
                 }',
-            ],
-            [
-                '<?php echo $a[1]** $b[2+5];',
-                '<?php echo pow($a[1], $b[2+5]);',
-            ],
-            [
-                '<?php pow($b, ...$a);',
-            ],
-            [
-                '<?php echo +$a** 2;',
-                '<?php echo pow(+$a, 2,);',
-            ],
-            [
-                '<?php echo +$a** 2/*1*//*2*/;',
-                '<?php echo pow(+$a, 2/*1*/,/*2*/);',
-            ],
-            [
-                '<?php echo 10_0** 2;',
-                '<?php echo pow(10_0, 2);',
-            ],
+        ];
+
+        yield [
+            '<?php echo $a[1]** $b[2+5];',
+            '<?php echo pow($a[1], $b[2+5]);',
+        ];
+
+        yield [
+            '<?php pow($b, ...$a);',
+        ];
+
+        yield [
+            '<?php echo +$a** 2;',
+            '<?php echo pow(+$a, 2,);',
+        ];
+
+        yield [
+            '<?php echo +$a** 2/*1*//*2*/;',
+            '<?php echo pow(+$a, 2/*1*/,/*2*/);',
+        ];
+
+        yield [
+            '<?php echo 10_0** 2;',
+            '<?php echo pow(10_0, 2);',
         ];
     }
 

tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php

@@ -99,88 +99,114 @@ class overridesIntval
 }
 OVERRIDDEN;
 
-        yield from [
-            ['<?php $x = "intval";'],
-
-            ['<?php $x = ClassA::intval(mt_rand(0, 100));'],
-            ['<?php $x = ScopeA\\intval(mt_rand(0, 100));'],
-            ['<?php $x = namespace\\intval(mt_rand(0, 100));'],
-            ['<?php $x = $object->intval(mt_rand(0, 100));'],
-
-            ['<?php $x = new \\intval(mt_rand(0, 100));'],
-            ['<?php $x = new intval(mt_rand(0, 100));'],
-            ['<?php $x = new ScopeB\\intval(mt_rand(0, 100));'],
-
-            ['<?php intvalSmth(mt_rand(0, 100));'],
-            ['<?php smth_intval(mt_rand(0, 100));'],
-
-            ['<?php "SELECT ... intval(mt_rand(0, 100)) ...";'],
-            ['<?php "test" . "intval" . "in concatenation";'],
-
-            ['<?php $x = intval($x, 16);'],
-            ['<?php $x = intval($x, $options["base"]);'],
-            ['<?php $x = intval($x, $options->get("base", 16));'],
-
-            ['<?php $x = (int) $x;', '<?php $x = intval($x);'],
-            ['<?php $x = (float) $x;', '<?php $x = floatval($x);'],
-            ['<?php $x = (float) $x;', '<?php $x = doubleval($x);'],
-            ['<?php $x = (string) $x;', '<?php $x = strval($x);'],
-            ['<?php $x = (bool) $x;', '<?php $x = boolval   (  $x  );'],
-            ['<?php $x = (int) (mt_rand(0, 100));', '<?php $x = intval(mt_rand(0, 100));'],
-            ['<?php $x = (int) (mt_rand(0, 100));', '<?php $x = \\intval(mt_rand(0, 100));'],
-            ['<?php $x = (int) (mt_rand(0, 100)).".dist";', '<?php $x = intval(mt_rand(0, 100)).".dist";'],
-            ['<?php $x = (int) (mt_rand(0, 100)).".dist";', '<?php $x = \\intval(mt_rand(0, 100)).".dist";'],
-
-            [$multiLinePatternFixed, $multiLinePatternToFix],
-            [$overriddenFunctionFixed, $overriddenFunction],
-
-            [
-                '<?php $a = (string) ($b . $c);',
-                '<?php $a = strval($b . $c);',
-            ],
-            [
-                '<?php $x = /**/(int) /**/ /** x*/(/**//** */mt_rand(0, 100)/***/)/*xx*/;',
-                '<?php $x = /**/intval/**/ /** x*/(/**//** */mt_rand(0, 100)/***/)/*xx*/;',
-            ],
-            [
-                '<?php $x = (string) ((int) ((int) $x + (float) $x));',
-                '<?php $x = strval(intval(intval($x) + floatval($x)));',
-            ],
-            [
-                '<?php intval();intval(1,2,3);',
-            ],
-            [
-                '<?php
+        yield ['<?php $x = "intval";'];
+
+        yield ['<?php $x = ClassA::intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = ScopeA\\intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = namespace\\intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = $object->intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = new \\intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = new intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = new ScopeB\\intval(mt_rand(0, 100));'];
+
+        yield ['<?php intvalSmth(mt_rand(0, 100));'];
+
+        yield ['<?php smth_intval(mt_rand(0, 100));'];
+
+        yield ['<?php "SELECT ... intval(mt_rand(0, 100)) ...";'];
+
+        yield ['<?php "test" . "intval" . "in concatenation";'];
+
+        yield ['<?php $x = intval($x, 16);'];
+
+        yield ['<?php $x = intval($x, $options["base"]);'];
+
+        yield ['<?php $x = intval($x, $options->get("base", 16));'];
+
+        yield ['<?php $x = (int) $x;', '<?php $x = intval($x);'];
+
+        yield ['<?php $x = (float) $x;', '<?php $x = floatval($x);'];
+
+        yield ['<?php $x = (float) $x;', '<?php $x = doubleval($x);'];
+
+        yield ['<?php $x = (string) $x;', '<?php $x = strval($x);'];
+
+        yield ['<?php $x = (bool) $x;', '<?php $x = boolval   (  $x  );'];
+
+        yield ['<?php $x = (int) (mt_rand(0, 100));', '<?php $x = intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = (int) (mt_rand(0, 100));', '<?php $x = \\intval(mt_rand(0, 100));'];
+
+        yield ['<?php $x = (int) (mt_rand(0, 100)).".dist";', '<?php $x = intval(mt_rand(0, 100)).".dist";'];
+
+        yield ['<?php $x = (int) (mt_rand(0, 100)).".dist";', '<?php $x = \\intval(mt_rand(0, 100)).".dist";'];
+
+        yield [$multiLinePatternFixed, $multiLinePatternToFix];
+
+        yield [$overriddenFunctionFixed, $overriddenFunction];
+
+        yield [
+            '<?php $a = (string) ($b . $c);',
+            '<?php $a = strval($b . $c);',
+        ];
+
+        yield [
+            '<?php $x = /**/(int) /**/ /** x*/(/**//** */mt_rand(0, 100)/***/)/*xx*/;',
+            '<?php $x = /**/intval/**/ /** x*/(/**//** */mt_rand(0, 100)/***/)/*xx*/;',
+        ];
+
+        yield [
+            '<?php $x = (string) ((int) ((int) $x + (float) $x));',
+            '<?php $x = strval(intval(intval($x) + floatval($x)));',
+        ];
+
+        yield [
+            '<?php intval();intval(1,2,3);',
+        ];
+
+        yield [
+            '<?php
                 interface Test
                 {
                     public function floatval($a);
                     public function &doubleval($a);
                 }',
-            ],
-            [
-                '<?php $foo = ((int) $x)**2;',
-                '<?php $foo = intval($x)**2;',
-            ],
-            [
-                '<?php $foo = ((string) $x)[0];',
-                '<?php $foo = strval($x)[0];',
-            ],
-            [
-                '<?php $foo = ((string) ($x + $y))[0];',
-                '<?php $foo = strval($x + $y)[0];',
-            ],
-            [
-                '<?php $a = (int) $b;',
-                '<?php $a = intval($b, );',
-            ],
-            [
-                '<?php $a = (int) $b;',
-                '<?php $a = intval($b , );',
-            ],
-            [
-                '<?php $a = (string) ($b . $c);',
-                '<?php $a = strval($b . $c, );',
-            ],
+        ];
+
+        yield [
+            '<?php $foo = ((int) $x)**2;',
+            '<?php $foo = intval($x)**2;',
+        ];
+
+        yield [
+            '<?php $foo = ((string) $x)[0];',
+            '<?php $foo = strval($x)[0];',
+        ];
+
+        yield [
+            '<?php $foo = ((string) ($x + $y))[0];',
+            '<?php $foo = strval($x + $y)[0];',
+        ];
+
+        yield [
+            '<?php $a = (int) $b;',
+            '<?php $a = intval($b, );',
+        ];
+
+        yield [
+            '<?php $a = (int) $b;',
+            '<?php $a = intval($b , );',
+        ];
+
+        yield [
+            '<?php $a = (string) ($b . $c);',
+            '<?php $a = strval($b . $c, );',
         ];
     }
 

tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php

@@ -533,38 +533,40 @@ TestInterface3, /**/     TestInterface4   ,
 
     public static function provideClassyInheritanceInfoCases(): iterable
     {
-        yield from [
-            '1' => [
-                '<?php
+        yield '1' => [
+            '<?php
 class X11 implements    Z   , T,R
 {
 }',
-                'numberOfImplements',
-                ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
-            ],
-            '2' => [
-                '<?php
+            'numberOfImplements',
+            ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
+        ];
+
+        yield '2' => [
+            '<?php
 class X10 implements    Z   , T,R    //
 {
 }',
-                'numberOfImplements',
-                ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
-            ],
-            '3' => [
-                '<?php class A implements B {}',
-                'numberOfImplements',
-                ['start' => 5, 'numberOfImplements' => 1, 'multiLine' => false],
-            ],
-            '4' => [
-                "<?php class A implements B,\n I{}",
-                'numberOfImplements',
-                ['start' => 5, 'numberOfImplements' => 2, 'multiLine' => true],
-            ],
-            '5' => [
-                "<?php class A implements Z\\C\\B,C,D  {\n\n\n}",
-                'numberOfImplements',
-                ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
-            ],
+            'numberOfImplements',
+            ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
+        ];
+
+        yield '3' => [
+            '<?php class A implements B {}',
+            'numberOfImplements',
+            ['start' => 5, 'numberOfImplements' => 1, 'multiLine' => false],
+        ];
+
+        yield '4' => [
+            "<?php class A implements B,\n I{}",
+            'numberOfImplements',
+            ['start' => 5, 'numberOfImplements' => 2, 'multiLine' => true],
+        ];
+
+        yield '5' => [
+            "<?php class A implements Z\\C\\B,C,D  {\n\n\n}",
+            'numberOfImplements',
+            ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
         ];
 
         if (\PHP_VERSION_ID < 8_00_00) {
@@ -618,22 +620,22 @@ namespace {
             ['start' => 36, 'numberOfImplements' => 2, 'multiLine' => $multiLine],
         ];
 
-        yield from [
-            [
-                "<?php \$a = new    class(3)     extends\nSomeClass\timplements    SomeInterface, D {};",
-                'numberOfExtends',
-                ['start' => 12, 'numberOfExtends' => 1, 'multiLine' => true],
-            ],
-            [
-                "<?php \$a = new class(4) extends\nSomeClass\timplements SomeInterface, D\n\n{};",
-                'numberOfImplements',
-                ['start' => 16, 'numberOfImplements' => 2, 'multiLine' => false],
-            ],
-            [
-                "<?php \$a = new class(5) extends SomeClass\nimplements    SomeInterface, D {};",
-                'numberOfExtends',
-                ['start' => 12, 'numberOfExtends' => 1, 'multiLine' => true],
-            ],
+        yield [
+            "<?php \$a = new    class(3)     extends\nSomeClass\timplements    SomeInterface, D {};",
+            'numberOfExtends',
+            ['start' => 12, 'numberOfExtends' => 1, 'multiLine' => true],
+        ];
+
+        yield [
+            "<?php \$a = new class(4) extends\nSomeClass\timplements SomeInterface, D\n\n{};",
+            'numberOfImplements',
+            ['start' => 16, 'numberOfImplements' => 2, 'multiLine' => false],
+        ];
+
+        yield [
+            "<?php \$a = new class(5) extends SomeClass\nimplements    SomeInterface, D {};",
+            'numberOfExtends',
+            ['start' => 12, 'numberOfExtends' => 1, 'multiLine' => true],
         ];
     }
 

tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php

@@ -37,9 +37,8 @@ final class SingleClassElementPerStatementFixerTest extends AbstractFixerTestCas
 
     public static function provideFixCases(): iterable
     {
-        yield from [
-            [
-                '<?php
+        yield [
+            '<?php
 class Foo
 {
     private static $bar1 = array(1,2,3);
@@ -50,16 +49,17 @@ class Foo
     private static $aaa2 = array(2, 2);
     private static $aaa3 = 3;
 }',
-                '<?php
+            '<?php
 class Foo
 {
     private static $bar1 = array(1,2,3), $bar2 = [1,2,3];
     private static $baz1 = array(array(1,2), array(3, 4)), $baz2 = array(1,2,3);
     private static $aaa1 = 1, $aaa2 = array(2, 2), $aaa3 = 3;
 }',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 class Foo
 {
     const A = 1;
@@ -68,7 +68,7 @@ class Foo
 
 echo Foo::A, Foo::B;
 ',
-                '<?php
+            '<?php
 class Foo
 {
     const A = 1, B = 2;
@@ -76,21 +76,23 @@ class Foo
 
 echo Foo::A, Foo::B;
 ',
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { protected static $foo = 1; protected static $bar; protected static $baz=2 ; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { protected static $foo = 1,$bar,$baz=2 ; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo {}
@@ -99,33 +101,36 @@ class Bar
 {
 }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { protected static $foo = 1; protected static $bar; protected static $baz=2 ; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { protected static $foo = 1, $bar,  $baz=2 ; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { const ONE = 1; const TWO = 2; protected static $foo = 1; protected static $bar; protected static $baz=2 ; const THREE = 3; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { const ONE = 1, TWO = 2; protected static $foo = 1, $bar,  $baz=2 ; const THREE = 3; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo {
@@ -134,7 +139,7 @@ class Foo {
     protected static $baz=2;
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {
@@ -143,9 +148,10 @@ class Foo {
    $baz=2;
 }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo {
@@ -157,7 +163,7 @@ class Foo {
     protected static $baz=2;
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {
@@ -169,9 +175,10 @@ class Foo {
    $baz=2;
 }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo {
@@ -185,7 +192,7 @@ class Foo {
     private $var = false;
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {
@@ -199,9 +206,10 @@ class Foo {
     private $var = false;
 }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo {
@@ -217,7 +225,7 @@ class Foo {
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {
@@ -233,9 +241,10 @@ class Foo {
     }
 }
 EOT
-            ],
-            'line_breaks_1' => [
-                <<<'EOT'
+        ];
+
+        yield 'line_breaks_1' => [
+            <<<'EOT'
 <?php
 
 class Foo
@@ -256,7 +265,7 @@ class Foo
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo
@@ -272,9 +281,10 @@ class Foo
     }
 }
 EOT
-            ],
-            'line_breaks_2' => [
-                <<<'EOT'
+        ];
+
+        yield 'line_breaks_2' => [
+            <<<'EOT'
 <?php
 
 class Foo
@@ -290,7 +300,7 @@ class Foo
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo
@@ -305,9 +315,10 @@ class Foo
     }
 }
 EOT
-            ],
-            'line_breaks_3' => [
-                <<<'EOT'
+        ];
+
+        yield 'line_breaks_3' => [
+            <<<'EOT'
 <?php
 
 class Foo
@@ -323,7 +334,7 @@ class Foo
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo
@@ -338,9 +349,10 @@ class Foo
     }
 }
 EOT
-            ],
-            'line_breaks_4' => [
-                <<<'EOT'
+        ];
+
+        yield 'line_breaks_4' => [
+            <<<'EOT'
 <?php
 
 class Foo
@@ -357,7 +369,7 @@ class Foo
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo
@@ -370,9 +382,10 @@ class Foo
     }
 }
 EOT
-            ],
-            'line_breaks_5' => [
-                <<<'EOT'
+        ];
+
+        yield 'line_breaks_5' => [
+            <<<'EOT'
 <?php
 
 class Foo
@@ -384,7 +397,7 @@ class Foo
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo
@@ -396,9 +409,10 @@ class Foo
     }
 }
 EOT
-            ],
-            'line_breaks_6' => [
-                <<<'EOT'
+        ];
+
+        yield 'line_breaks_6' => [
+            <<<'EOT'
 <?php
 
 class Foo
@@ -410,7 +424,7 @@ class Foo
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo
@@ -422,9 +436,10 @@ class Foo
     }
 }
 EOT
-            ],
-            'whitespace_1' => [
-                <<<'EOT'
+        ];
+
+        yield 'whitespace_1' => [
+            <<<'EOT'
 <?php
 
 class Foo {    public $one = 1; public $bar = null; public $initialized = false; public $configured = false; public $called = false; public $arguments = array();
@@ -434,7 +449,7 @@ class Foo {    public $one = 1; public $bar = null; public $initialized = false;
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {    public $one = 1; public $bar = null,$initialized = false,$configured = false,$called = false,$arguments = array();
@@ -444,9 +459,10 @@ class Foo {    public $one = 1; public $bar = null,$initialized = false,$configu
     }
 }
 EOT
-            ],
-            'whitespace_2' => [
-                <<<'EOT'
+        ];
+
+        yield 'whitespace_2' => [
+            <<<'EOT'
 <?php
 
 class Foo {    public $one = 1;  public $bar = null;  public $initialized = false;  public $configured = false;  public $called=false;  public $arguments = array();
@@ -456,7 +472,7 @@ class Foo {    public $one = 1;  public $bar = null;  public $initialized = fals
     }
 }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {    public $one = 1;  public $bar = null,$initialized = false,$configured = false,$called=false,$arguments = array();
@@ -466,129 +482,140 @@ class Foo {    public $one = 1;  public $bar = null,$initialized = false,$config
     }
 }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { protected static $foo = 1; protected static $bar; protected static $baz=1; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { protected static $foo = 1, $bar, $baz=1; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo {   protected static $foo = 1;   protected static $bar;   protected static $baz=1; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo {   protected static $foo = 1, $bar, $baz=1; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { protected $foo = 1; protected $bar; protected $baz=2; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { protected $foo = 1, $bar, $baz=2; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { var $foo = 1; var $bar; var $baz=2; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { var $foo = 1, $bar, $baz=2; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { var $foo = 1; var $bar; public function doSomething1() {} var $baz=2; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { var $foo = 1, $bar; public function doSomething1() {} var $baz=2; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { var $foo = 1; var $bar; public function doSomething2() { global $one, $two, $three; } var $baz=2; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { var $foo = 1, $bar; public function doSomething2() { global $one, $two, $three; } var $baz=2; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { public function doSomething3() {} protected $foo = 1; protected $bar; protected $baz=2; }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { public function doSomething3() {} protected $foo = 1, $bar, $baz=2; }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { public function doSomethingElse() {} protected $foo = 1; protected $bar; protected $baz=2; private $acme =array(); }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { public function doSomethingElse() {} protected $foo = 1, $bar, $baz=2; private $acme =array(); }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { public function doSomewhere() {} protected $foo = 1; protected $bar; protected $baz=2; private $acme1 =array(); }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { public function doSomewhere() {} protected $foo = 1, $bar, $baz=2; private $acme1 =array(); }
 EOT
-            ],
-            [
-                <<<'EOT'
+        ];
+
+        yield [
+            <<<'EOT'
 <?php
 
 class Foo { public function doThis() { global $one1, $two2, $three3; } protected $foo = 1; protected $bar; protected $baz=2; private $acme2 =array(); }
 EOT
-                , <<<'EOT'
+            , <<<'EOT'
 <?php
 
 class Foo { public function doThis() { global $one1, $two2, $three3; } protected $foo = 1, $bar, $baz=2; private $acme2 =array(); }
 EOT
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
 class Foo
 {
     const A = 1;
@@ -601,7 +628,7 @@ B#
 
 echo Foo::A, Foo::B;
 ',
-                '<?php
+            '<?php
 class Foo
 {
     const A = 1,#
@@ -613,9 +640,10 @@ B#
 
 echo Foo::A, Foo::B;
 ',
-            ],
-            [
-                '<?php
+        ];
+
+        yield [
+            '<?php
                     class Token {
                         const PUBLIC_CONST = 0;
                         private const PRIVATE_CONST = 0;
@@ -624,7 +652,7 @@ echo Foo::A, Foo::B;
                         public const TEST_71 = 0;
                     }
                 ',
-                '<?php
+            '<?php
                     class Token {
                         const PUBLIC_CONST = 0;
                         private const PRIVATE_CONST = 0;
@@ -632,7 +660,6 @@ echo Foo::A, Foo::B;
                         public const PUBLIC_CONST_TWO = 0, TEST_71 = 0;
                     }
                 ',
-            ],
         ];
 
         yield [

tests/Fixer/ControlStructure/NoUnneededCurlyBracesFixerTest.php

@@ -33,17 +33,18 @@ final class NoUnneededCurlyBracesFixerTest extends AbstractFixerTestCase
 
     public static function provideFixCases(): iterable
     {
-        yield from [
-            'simple sample, last token candidate' => [
-                '<?php  echo 1;',
-                '<?php { echo 1;}',
-            ],
-            'minimal sample, first token candidate' => [
-                '<?php  // {}',
-                '<?php {} // {}',
-            ],
-            [
-                '<?php
+        yield 'simple sample, last token candidate' => [
+            '<?php  echo 1;',
+            '<?php { echo 1;}',
+        ];
+
+        yield 'minimal sample, first token candidate' => [
+            '<?php  // {}',
+            '<?php {} // {}',
+        ];
+
+        yield [
+            '<?php
                       echo 0;   //
                     echo 1;
                     switch($a) {
@@ -51,7 +52,7 @@ final class NoUnneededCurlyBracesFixerTest extends AbstractFixerTestCase
                     }
                     echo 4;  echo 5; //
                 ',
-                '<?php
+            '<?php
                     { { echo 0; } } //
                     {echo 1;}
                     switch($a) {
@@ -59,9 +60,10 @@ final class NoUnneededCurlyBracesFixerTest extends AbstractFixerTestCase
                     }
                     echo 4; { echo 5; }//
                 ',
-            ],
-            'no fixes' => [
-                '<?php
+        ];
+
+        yield 'no fixes' => [
+            '<?php
                     foreach($a as $b){}
                     while($a){}
                     do {} while($a);
@@ -80,16 +82,18 @@ final class NoUnneededCurlyBracesFixerTest extends AbstractFixerTestCase
                     interface D {}
                     trait E {}
                 ',
-            ],
-            'no fixes II' => [
-                '<?php
+        ];
+
+        yield 'no fixes II' => [
+            '<?php
                 declare(ticks=1) {
                 // entire script here
                 }
                 #',
-            ],
-            'no fix catch/try/finally' => [
-                '<?php
+        ];
+
+        yield 'no fix catch/try/finally' => [
+            '<?php
                     try {
 
                     } catch(\Exception $e) {
@@ -98,9 +102,10 @@ final class NoUnneededCurlyBracesFixerTest extends AbstractFixerTestCase
 
                     }
                 ',
-            ],
-            'no fix namespace block' => [
-                '<?php
+        ];
+
+        yield 'no fix namespace block' => [
+            '<?php
                     namespace {
                     }
                     namespace A {
@@ -108,7 +113,6 @@ final class NoUnneededCurlyBracesFixerTest extends AbstractFixerTestCase
                     namespace A\B {
                     }
                 ',
-            ],
         ];
 
         yield 'provideNoFix7Cases' => [