Merge pull request #1191 from kukulich/82

Basic support for PHP 8.2
Roave · Sep 10, 2022 · 55b41a4 · 55b41a4
2 parents 2658607 + 0c0a243
commit 55b41a4
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 4 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -23,6 +23,7 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
           - "windows-latest"
@@ -58,6 +59,7 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
@@ -92,6 +94,7 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Better Reflection - an improved code reflection API",
     "license": "MIT",
     "require": {
-        "php": "~8.0.12 || ~8.1.0",
+        "php": "~8.0.12 || ~8.1.0 || ~8.2.0",
         "ext-json": "*",
         "jetbrains/phpstorm-stubs": "2022.2",
         "nikic/php-parser": "^4.15.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Reflection/Adapter/ReflectionFunction.php b/src/Reflection/Adapter/ReflectionFunction.php
@@ -70,6 +70,11 @@ public function getClosureScopeClass(): CoreReflectionClass|null
         throw new NotImplemented('Not implemented');
     }
 
+    public function getClosureCalledClass(): CoreReflectionClass|null
+    {
+        throw new NotImplemented('Not implemented');
+    }
+
     public function getDocComment(): string|false
     {
         return $this->betterReflectionFunction->getDocComment() ?: false;
@@ -248,4 +253,9 @@ public function __get(string $name): mixed
 
         throw new OutOfBoundsException(sprintf('Property %s::$%s does not exist.', self::class, $name));
     }
+
+    public function isAnonymous(): bool
+    {
+        return $this->betterReflectionFunction->isClosure();
+    }
 }
diff --git a/src/Reflection/Adapter/ReflectionMethod.php b/src/Reflection/Adapter/ReflectionMethod.php
@@ -12,6 +12,7 @@
 use ReflectionMethod as CoreReflectionMethod;
 use ReflectionType as CoreReflectionType;
 use Roave\BetterReflection\Reflection\Adapter\Exception\NotImplemented;
+use Roave\BetterReflection\Reflection\Exception\MethodPrototypeNotFound;
 use Roave\BetterReflection\Reflection\Exception\NoObjectProvided;
 use Roave\BetterReflection\Reflection\ReflectionAttribute as BetterReflectionAttribute;
 use Roave\BetterReflection\Reflection\ReflectionMethod as BetterReflectionMethod;
@@ -72,6 +73,11 @@ public function getClosureScopeClass(): CoreReflectionClass|null
         throw new NotImplemented('Not implemented');
     }
 
+    public function getClosureCalledClass(): CoreReflectionClass|null
+    {
+        throw new NotImplemented('Not implemented');
+    }
+
     public function getDocComment(): string|false
     {
         return $this->betterReflectionMethod->getDocComment() ?: false;
@@ -260,6 +266,17 @@ public function getPrototype(): ReflectionMethod
         return new self($this->betterReflectionMethod->getPrototype());
     }
 
+    public function hasPrototype(): bool
+    {
+        try {
+            $this->betterReflectionMethod->getPrototype();
+
+            return true;
+        } catch (MethodPrototypeNotFound) {
+            return false;
+        }
+    }
+
     /**
      * @codeCoverageIgnore
      * @infection-ignore-all

diff --git a/test/unit/Fixture/DefaultProperties.php b/test/unit/Fixture/DefaultProperties.php
@@ -2,11 +2,14 @@
 
 namespace Roave\BetterReflectionTest\Fixture;
 
+use AllowDynamicProperties;
+
 trait DefaultPropertiesTrait
 {
     public $fromTrait = 'anything';
 }
 
+#[AllowDynamicProperties]
 class DefaultProperties
 {
     use DefaultPropertiesTrait;

diff --git a/test/unit/Fixture/RuntimeProperties.php b/test/unit/Fixture/RuntimeProperties.php
@@ -2,6 +2,9 @@
 
 namespace Roave\BetterReflectionTest\Fixture;
 
+use AllowDynamicProperties;
+
+#[AllowDynamicProperties]
 class RuntimeProperties
 {
     public $publicProperty;

diff --git a/test/unit/Fixture/StringCastClassObject.php b/test/unit/Fixture/StringCastClassObject.php
@@ -2,6 +2,9 @@
 
 namespace Roave\BetterReflectionTest\Fixture;
 
+use AllowDynamicProperties;
+
+#[AllowDynamicProperties]
 class StringCastClassObject
 {
     public $notDynamicProperty;

diff --git a/test/unit/Fixture/StringCastClassObjectExpected.txt b/test/unit/Fixture/StringCastClassObjectExpected.txt
@@ -1,5 +1,5 @@
 Object of class [ <user> class Roave\BetterReflectionTest\Fixture\StringCastClassObject ] {
-  @@ %s/Fixture/StringCastClassObject.php 5-8
+  @@ %s/Fixture/StringCastClassObject.php 7-11
 
   - Constants [0] {
   }

diff --git a/test/unit/Reflection/Adapter/ReflectionFunctionTest.php b/test/unit/Reflection/Adapter/ReflectionFunctionTest.php
@@ -72,6 +72,7 @@ public function methodExpectationProvider(): array
             ['isUserDefined', [], true, null, true, null],
             ['getClosureThis', [], null, NotImplemented::class, null, null],
             ['getClosureScopeClass', [], null, NotImplemented::class, null, null],
+            ['getClosureCalledClass', [], null, NotImplemented::class, null, null],
             ['getDocComment', [], '', null, false, null],
             ['getStartLine', [], 123, null, 123, null],
             ['getEndLine', [], 123, null, 123, null],
@@ -430,4 +431,16 @@ public function testUnknownProperty(): void
         /** @phpstan-ignore-next-line */
         $reflectionFunctionAdapter->foo;
     }
