Merge pull request #726 from michaeljoelphillips/phpstorm-stubs-faili…

…ng-tests Upgrade PHPStorm Stubs
Roave · Jan 7, 2021 · 0c79e56 · 0c79e56
2 parents a5a2581 + 2541ec6
commit 0c79e56
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=7.4.1,<7.5.0",
         "ext-json": "*",
-        "jetbrains/phpstorm-stubs": "2019.3",
+        "jetbrains/phpstorm-stubs": "2020.2",
         "nikic/php-parser": "^4.10.4",
         "phpdocumentor/reflection-docblock": "^5.2.2",
         "phpdocumentor/type-resolver": "^1.4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/test/unit/Reflection/ReflectionPropertyTest.php b/test/unit/Reflection/ReflectionPropertyTest.php
@@ -14,7 +14,6 @@
 use PhpParser\PrettyPrinter\Standard as StandardPrettyPrinter;
 use PHPUnit\Framework\TestCase;
 use Reflection;
-use ReflectionFunctionAbstract;
 use ReflectionProperty as CoreReflectionProperty;
 use Roave\BetterReflection\Reflection\Exception\ClassDoesNotExist;
 use Roave\BetterReflection\Reflection\Exception\NoObjectProvided;
@@ -57,10 +56,10 @@ public function setUp(): void
 
     public function testCreateFromName(): void
     {
-        $property = ReflectionProperty::createFromName(ReflectionFunctionAbstract::class, 'name');
+        $property = ReflectionProperty::createFromName(ReflectionProperty::class, 'node');
 
         self::assertInstanceOf(ReflectionProperty::class, $property);
-        self::assertSame('name', $property->getName());
+        self::assertSame('node', $property->getName());
     }
 
     public function testCreateFromInstance(): void

diff --git a/test/unit/Reflection/StringCast/ReflectionClassStringCastTest.php b/test/unit/Reflection/StringCast/ReflectionClassStringCastTest.php
@@ -67,7 +67,7 @@ public function testInternalClassToString(): void
         $classReflection = $reflector->reflect(Exception::class);
         // phpcs:enable
 
-        self::assertStringStartsWith('Class [ <internal:Core> class Exception implements Throwable ]', (string) $classReflection);
+        self::assertStringStartsWith('Class [ <internal:Core> class Exception implements Throwable, Stringable ]', (string) $classReflection);
     }
 
     public function testInterfaceToString(): void

diff --git a/test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php b/test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php
@@ -24,6 +24,7 @@
 use function array_filter;
 use function array_map;
 use function array_merge;
+use function array_values;
 use function get_declared_classes;
 use function get_declared_interfaces;
 use function get_declared_traits;
@@ -136,6 +137,16 @@ private function assertSameInterfaces(CoreReflectionClass $original, ReflectionC
         sort($originalInterfacesNames);
         sort($stubbedInterfacesNames);
 
+        // Skip assertions for new interfaces added in PHP8
+        if (PHP_VERSION_ID < 80000) {
+            $stubbedInterfacesNames = array_values(array_filter(
+                $stubbedInterfacesNames,
+                static function (string $interfaceName): bool {
+                    return $interfaceName !== 'Stringable';
+                },
+            ));
+        }
+
         self::assertSame($originalInterfacesNames, $stubbedInterfacesNames);
     }
 
@@ -364,8 +375,11 @@ public function testInternalFunctions(string $functionName): void
             return;
         }
 
-        self::assertSame($originalReflection->getNumberOfParameters(), $stubbedReflection->getNumberOfParameters());
-        self::assertSame($originalReflection->getNumberOfRequiredParameters(), $stubbedReflection->getNumberOfRequiredParameters());
+        // The number of arguments in the signature of this function changed in PHP8
+        if ($originalReflection->getName() !== 'debug_zval_dump' && PHP_VERSION_ID < 80000) {
+            self::assertSame($originalReflection->getNumberOfParameters(), $stubbedReflection->getNumberOfParameters());
+            self::assertSame($originalReflection->getNumberOfRequiredParameters(), $stubbedReflection->getNumberOfRequiredParameters());
+        }
 
         $stubbedReflectionParameters = $stubbedReflection->getParameters();
         foreach ($originalReflection->getParameters() as $parameterNo => $originalReflectionParameter) {