[PHP 8.0] Add downgrade for str_starts_with() (#126)

composer.json

@@ -56,7 +56,7 @@
         "phpstan/phpstan-nette": "^0.12.18",
         "phpunit/phpunit": "^9.5",
         "rector/rector-generator": "^0.1.7",
-        "rector/phpstan-rules": "^0.2.8",
+        "rector/phpstan-rules": "^0.3",
         "symplify/coding-standard": "^9.3.10",
         "symplify/easy-ci": "^9.3.10",
         "symplify/easy-coding-standard": "^9.3.10",

config/set/downgrade-php80.php

@@ -42,5 +42,6 @@
     $services->set(DowngradeClassOnObjectToGetClassRector::class);
     $services->set(DowngradeNullsafeToTernaryOperatorRector::class);
     $services->set(DowngradeTrailingCommasInParamUseRector::class);
-    $services->set(\Rector\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector::class);
+    $services->set(\Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector::class);
+    $services->set(\Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector::class);
 };

packages-tests/NodeTypeResolver/PerNodeTypeResolver/ClassAndInterfaceTypeResolver/ClassTypeResolverTest.php

@@ -47,15 +47,14 @@ public function dataProvider(): Iterator
 
         yield [__DIR__ . '/Source/ClassWithParentTrait.php', 0, new ObjectType(ClassWithParentTrait::class)];
     }