+
+    public function testIsAnonymous(): void
+    {
+        $betterReflectionFunction = $this->createMock(BetterReflectionFunction::class);
+        $betterReflectionFunction
+            ->method('isClosure')
+            ->willReturn(true);
+
+        $reflectionFunctionAdapter = new ReflectionFunctionAdapter($betterReflectionFunction);
+
+        self::assertTrue($reflectionFunctionAdapter->isAnonymous());
+    }
 }
diff --git a/test/unit/Reflection/Adapter/ReflectionMethodTest.php b/test/unit/Reflection/Adapter/ReflectionMethodTest.php
@@ -15,6 +15,7 @@
 use Roave\BetterReflection\Reflection\Adapter\ReflectionMethod as ReflectionMethodAdapter;
 use Roave\BetterReflection\Reflection\Adapter\ReflectionNamedType as ReflectionNamedTypeAdapter;
 use Roave\BetterReflection\Reflection\Adapter\ReflectionParameter as ReflectionParameterAdapter;
+use Roave\BetterReflection\Reflection\Exception\MethodPrototypeNotFound;
 use Roave\BetterReflection\Reflection\Exception\NoObjectProvided;
 use Roave\BetterReflection\Reflection\Exception\ObjectNotInstanceOfClass;
 use Roave\BetterReflection\Reflection\ReflectionAttribute as BetterReflectionAttribute;
@@ -75,6 +76,7 @@ public function methodExpectationProvider(): array
             ['isUserDefined', [], true, null, true, null],
             ['getClosureThis', [], null, NotImplemented::class, null, null],
             ['getClosureScopeClass', [], null, NotImplemented::class, null, null],
+            ['getClosureCalledClass', [], null, NotImplemented::class, null, null],
             ['getDocComment', [], '', null, false, null],
             ['getStartLine', [], 123, null, 123, null],
             ['getEndLine', [], 123, null, 123, null],
@@ -560,4 +562,28 @@ public function testUnknownProperty(): void
         /** @phpstan-ignore-next-line */
         $reflectionMethodAdapter->foo;
     }
+
+    public function testHasPrototypeReturnsTrueWhenPrototypeExists(): void
+    {
+        $betterReflectionMethod = $this->createMock(BetterReflectionMethod::class);
+        $betterReflectionMethod
+            ->method('getPrototype')
+            ->willReturn($this->createMock(BetterReflectionMethod::class));
+
+        $reflectionMethodAdapter = new ReflectionMethodAdapter($betterReflectionMethod);
+
+        self::assertTrue($reflectionMethodAdapter->hasPrototype());
+    }
+
+    public function testHasPrototypeReturnsFalseWhenNoPrototype(): void
+    {
+        $betterReflectionMethod = $this->createMock(BetterReflectionMethod::class);
+        $betterReflectionMethod
+            ->method('getPrototype')
+            ->willThrowException(new MethodPrototypeNotFound());
+
+        $reflectionMethodAdapter = new ReflectionMethodAdapter($betterReflectionMethod);
+
+        self::assertFalse($reflectionMethodAdapter->hasPrototype());
+    }
 }
diff --git a/test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php b/test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php
@@ -169,6 +169,15 @@ private function assertSameClassAttributes(CoreReflectionClass $original, Reflec
         $this->assertSameInterfaces($original, $stubbed);
 
         foreach ($original->getMethods() as $method) {
+            if (
+                PHP_VERSION_ID >= 80200
+                && $original->getName() === 'SplFixedArray'
+                && in_array($method->getName(), ['__serialize', '__unserialize'], true)
+            ) {
+                // https://github.com/JetBrains/phpstorm-stubs/pull/1439
+                continue;
+            }
+
             $this->assertSameMethodAttributes($method, $stubbed->getMethod($method->getName()));
         }
 
@@ -349,6 +358,33 @@ public function internalConstantsProvider(): array
             }
 
             foreach ($extensionConstants as $constantName => $constantValue) {
+                // https://github.com/JetBrains/phpstorm-stubs/pull/1440
+                if (
+                    in_array($constantName, [
+                        'DECIMAL_POINT',
+                        'THOUSANDS_SEP',
+                        'GROUPING',
+                        'ERA_YEAR',
+                        'INT_CURR_SYMBOL',
+                        'CURRENCY_SYMBOL',
+                        'MON_DECIMAL_POINT',
+                        'MON_THOUSANDS_SEP',
+                        'MON_GROUPING',
+                        'POSITIVE_SIGN',
+                        'NEGATIVE_SIGN',
+                        'INT_FRAC_DIGITS',
+                        'FRAC_DIGITS',
+                        'P_CS_PRECEDES',
+                        'P_SEP_BY_SPACE',
+                        'N_CS_PRECEDES',
+                        'N_SEP_BY_SPACE',
+                        'P_SIGN_POSN',
+                        'N_SIGN_POSN',
+                    ], true)
+                ) {
+                    continue;
+                }
+
                 $provider[] = [$constantName, $constantValue, $extensionName];
             }
         }