add PHP Rectors to own groups

composer.json

@@ -179,8 +179,8 @@
             "packages/PhpParser/tests/Rector/SetLineRector/Wrong",
             "packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/Wrong",
             "packages/Sensio/tests/Rector/FrameworkExtraBundle/TemplateAnnotationRector/Wrong",
-            "packages/Php/tests/Rector/TypedPropertyRector/Wrong",
-            "packages/Php/tests/Rector/ExceptionHandlerTypehintRector/Wrong"
+            "packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong",
+            "packages/Php/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Wrong"
         ],
         "files": [
             "tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Source/exceptions.php",

config/level/php/php74.yml

@@ -1,2 +1,2 @@
 services:
-    Rector\Php\Rector\TypedPropertyRector: ~
+    Rector\Php\Rector\Property\TypedPropertyRector: ~

packages/Php/src/Rector/BinaryOp/IsCountableRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\BinaryOp;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;

packages/Php/src/Rector/BinaryOp/IsIterableRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\BinaryOp;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;

packages/Php/src/Rector/ClassConst/PublicConstantVisibilityRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\ClassConst;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;

packages/Php/src/Rector/FuncCall/PowToExpRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\FuncCall;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Pow;

packages/Php/src/Rector/FuncCall/RandomFunctionRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\FuncCall;
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;

packages/Php/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\FunctionLike;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;

packages/Php/src/Rector/Property/TypedPropertyRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\Property;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;

packages/Php/src/Rector/Ternary/TernaryToNullCoalescingRector.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector;
+namespace Rector\Php\Rector\Ternary;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Coalesce;

packages/Php/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\IsCountableRector;
+namespace Rector\Php\Tests\Rector\BinaryOp\IsCountableRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\IsCountableRector
+ * @covers \Rector\Php\Rector\BinaryOp\IsCountableRector
  */
 final class IsCountableRectorTest extends AbstractRectorTestCase
 {

packages/Php/tests/Rector/BinaryOp/IsCountableRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\BinaryOp\IsCountableRector: ~

packages/Php/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\IsIterableRector;
+namespace Rector\Php\Tests\Rector\BinaryOp\IsIterableRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\IsIterableRector
+ * @covers \Rector\Php\Rector\BinaryOp\IsIterableRector
  */
 final class IsIterableRectorTest extends AbstractRectorTestCase
 {

packages/Php/tests/Rector/BinaryOp/IsIterableRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\BinaryOp\IsIterableRector: ~

packages/Php/tests/Rector/ClassConst/PublicConstantVisibilityRector/Correct/correct.php.inc

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\PublicConstantVisibilityRector\Wrong;
+namespace Rector\Php\Tests\Rector\ClassConst\PublicConstantVisibilityRector\Wrong;
 
 final class SomeClass
 {

packages/Php/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\PublicConstantVisibilityRector;
+namespace Rector\Php\Tests\Rector\ClassConst\PublicConstantVisibilityRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\PublicConstantVisibilityRector
+ * @covers \Rector\Php\Rector\ClassConst\PublicConstantVisibilityRector
  */
 final class PublicConstantVisibilityRectorTest extends AbstractRectorTestCase
 {

packages/Php/tests/Rector/ClassConst/PublicConstantVisibilityRector/Wrong/SomeClass.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\PublicConstantVisibilityRector\Wrong;
+namespace Rector\Php\Tests\Rector\ClassConst\PublicConstantVisibilityRector\Wrong;
 
 final class SomeClass
 {

packages/Php/tests/Rector/ClassConst/PublicConstantVisibilityRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\ClassConst\PublicConstantVisibilityRector: ~

packages/Php/tests/Rector/ExceptionHandlerTypehintRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\ExceptionHandlerTypehintRector: ~

packages/Php/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\PowToExpRector;
+namespace Rector\Php\Tests\Rector\FuncCall\PowToExpRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\PowToExpRector
+ * @covers \Rector\Php\Rector\FuncCall\PowToExpRector
  *
  * Some tests copied from:
  * - https://github.com/FriendsOfPHP/PHP-CS-Fixer/commit/14660432d9d0b66bf65135d793b52872cc6eccbc#diff-b412676c923661ef450f4a0903c5442a

packages/Php/tests/Rector/FuncCall/PowToExpRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\FuncCall\PowToExpRector: ~

packages/Php/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\RandomFunctionRector;
+namespace Rector\Php\Tests\Rector\FuncCall\RandomFunctionRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\RandomFunctionRector
+ * @covers \Rector\Php\Rector\FuncCall\RandomFunctionRector
  *
  * Some tests copied from https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.12/tests/Fixer/Alias/RandomApiMigrationFixerTest.php
  */

packages/Php/tests/Rector/FuncCall/RandomFunctionRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\FuncCall\RandomFunctionRector: ~

packages/Php/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\ExceptionHandlerTypehintRector;
+namespace Rector\Php\Tests\Rector\FunctionLike\ExceptionHandlerTypehintRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\ExceptionHandlerTypehintRector
+ * @covers \Rector\Php\Rector\FunctionLike\ExceptionHandlerTypehintRector
  */
 final class ExceptionHandlerTypehintRectorTest extends AbstractRectorTestCase
 {

packages/Php/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\FunctionLike\ExceptionHandlerTypehintRector: ~

packages/Php/tests/Rector/IsCountableRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\IsCountableRector: ~

packages/Php/tests/Rector/IsIterableRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\IsIterableRector: ~

packages/Php/tests/Rector/PowToExpRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\PowToExpRector: ~

packages/Php/tests/Rector/Property/TypedPropertyRector/Correct/correct.php.inc

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
 final class ClassWithProperty
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Correct/correct2.php.inc

@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
+
+use Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source\AnotherClass;
+
+final class ClassWithClassProperty
+{
+    private AnotherClass $anotherClass;
+}

packages/Php/tests/Rector/Property/TypedPropertyRector/Correct/correct3.php.inc

@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
-use Rector\Php\Tests\Rector\TypedPropertyRector\Source\AnotherClass;
+use Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source\AnotherClass;
 
 final class ClassWithNullableProperty
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Correct/correct4.php.inc

@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
+
+use Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source\AnotherClass;
+
+final class ClassWithStaticProperty
+{
+    private static iterable $iterable;
+}

packages/Php/tests/Rector/Property/TypedPropertyRector/Correct/correct5.php.inc

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
 final class DefaultValues
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Correct/correct6.php.inc

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
 final class MatchTypes
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Source/AnotherClass.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source;
+
+final class AnotherClass
+{
+
+}

packages/Php/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\TypedPropertyRector
+ * @covers \Rector\Php\Rector\Property\TypedPropertyRector
  */
 final class TypedPropertyRectorTest extends AbstractRectorTestCase
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong/ClassWithClassProperty.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
+
+use Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source\AnotherClass;
+
+final class ClassWithClassProperty
+{
+    /**
+     * @var AnotherClass
+     */
+    private $anotherClass;
+}

packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong/ClassWithNullableProperty.php

@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
-use Rector\Php\Tests\Rector\TypedPropertyRector\Source\AnotherClass;
+use Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source\AnotherClass;
 
 final class ClassWithNullableProperty
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong/ClassWithProperty.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
 final class ClassWithProperty
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong/ClassWithStaticProperty.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
+
+use Rector\Php\Tests\Rector\Property\TypedPropertyRector\Source\AnotherClass;
+
+final class ClassWithStaticProperty
+{
+    /**
+     * @var iterable
+     */
+    private static $iterable;
+}

packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong/DefaultValues.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
 final class DefaultValues
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/Wrong/MatchTypes.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
+namespace Rector\Php\Tests\Rector\Property\TypedPropertyRector\Wrong;
 
 final class MatchTypes
 {

packages/Php/tests/Rector/Property/TypedPropertyRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\Property\TypedPropertyRector: ~

packages/Php/tests/Rector/PublicConstantVisibilityRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\PublicConstantVisibilityRector: ~

packages/Php/tests/Rector/RandomFunctionRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\RandomFunctionRector: ~

packages/Php/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\TernaryToNullCoalescingRector;
+namespace Rector\Php\Tests\Rector\Ternary\TernaryToNullCoalescingRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\TernaryToNullCoalescingRector
+ * @covers \Rector\Php\Rector\Ternary\TernaryToNullCoalescingRector
  *
  * Some tests copied from:
  * https://github.com/FriendsOfPHP/PHP-CS-Fixer/commit/0db4f91088a3888a7c8b26e5a36fba53c0d9507c#diff-02f477b178d0dc5b25ac05ab3b59e7c7

packages/Php/tests/Rector/Ternary/TernaryToNullCoalescingRector/config.yml

@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\Ternary\TernaryToNullCoalescingRector: ~

packages/Php/tests/Rector/TernaryToNullCoalescingRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\TernaryToNullCoalescingRector: ~

packages/Php/tests/Rector/TypedPropertyRector/Correct/correct2.php.inc

@@ -1,10 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
-
-use Rector\Php\Tests\Rector\TypedPropertyRector\Source\AnotherClass;
-
-final class ClassWithClassProperty
-{
-    private AnotherClass $anotherClass;
-}

packages/Php/tests/Rector/TypedPropertyRector/Correct/correct4.php.inc

@@ -1,10 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
-
-use Rector\Php\Tests\Rector\TypedPropertyRector\Source\AnotherClass;
-
-final class ClassWithStaticProperty
-{
-    private static iterable $iterable;
-}

packages/Php/tests/Rector/TypedPropertyRector/Source/AnotherClass.php

@@ -1,8 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Source;
-
-final class AnotherClass
-{
-
-}

packages/Php/tests/Rector/TypedPropertyRector/Wrong/ClassWithClassProperty.php

@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
-
-use Rector\Php\Tests\Rector\TypedPropertyRector\Source\AnotherClass;
-
-final class ClassWithClassProperty
-{
-    /**
-     * @var AnotherClass
-     */
-    private $anotherClass;
-}

packages/Php/tests/Rector/TypedPropertyRector/Wrong/ClassWithStaticProperty.php

@@ -1,13 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Php\Tests\Rector\TypedPropertyRector\Wrong;
-
-use Rector\Php\Tests\Rector\TypedPropertyRector\Source\AnotherClass;
-
-final class ClassWithStaticProperty
-{
-    /**
-     * @var iterable
-     */
-    private static $iterable;
-}

packages/Php/tests/Rector/TypedPropertyRector/config.yml

@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\TypedPropertyRector: ~

src/Printer/BetterStandardPrinter.php

@@ -7,7 +7,7 @@ use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\PrettyPrinter\Standard;
 use Rector\NodeTypeResolver\Node\Attribute;
-use Rector\Php\Rector\TypedPropertyRector;
+use Rector\Php\Rector\Property\TypedPropertyRector;
 use function Safe\sprintf;
 
 final class BetterStandardPrinter extends Standard