[Php81][Restoration] Handle crash on ReadOnlyPropertyRector+MakeTyped…

…PropertyNullableIfCheckedRector (#3046)

Co-authored-by: GitHub Action <action@github.com>

rules/Restoration/Rector/Property/MakeTypedPropertyNullableIfCheckedRector.php

@@ -16,6 +16,7 @@
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\PropertyProperty;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Privatization\NodeManipulator\VisibilityManipulator;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -24,6 +25,11 @@
  */
 final class MakeTypedPropertyNullableIfCheckedRector extends AbstractRector
 {
+    public function __construct(
+        private readonly VisibilityManipulator $visibilityManipulator
+    ) {
+    }
+
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition('Make typed property nullable if checked', [
@@ -101,6 +107,10 @@ public function refactor(Node $node): ?Node
         $node->type = new NullableType($currentPropertyType);
         $onlyProperty->default = $this->nodeFactory->createNull();
 
+        if ($node->isReadonly()) {
+            $this->visibilityManipulator->removeReadonly($node);
+        }
+
         return $node;
     }
 

tests/Issues/IssueReadonlyPropertyNullable/Fixture/fixture.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Core\Tests\Issues\IssueReadonlyPropertyNullable\Fixture;
+
+final class SomeClass
+{
+    private AnotherClass $anotherClass;
+
+    public function run()
+    {
+        if ($this->anotherClass === null) {
+            return null;
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Core\Tests\Issues\IssueReadonlyPropertyNullable\Fixture;
+
+final class SomeClass
+{
+    private ?AnotherClass $anotherClass = null;
+
+    public function run()
+    {
+        if ($this->anotherClass === null) {
+            return null;
+        }
+    }
+}
+
+?>

tests/Issues/IssueReadonlyPropertyNullable/IssueReadonlyPropertyNullableTest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueReadonlyPropertyNullable;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+/**
+ * @see https://github.com/rectorphp/rector/issues/7590
+ */
+final class IssueReadonlyPropertyNullableTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    /**
+     * @return Iterator<array<string>>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

tests/Issues/IssueReadonlyPropertyNullable/config/configured_rule.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+use Rector\Restoration\Rector\Property\MakeTypedPropertyNullableIfCheckedRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ReadOnlyPropertyRector::class);
+    $rectorConfig->rule(MakeTypedPropertyNullableIfCheckedRector::class);
+};