fix class-string compare

rectorphp · Dec 12, 2024 · edba118 · edba118
1 parent e07c5f9
commit edba118
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 82 deletions.
diff --git a/composer.json b/composer.json
@@ -50,37 +50,17 @@
         "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^11.5",
         "rector/release-notes-generator": "^0.3.0",
-<<<<<<< HEAD
-<<<<<<< HEAD
         "rector/swiss-knife": "^2.0",
-=======
-<<<<<<< HEAD
-        "rector/swiss-knife": "^0.2.16",
->>>>>>> 7745041b3b (restore dev static analysis tools)
         "rector/type-perfect": "^2.0",
         "shipmonk/composer-dependency-analyser": "^1.8",
         "symplify/easy-coding-standard": "^12.5",
         "symplify/phpstan-extensions": "^12.0",
-<<<<<<< HEAD
-        "symplify/phpstan-rules": "^14.0",
         "symplify/rule-doc-generator": "^12.2.5",
         "symplify/vendor-patches": "^11.3",
         "tomasvotruba/class-leak": "^2.0",
-=======
-=======
-        "rector/type-perfect": "^2.0",
->>>>>>> d8ba100b89 (bump deps)
         "symplify/phpstan-rules": "^14.0.2",
-        "rector/swiss-knife": "^2.0",
-        "shipmonk/composer-dependency-analyser": "^1.8",
-        "symplify/easy-coding-standard": "^12.4",
-        "symplify/phpstan-extensions": "^12.0",
-        "symplify/rule-doc-generator": "^12.2",
-        "symplify/vendor-patches": "^11.3",
-        "tomasvotruba/class-leak": "^2.0",
         "tomasvotruba/type-coverage": "^2.0",
         "tomasvotruba/unused-public": "^2.0",
->>>>>>> 7745041b3b (restore dev static analysis tools)
         "tracy/tracy": "^2.9"
     },
     "replace": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -5,20 +5,7 @@ includes:
 parameters:
     level: 8
     errorFormat: symplify
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 4e3ac08b3c (fix few reported static errors)
-    reportUnmatchedIgnoredErrors: false
-    errorFormat: symplify
-=======
-    # reportUnmatchedIgnoredErrors: false
->>>>>>> 7a1a2b4658 (cleanup fixed phpstan errors)
-=======
     reportUnmatchedIgnoredErrors: false
->>>>>>> 95bce6d377 (use config param to set error format)
 
     # requires exact closure types
     checkMissingCallableSignature: true
@@ -323,7 +310,6 @@ parameters:
         - '#Method Rector\\.*::providePolyfillPackage\(\) never returns#'
         - '#Method Rector\\.*::filterPolyfillPackages\(\) should return array\<#'
 
-<<<<<<< HEAD
         -
             identifier: typePerfect.noMixedMethodCaller
             paths:
@@ -332,14 +318,11 @@ parameters:
         -
             path: src/NodeTypeResolver/PHPStan/Type/TypeFactory.php
             message: '#Method Rector\\NodeTypeResolver\\PHPStan\\Type\\TypeFactory\:\:uniquateTypes\(\) should return array<TType of PHPStan\\Type\\Type> but returns list<PHPStan\\Type\\Type>#'
-=======
+
         # collection of Type
         -
             message: '#Method Rector\\NodeTypeResolver\\PHPStan\\Type\\TypeFactory::uniquateTypes\(\) should return array\<TType of PHPStan\\Type\\Type\> but returns list\<PHPStan\\Type\\Type>#'
             path: src/NodeTypeResolver/PHPStan/Type/TypeFactory.php
-<<<<<<< HEAD
->>>>>>> 7a1a2b4658 (cleanup fixed phpstan errors)
-=======
 
         # known native PHP type
         -
@@ -355,12 +338,7 @@ parameters:
         -
             message: '#Possibly invalid array key type array<mixed>\|PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprNode\|Rector\\BetterPhpDocParser\\PhpDoc\\DoctrineAnnotationTagValueNode\|Rector\\BetterPhpDocParser\\PhpDoc\\StringNode\|Rector\\BetterPhpDocParser\\ValueObject\\PhpDoc\\DoctrineAnnotation\\CurlyListNode\|string#'
             path: src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php
