[PHPStan] Update to PHPStan ^1.7.0 (#2354)

* [PHPStan] Update to PHPStan ^1.7.0 * [ci-review] Rector Rectify * [ci-review] Rector Rectify * already 1.7.1 * skip pull from PHPStan PhpPropertyReflection * rename fixture * debug * Fixed 🎉 * keep mysqli object use case Co-authored-by: GitHub Action <action@github.com>
rectorphp · May 24, 2022 · dc91892 · dc91892
1 parent a14bd26
commit dc91892
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 49 deletions.
diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json
@@ -7,7 +7,7 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "phpstan/phpstan": "1.6.9"
+        "phpstan/phpstan": "^1.7.1"
     },
     "autoload": {
         "files": [

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "nikic/php-parser": "^4.13.2",
         "ondram/ci-detector": "^4.1",
         "phpstan/phpdoc-parser": "^1.5.1",
-        "phpstan/phpstan": "1.6.9",
+        "phpstan/phpstan": "^1.7.1",
         "phpstan/phpstan-phpunit": "^1.0",
         "psr/log": "^2.0",
         "react/child-process": "^0.6.4",

diff --git a/...gradeReflectionPropertyGetDefaultValueRector/Fixture/pull_from_phpstan_reflection.php.inc b/...gradeReflectionPropertyGetDefaultValueRector/Fixture/pull_from_phpstan_reflection.php.inc
diff --git a/...ReflectionPropertyGetDefaultValueRector/Fixture/skip_pull_from_phpstan_reflection.php.inc b/...ReflectionPropertyGetDefaultValueRector/Fixture/skip_pull_from_phpstan_reflection.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\MethodCall\DowngradeReflectionPropertyGetDefaultValueRector\Fixture;
+
+use PHPStan\Reflection\Php\PhpPropertyReflection;
+
+class SkipPullFromPHPStanReflection
+{
+    public function get(PhpPropertyReflection $phpPropertyReflection)
+    {
+        $reflectionProperty = $phpPropertyReflection->getNativeReflection();
+        return is_array($reflectionProperty->getDefaultValue());
+    }
+}
diff --git a/rules-tests/MysqlToMysqli/SetTest.php b/rules-tests/MysqlToMysqli/SetTest.php
@@ -16,10 +16,6 @@ final class SetTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->markTestSkipped(
-            '@todo update rules to handle both rename + argumentt adding at the same time; otherwise lost during scope update'
-        );
-
         $this->doTestFileInfo($fileInfo);
     }
 

diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php
@@ -193,14 +193,14 @@ private function resolveParentReflectionMethod(
             return null;
         }
 
-        $reflectionClass = $classReflection->getNativeReflection();
+        $nativeReflection = $classReflection->getNativeReflection();
 
-        if (! $reflectionClass->hasMethod($methodName)) {
+        if (! $nativeReflection->hasMethod($methodName)) {
             return null;
         }
 
         // Find the param we're looking for
-        return $reflectionClass->getMethod($methodName);
+        return $nativeReflection->getMethod($methodName);
     }
 
     private function getDifferentParamTypeFromReflectionMethod(

diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector.php
@@ -185,7 +185,11 @@ private function findConnectionVariable(FuncCall $funcCall): ?Expr
                 return false;
             }
 
-            return $this->isObjectType($node->expr, new ObjectType('mysqli'));
+            if ($this->isObjectType($node->expr, new ObjectType('mysqli'))) {
+                return true;
+            }
+
+            return $node->expr instanceof FuncCall && $this->nodeNameResolver->isName($node->expr, 'mysqli_connect');
         });
 
         if (! $connectionAssign instanceof Assign) {

diff --git a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
@@ -179,9 +179,9 @@ private function isInstantiable(string $className): bool
         }
 
         $classReflection = $this->reflectionProvider->getClass($className);
-        $reflectionClass = $classReflection->getNativeReflection();
+        $nativeReflection = $classReflection->getNativeReflection();
 
-        $reflectionMethod = $reflectionClass->getConstructor();
+        $reflectionMethod = $nativeReflection->getConstructor();
         if (! $reflectionMethod instanceof ReflectionMethod) {
             return true;
         }

diff --git a/rules/Privatization/Reflection/ClassConstantsResolver.php b/rules/Privatization/Reflection/ClassConstantsResolver.php
@@ -32,9 +32,9 @@ public function getClassConstantNamesToValues(string $classWithConstants): array
         }
 
         $classReflection = $this->reflectionProvider->getClass($classWithConstants);
-        $reflectionClass = $classReflection->getNativeReflection();
+        $nativeReflection = $classReflection->getNativeReflection();
 
-        $constantNamesToValues = $reflectionClass->getConstants();
+        $constantNamesToValues = $nativeReflection->getConstants();
         $this->cachedConstantNamesToValues = $constantNamesToValues;
 
         return $constantNamesToValues;

diff --git a/src/NodeAnalyzer/PropertyPresenceChecker.php b/src/NodeAnalyzer/PropertyPresenceChecker.php
@@ -149,8 +149,8 @@ private function resolveNonPrivatePropertyNames(ClassReflection $classReflection
     {
         $propertyNames = [];
 
-        $reflectionClass = $classReflection->getNativeReflection();
-        foreach ($reflectionClass->getProperties() as $reflectionProperty) {
+        $nativeReflection = $classReflection->getNativeReflection();
+        foreach ($nativeReflection->getProperties() as $reflectionProperty) {
             if ($reflectionProperty->isPrivate()) {
                 continue;
             }