Updated Rector to commit f2be385b38e514ea3d702aa4cd0f08cf98305703

rectorphp/rector-src@f2be385 [Php81] Deprecate NewInInitializerRector as depends on context (#7913)

Author: TomasVotruba

config/set/php81.php

@@ -11,7 +11,6 @@
 use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
 use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
 use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
-use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictIntPregSlitFuncCallLimitArgRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector;
@@ -38,6 +37,5 @@
         ClosureFromCallableToFirstClassCallableRector::class,
         FunctionFirstClassCallableRector::class,
         RemoveReflectionSetAccessibleCallsRector::class,
-        NewInInitializerRector::class,
     ]);
 };

rules/Php81/NodeAnalyzer/CoalescePropertyAssignMatcher.php

@@ -4,52 +4,16 @@
 namespace Rector\Php81\Rector\ClassMethod;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\BinaryOp\Coalesce;
-use PhpParser\Node\NullableType;
-use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\Node\Stmt\Property;
-use PHPStan\Reflection\ClassReflection;
-use Rector\FamilyTree\NodeAnalyzer\ClassChildAnalyzer;
-use Rector\NodeManipulator\StmtsManipulator;
-use Rector\Php81\NodeAnalyzer\CoalescePropertyAssignMatcher;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
 use Rector\Rector\AbstractRector;
