[Downgrade] [PHP 8.0] Add DowngradeThrowExpressionRector

config/set/downgrade-php80.php

@@ -4,6 +4,7 @@
 
 use Rector\Downgrade\Rector\LNumber\ChangePhpVersionInPlatformCheckRector;
 use Rector\DowngradePhp80\Rector\Class_\DowngradePropertyPromotionToConstructorPropertyAssignRector;
+use Rector\DowngradePhp80\Rector\Class_\DowngradeThrowExpressionRector;
 use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeParamMixedTypeDeclarationRector;
 use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeReturnMixedTypeDeclarationRector;
 use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeReturnStaticTypeDeclarationRector;
@@ -24,4 +25,5 @@
         ChangePhpVersionInPlatformCheckRector::TARGET_PHP_VERSION => 80000,
     ]]);
     $services->set(DowngradePropertyPromotionToConstructorPropertyAssignRector::class);
+    $services->set(DowngradeThrowExpressionRector::class);
 };

config/set/nette-30-param-types.php

@@ -64,30 +64,10 @@
                 ),
                 new AddParamTypeDeclaration('Nette\ComponentModel\IComponent', 'setParent', 1, new StringType()),
                 new AddParamTypeDeclaration('Nette\ComponentModel\IContainer', 'getComponents', 0, new BooleanType()),
-                new AddParamTypeDeclaration(
-                    'Nette\Forms\Container',
-                    'addSelect',
-                    0,
-                    new StringType()
-                ),
-                new AddParamTypeDeclaration(
-                    'Nette\Forms\Container',
-                    'addSelect',
-                    3,
-                    new IntegerType()
-                ),
-                new AddParamTypeDeclaration(
-                    'Nette\Forms\Container',
-                    'addMultiSelect',
-                    0,
-                    new StringType()
-                ),
-                new AddParamTypeDeclaration(
-                    'Nette\Forms\Container',
-                    'addMultiSelect',
-                    3,
-                    new IntegerType()
-                ),
+                new AddParamTypeDeclaration('Nette\Forms\Container', 'addSelect', 0, new StringType()),
+                new AddParamTypeDeclaration('Nette\Forms\Container', 'addSelect', 3, new IntegerType()),
+                new AddParamTypeDeclaration('Nette\Forms\Container', 'addMultiSelect', 0, new StringType()),
+                new AddParamTypeDeclaration('Nette\Forms\Container', 'addMultiSelect', 3, new IntegerType()),
                 new AddParamTypeDeclaration(
                     'Nette\Forms\Rendering\DefaultFormRenderer',
                     'render',

config/set/nette-30-return-types.php

@@ -46,11 +46,7 @@
                     'addMultiSelect',
                     new ObjectType('Nette\Forms\Controls\MultiSelectBox')
                 ),
-                new AddReturnTypeDeclaration(
-                    'Nette\Forms\IFormRenderer',
-                    'render',
-                    new StringType()
-                ),
+                new AddReturnTypeDeclaration('Nette\Forms\IFormRenderer', 'render', new StringType()),
                 new AddReturnTypeDeclaration(
                     'Nette\Forms\Controls\TextBase',
                     'getControl',

config/set/nette-30.php

@@ -64,7 +64,7 @@
             # @see https://github.com/nette/di/commit/a0d361192f8ac35f1d9f82aab7eb351e4be395ea
             'Nette\DI\ServiceDefinition' => 'Nette\DI\Definitions\ServiceDefinition',
             'Nette\DI\Statement' => 'Nette\DI\Definitions\Statement',
-            'WebChemistry\Forms\Controls\Multiplier' => 'Contributte\FormMultiplier\Multiplier'
+            'WebChemistry\Forms\Controls\Multiplier' => 'Contributte\FormMultiplier\Multiplier',
         ],
     ]]);
     $services->set(ArgumentDefaultValueReplacerRector::class)->call('configure', [[

rules/downgrade-php80/src/Rector/Class_/DowngradeThrowExpressionRector.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\DowngradePhp80\Rector\Class_;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Class_;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see https://wiki.php.net/rfc/throw_expression
+ *
+ * @see \Rector\DowngradePhp80\Tests\Rector\Class_\DowngradeThrowExpressionRector\DowngradeThrowExpressionRectorTest
+ */
+final class DowngradeThrowExpressionRector extends AbstractRector
+{
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Change constructor property promotion to property asssign', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function __construct($nullableValue)
+    {
+        return $nullableValue ?? throw new InvalidArgumentException()
+    }
+}
+CODE_SAMPLE
+
+                ,
+                <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function __construct($nullableValue)
+    {
+        if ($nullableValue !== null) {
+            return $nullableValue;
+        }
+
+        throw new InvalidArgumentException()
+    }
+}
+CODE_SAMPLE
+
+            ),
+        ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [Class_::class];
+    }
+
+    /**
+     * @param Class_ $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        // change the node
+
+        return $node;
+    }
+}

rules/downgrade-php80/tests/Rector/Class_/DowngradeThrowExpressionRector/DowngradeThrowExpressionRectorTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\DowngradePhp80\Tests\Rector\Class_\DowngradeThrowExpressionRector;
+
+use Iterator;
+use Rector\DowngradePhp80\Rector\Class_\DowngradeThrowExpressionRector;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class DowngradeThrowExpressionRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    protected function getRectorClass(): string
+    {
+        return DowngradeThrowExpressionRector::class;
+    }
+}

rules/downgrade-php80/tests/Rector/Class_/DowngradeThrowExpressionRector/Fixture/fixture.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\DowngradePhp80\Tests\Rector\Class_\DowngradeThrowExpressionRector\Fixture;
+
+class SomeClass
+{
+    public function __construct($nullableValue)
+    {
+        return $nullableValue ?? throw new InvalidArgumentException()
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\DowngradePhp80\Tests\Rector\Class_\DowngradeThrowExpressionRector\Fixture;
+
+class SomeClass
+{
+    public function __construct($nullableValue)
+    {
+        if ($nullableValue !== null) {
+            return $nullableValue;
+        }
+
+        throw new InvalidArgumentException()
+    }
+}
+
+?>

rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture.php.inc

@@ -16,7 +16,7 @@ function ternaryToNullCoalescing()
 
     $x = (isset($a) ? $a : isset($b)) ? $b : "";
 
-    $x = isset($a) ? $a : isset($b) ? $b : isset($c) ? $c : "";
+    $x = ((isset($a) ? $a : isset($b)) ? $b : isset($c)) ? $c : "";
 }
 
 ?>
@@ -39,7 +39,7 @@ function ternaryToNullCoalescing()
 
     $x = ($a ?? isset($b)) ? $b : "";
 
-    $x = $a ?? isset($b) ? $b : isset($c) ? $c : "";
+    $x = (($a ?? isset($b)) ? $b : isset($c)) ? $c : "";
 }
 
 ?>