-    
+
     public function testAnonymousClass(): void
     {
         $file = __DIR__ . '/Source/AnonymousClass.php';
-        $nodePosition = 0;
-
+
         $variableNodes = $this->getNodesForFileOfType($file, Class_::class);
 
-        $resolvedType = $this->nodeTypeResolver->resolve($variableNodes[$nodePosition]);
+        $resolvedType = $this->nodeTypeResolver->resolve($variableNodes[0]);
         $this->assertInstanceOf(TypeWithClassName::class, $resolvedType);
 
         /** @var TypeWithClassName $resolvedType */

packages/Comments/CommentRemover.php

@@ -21,10 +21,9 @@ public function __construct(
     }
 
     /**
-     * @param Node[]|Node|null $node
      * @return Node[]|null
      */
-    public function removeFromNode($node): ?array
+    public function removeFromNode(array | Node | null $node): array | null
     {
         if ($node === null) {
             return null;

packages/NodeRemoval/NodeRemover.php

@@ -39,13 +39,12 @@ public function removeNode(Node $node): void
         $this->rectorChangeCollector->notifyNodeFileInfo($node);
     }
 
-    /**
-     * @param Class_|ClassMethod|Function_ $nodeWithStatements
-     */
-    public function removeNodeFromStatements(Node $nodeWithStatements, Node $nodeToRemove): void
-    {
+    public function removeNodeFromStatements(
+        Class_ | ClassMethod | Function_ $nodeWithStatements,
+        Node $toBeRemovedNode
+    ): void {
         foreach ((array) $nodeWithStatements->stmts as $key => $stmt) {
-            if ($nodeToRemove !== $stmt) {
+            if ($toBeRemovedNode !== $stmt) {
                 continue;
             }
 

packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -7,7 +7,6 @@
 use Nette\Utils\Strings;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Trait_;
 use PhpParser\NodeTraverser;
@@ -121,10 +120,7 @@ private function removeDeepChainMethodCallNodes(array $nodes): void
         $nodeTraverser->traverse($nodes);
     }
 
-    /**
-     * @param Class_|Interface_ $classLike
-     */
-    private function resolveClassOrInterfaceScope(ClassLike $classLike, Scope $scope): Scope
+    private function resolveClassOrInterfaceScope(Class_ | Interface_ $classLike, Scope $scope): Scope
     {
         $className = $this->resolveClassName($classLike);
 
@@ -172,10 +168,7 @@ private function reportCacheDebugAndSaveDependentFiles(SmartFileInfo $smartFileI
         $this->changedFilesDetector->addFileWithDependencies($smartFileInfo, $dependentFiles);
     }
 
-    /**
-     * @param Class_|Interface_|Trait_ $classLike
-     */
-    private function resolveClassName(ClassLike $classLike): string
+    private function resolveClassName(Class_ | Interface_ | Trait_ $classLike): string
     {
         if (property_exists($classLike, 'namespacedName')) {
             return (string) $classLike->namespacedName;

packages/PHPStanStaticTypeMapper/PHPStanStaticTypeMapper.php

@@ -4,10 +4,9 @@
 
 namespace Rector\PHPStanStaticTypeMapper;
 
-use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\Node\NullableType;
-use PhpParser\Node\UnionType as PhpParserUnionType;
+use PhpParser\Node\UnionType;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Type;
 use Rector\Core\Exception\NotImplementedYetException;
@@ -36,11 +35,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
         throw new NotImplementedYetException(__METHOD__ . ' for ' . get_class($type));
     }
 
-    /**
-     * @return Name|NullableType|PhpParserUnionType|null
-     */
-    public function mapToPhpParserNode(Type $type, ?string $kind = null): ?Node
-    {
+    public function mapToPhpParserNode(Type $type, ?string $kind = null): Name | NullableType | UnionType | null {
         foreach ($this->typeMappers as $typeMapper) {
             if (! is_a($type, $typeMapper->getNodeClass(), true)) {
                 continue;

packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php

@@ -144,10 +144,7 @@ private function shouldSkipIterable(UnionType $unionType): bool
         return $unionTypeAnalysis->hasArray();
     }
 
-    /**
-     * @return Name|NullableType|null
-     */
-    private function matchArrayTypes(UnionType $unionType): ?Node
+    private function matchArrayTypes(UnionType $unionType): Name | NullableType | null
     {
         $unionTypeAnalysis = $this->unionTypeAnalyzer->analyseForNullableAndIterable($unionType);
         if (! $unionTypeAnalysis instanceof UnionTypeAnalysis) {

phpstan.neon

@@ -487,3 +487,9 @@ parameters:
         -
             message: '#Use separate function calls with readable variable names#'
             path: 'src/FileSystem/PhpFilesFinder.php'
+
+        # union false positive
+        - '#Method Rector\\Comments\\CommentRemover\:\:removeFromNode\(\) has parameter \$node with no value type specified in iterable type array#'
+
+        # should be refactored to collector
+        - '#Cognitive complexity for "Rector\\CodingStyle\\Naming\\NameRenamer\:\:renameNameNode\(\)" is 10, keep it under 9#'

rules-tests/CodingStyle/Rector/Use_/RemoveUnusedAliasRector/Fixture/used_union_type.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\RemoveUnusedAliasRector\Fixture;
+
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\UnionType as PhpParserUnionType;
+
+final class UsedUnionType
+{
+    public function param(String_ | PhpParserUnionType $node)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\Use_\RemoveUnusedAliasRector\Fixture;
+
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\UnionType;
+
+final class UsedUnionType
+{
+    public function param(String_ | UnionType $node)
+    {
+    }
+}
+
+?>

rules-tests/Defluent/Rector/MethodCall/InArgChainFluentMethodCallToStandaloneMethodCallRectorTest/Source/SetGetDateTime.php

@@ -4,14 +4,12 @@
 
 namespace Rector\Tests\Defluent\Rector\MethodCall\InArgChainFluentMethodCallToStandaloneMethodCallRectorTest\Source;
 
+use Cassandra\Date;
 use Nette\Utils\DateTime;
 
 final class SetGetDateTime
 {
-    /**
-     * @var DateTime|null
-     */
-    private $dateMin = null;
+    private ?DateTime $dateMin = null;
 
     public function setDateMin(?DateTime $dateTime = null)
     {

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/DowngradeStrEndsWithRectorTest.php

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

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/Fixture/not_identical_downgrade_str_ends.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector\Fixture;
+
+! str_ends_with($haystack, $needle);
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector\Fixture;
+
+substr_compare($haystack, $needle, -strlen($needle)) !== 0;
+
+?>

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/Fixture/some_class.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector\Fixture;
+
+str_ends_with($haystack, $needle);
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector\Fixture;
+
+substr_compare($haystack, $needle, -strlen($needle)) === 0;
+
+?>

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector/config/configured_rule.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrEndsWithRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(DowngradeStrEndsWithRector::class);
+};

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/DowngradeStrStartsWithRectorTest.php

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

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/Fixture/not_compare.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector\Fixture;
+
+return ! str_starts_with($haystack, $needle);
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector\Fixture;
+
+return strncmp($haystack, $needle, strlen($needle)) !== 0;
+
+?>

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/Fixture/some_class.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector\Fixture;
+
+str_starts_with($haystack, $needle);
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector\Fixture;
+
+strncmp($haystack, $needle, strlen($needle)) === 0;
+
+?>

rules-tests/DowngradePhp80/Rector/FuncCall/DowngradeStrStartsWithRector/config/configured_rule.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\DowngradePhp80\Rector\FuncCall\DowngradeStrStartsWithRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(DowngradeStrStartsWithRector::class);
+};

rules-tests/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector/Fixture/not_identical.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector\Fixture;
 
-class NotIdentical
+final class SomeNotIdentical
 {
     public function canDrive(Car $newCar)
     {
@@ -22,7 +22,7 @@ class NotIdentical
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector\Fixture;
 
-class NotIdentical
+final class SomeNotIdentical
 {
     public function canDrive(Car $newCar)
     {

rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php

@@ -159,11 +159,10 @@ private function isObjectTypeMatch(Node $node, ObjectType $objectType): bool
         return $this->isObjectType($classLike, $objectType);
     }
 
-    /**
-     * @param ClassMethod|MethodCall|StaticCall $node
-     */
-    private function processPositionWithDefaultValues(Node $node, ArgumentAdder $argumentAdder): void
-    {
+    private function processPositionWithDefaultValues(
+        ClassMethod | MethodCall | StaticCall $node,
+        ArgumentAdder $argumentAdder
+    ): void {
         if ($this->shouldSkipParameter($node, $argumentAdder)) {
             return;
         }

rules/CodingStyle/Naming/ClassNaming.php

@@ -30,10 +30,7 @@ public function getVariableName($name): string
         return lcfirst($shortName);
     }
 
-    /**
-     * @param string|Name|Identifier|ClassLike $name
-     */
-    public function getShortName($name): string
+    public function getShortName(string | Name | Identifier | ClassLike $name): string
     {
         if ($name instanceof ClassLike) {
             if ($name->name === null) {