-<<<<<<< HEAD
->>>>>>> 4e3ac08b3c (fix few reported static errors)
-=======
 
         # overly detailed
         - '#expects (non\-empty\-string|class-string), string given#'
         - '#expects list<(.*?)>, array<(.*?)> given#'
-
->>>>>>> e70cfd86c4 (add few static fixes)
diff --git a/rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_const_fetch_arg.php b/rules-tests/Php81/Rector/ClassMethod/NewInInitializerRector/Fixture/pass_const_fetch_arg.php
diff --git a/rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php b/rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php
@@ -148,16 +148,13 @@ private function shouldSkipFromVariable(Expr $expr): bool
 
     private function shouldSkipExpr(Expr $expr): bool
     {
-        return (bool) $this->betterNodeFinder->findInstancesOf(
-            $expr,
-            [
-                PropertyFetch::class,
-                StaticPropertyFetch::class,
-                ArrayDimFetch::class,
-                MethodCall::class,
-                StaticCall::class,
-            ]
-        );
+        return (bool) $this->betterNodeFinder->findInstancesOf($expr, [
+            PropertyFetch::class,
+            StaticPropertyFetch::class,
+            ArrayDimFetch::class,
+            MethodCall::class,
+            StaticCall::class,
+        ]);
     }
 
     private function refactorIfWithBooleanAnd(If_ $if): ?If_

diff --git a/rules/TypeDeclaration/TypeInferer/SplArrayFixedTypeNarrower.php b/rules/TypeDeclaration/TypeInferer/SplArrayFixedTypeNarrower.php
@@ -30,9 +30,7 @@ public function narrow(Type $paramType): Type
 
         if ($className === 'PhpCsFixer\Tokenizer\Tokens') {
             $types[] = new ObjectType('PhpCsFixer\Tokenizer\Token');
-        }
-
-        if ($className === 'PhpCsFixer\Doctrine\Annotation\Tokens') {
+        } elseif ($className === 'PhpCsFixer\Doctrine\Annotation\Tokens') {
             $types[] = new ObjectType('PhpCsFixer\Doctrine\Annotation\Token');
         }
 

diff --git a/src/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php b/src/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php
@@ -74,7 +74,11 @@ public function enterNode(Node $node): ?Node
 
         foreach ($this->oldToNewTypes as $oldToNewType) {
             $oldType = $oldToNewType->getOldType();
-            if (! $oldType instanceof ObjectType || ! $objectType->equals($oldType)) {
+            //            if (! $oldType instanceof ObjectType) {
+            //                continue;
+            //            }
+
+            if ($objectType->equals($oldType)) {
                 continue;
             }
 

diff --git a/src/NodeTypeResolver/TypeComparator/TypeComparator.php b/src/NodeTypeResolver/TypeComparator/TypeComparator.php
@@ -56,8 +56,8 @@ public function areTypesEqual(Type $firstType, Type $secondType): bool
             return true;
         }
 
-        //        $firstType = $this->typeNormalizer->normalizeArrayOfUnionToUnionArray($firstType);
-        //        $secondType = $this->typeNormalizer->normalizeArrayOfUnionToUnionArray($secondType);
+        $firstType = $this->typeNormalizer->normalizeArrayOfUnionToUnionArray($firstType);
+        $secondType = $this->typeNormalizer->normalizeArrayOfUnionToUnionArray($secondType);
 
         if ($this->typeHasher->areTypesEqual($firstType, $secondType)) {
             return true;

diff --git a/src/StaticTypeMapper/Resolver/ClassNameFromObjectTypeResolver.php b/src/StaticTypeMapper/Resolver/ClassNameFromObjectTypeResolver.php
@@ -8,9 +8,6 @@
 
 final class ClassNameFromObjectTypeResolver
 {
-    /**
-     * @return class-string|null
-     */
     public static function resolve(Type $type): ?string
     {
         /** @var array<class-string> $objectClassNames */

diff --git a/stubs/Twig/Extension/SandboxExtension.php b/stubs/Twig/Extension/SandboxExtension.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Twig\Extension;
+
+if (class_exists('Twig\Extension\SandboxExtension')) {
+    return;
+}
+
+class SandboxExtension
+{
+
+}