-use Rector\Reflection\ReflectionResolver;
-use Rector\ValueObject\MethodName;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-/**
- * @see \Rector\Tests\Php81\Rector\ClassMethod\NewInInitializerRector\NewInInitializerRectorTest
- */
-final class NewInInitializerRector extends AbstractRector implements MinPhpVersionInterface
+final class NewInInitializerRector extends AbstractRector implements MinPhpVersionInterface, DeprecatedInterface
 {
-    /**
-     * @readonly
-     */
-    private ReflectionResolver $reflectionResolver;
-    /**
-     * @readonly
-     */
-    private ClassChildAnalyzer $classChildAnalyzer;
-    /**
-     * @readonly
-     */
-    private CoalescePropertyAssignMatcher $coalescePropertyAssignMatcher;
-    /**
-     * @readonly
-     */
-    private StmtsManipulator $stmtsManipulator;
-    public function __construct(ReflectionResolver $reflectionResolver, ClassChildAnalyzer $classChildAnalyzer, CoalescePropertyAssignMatcher $coalescePropertyAssignMatcher, StmtsManipulator $stmtsManipulator)
-    {
-        $this->reflectionResolver = $reflectionResolver;
-        $this->classChildAnalyzer = $classChildAnalyzer;
-        $this->coalescePropertyAssignMatcher = $coalescePropertyAssignMatcher;
-        $this->stmtsManipulator = $stmtsManipulator;
-    }
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition('Replace property declaration of new state with direct new', [new CodeSample(<<<'CODE_SAMPLE'
@@ -87,112 +51,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($this->shouldSkipClass($node)) {
-            return null;
-        }
-        $constructClassMethod = $node->getMethod(MethodName::CONSTRUCT);
-        if (!$constructClassMethod instanceof ClassMethod) {
-            return null;
-        }
-        $params = $this->resolveParams($constructClassMethod);
-        if ($params === []) {
-            return null;
-        }
-        $hasChanged = \false;
-        foreach ((array) $constructClassMethod->stmts as $key => $stmt) {
-            foreach ($params as $param) {
-                $paramName = $this->getName($param);
-                if ($param->type instanceof NullableType && $param->default === null) {
-                    continue;
-                }
-                $coalesce = $this->coalescePropertyAssignMatcher->matchCoalesceAssignsToLocalPropertyNamed($stmt, $paramName);
-                if (!$coalesce instanceof Coalesce) {
-                    continue;
-                }
-                if ($this->stmtsManipulator->isVariableUsedInNextStmt($constructClassMethod, $key + 1, $paramName)) {
-                    continue;
-                }
-                $param->default = $coalesce->right;
-                unset($constructClassMethod->stmts[$key]);
-                $this->processPropertyPromotion($node, $param, $paramName);
-                $hasChanged = \true;
-            }
-        }
-        if ($hasChanged) {
-            return $node;
-        }
-        return null;
+        throw new ShouldNotHappenException(sprintf('"%s" is deprecated as depends on context. Cannot be automated. Use manually where needed instead', self::class));
     }
     public function provideMinPhpVersion(): int
     {
         return PhpVersionFeature::NEW_INITIALIZERS;
     }
-    /**
-     * @return Param[]
-     */
-    private function resolveParams(ClassMethod $classMethod): array
-    {
-        $params = $this->matchConstructorParams($classMethod);
-        if ($params === []) {
-            return [];
-        }
-        if ($this->isOverrideAbstractMethod($classMethod)) {
-            return [];
-        }
-        return $params;
-    }
-    private function isOverrideAbstractMethod(ClassMethod $classMethod): bool
-    {
-        $classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
-        $methodName = $this->getName($classMethod);
-        return $classReflection instanceof ClassReflection && $this->classChildAnalyzer->hasAbstractParentClassMethod($classReflection, $methodName);
-    }
-    private function processPropertyPromotion(Class_ $class, Param $param, string $paramName): void
-    {
-        foreach ($class->stmts as $key => $stmt) {
-            if (!$stmt instanceof Property) {
-                continue;
-            }
-            $property = $stmt;
-            if (!$this->isName($stmt, $paramName)) {
-                continue;
-            }
-            $param->flags = $property->flags;
-            $param->attrGroups = array_merge($property->attrGroups, $param->attrGroups);
-            unset($class->stmts[$key]);
-        }
-    }
-    /**
-     * @return Param[]
-     */
-    private function matchConstructorParams(ClassMethod $classMethod): array
-    {
-        // skip empty constructor assigns, as we need those here
-        if ($classMethod->stmts === null || $classMethod->stmts === []) {
-            return [];
-        }
-        $params = array_filter($classMethod->params, static fn(Param $param): bool => $param->type instanceof NullableType);
-        if ($params === []) {
-            return $params;
-        }
-        $totalParams = count($classMethod->params);
-        foreach (array_keys($params) as $key) {
-            for ($iteration = $key + 1; $iteration < $totalParams; ++$iteration) {
-                if (isset($classMethod->params[$iteration]) && !$classMethod->params[$iteration]->default instanceof Expr) {
-                    return [];
-                }
-            }
-        }
-        return $params;
-    }
-    private function shouldSkipClass(Class_ $class): bool
-    {
-        if ($class->stmts === []) {
-            return \true;
-        }
-        if ($class->isAbstract()) {
-            return \true;
-        }
-        return $class->isAnonymous();
-    }
 }

rules/Php81/NodeAnalyzer/ComplexNewAnalyzer.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '3e751eca2d58330e8528e12056172508fc314a4b';
+    public const PACKAGE_VERSION = 'f2be385b38e514ea3d702aa4cd0f08cf98305703';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-04-06 19:56:56';
+    public const RELEASE_DATE = '2026-04-07 18:30:39';
     /**
      * @var int
      */

rules/Php81/Rector/ClassMethod/NewInInitializerRector.php

@@ -8,10 +8,15 @@
 use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
+/**
+ * @api
+ */
 final class ClassChildAnalyzer
 {
     /**
      * Look both parent class and interface, yes, all PHP interface methods are abstract
+     *
+     * @api rector-symfony
      */
     public function hasAbstractParentClassMethod(ClassReflection $classReflection, string $methodName): bool
     {

src/Application/VersionResolver.php

@@ -2242,8 +2242,6 @@
     'Rector\\Php80\\ValueObject\\StrStartsWith' => $baseDir . '/rules/Php80/ValueObject/StrStartsWith.php',
     'Rector\\Php81\\Enum\\AttributeName' => $baseDir . '/rules/Php81/Enum/AttributeName.php',
     'Rector\\Php81\\Enum\\NameNullToStrictNullFunctionMap' => $baseDir . '/rules/Php81/Enum/NameNullToStrictNullFunctionMap.php',
-    'Rector\\Php81\\NodeAnalyzer\\CoalescePropertyAssignMatcher' => $baseDir . '/rules/Php81/NodeAnalyzer/CoalescePropertyAssignMatcher.php',
-    'Rector\\Php81\\NodeAnalyzer\\ComplexNewAnalyzer' => $baseDir . '/rules/Php81/NodeAnalyzer/ComplexNewAnalyzer.php',
     'Rector\\Php81\\NodeFactory\\EnumFactory' => $baseDir . '/rules/Php81/NodeFactory/EnumFactory.php',
     'Rector\\Php81\\NodeManipulator\\NullToStrictStringIntConverter' => $baseDir . '/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php',
     'Rector\\Php81\\Rector\\Array_\\ArrayToFirstClassCallableRector' => $baseDir . '/rules/Php81/Rector/Array_/ArrayToFirstClassCallableRector.php',

src/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php

@@ -2502,8 +2502,6 @@ class ComposerStaticInitc9819cb6f85619d8e1cbb4426044dd33
         'Rector\\Php80\\ValueObject\\StrStartsWith' => __DIR__ . '/../..' . '/rules/Php80/ValueObject/StrStartsWith.php',
         'Rector\\Php81\\Enum\\AttributeName' => __DIR__ . '/../..' . '/rules/Php81/Enum/AttributeName.php',
         'Rector\\Php81\\Enum\\NameNullToStrictNullFunctionMap' => __DIR__ . '/../..' . '/rules/Php81/Enum/NameNullToStrictNullFunctionMap.php',
-        'Rector\\Php81\\NodeAnalyzer\\CoalescePropertyAssignMatcher' => __DIR__ . '/../..' . '/rules/Php81/NodeAnalyzer/CoalescePropertyAssignMatcher.php',
-        'Rector\\Php81\\NodeAnalyzer\\ComplexNewAnalyzer' => __DIR__ . '/../..' . '/rules/Php81/NodeAnalyzer/ComplexNewAnalyzer.php',
         'Rector\\Php81\\NodeFactory\\EnumFactory' => __DIR__ . '/../..' . '/rules/Php81/NodeFactory/EnumFactory.php',
         'Rector\\Php81\\NodeManipulator\\NullToStrictStringIntConverter' => __DIR__ . '/../..' . '/rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php',
         'Rector\\Php81\\Rector\\Array_\\ArrayToFirstClassCallableRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/Array_/ArrayToFirstClassCallableRector.php',