PHP 8.4 support

.github/workflows/continuous-integration.yml

@@ -24,6 +24,7 @@ jobs:
         php-version:
           - "8.2"
           - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
           - "windows-latest"
@@ -67,6 +68,7 @@ jobs:
         php-version:
           - "8.2"
           - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 
@@ -107,6 +109,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
+          # Throws deprecated errors on 8.4
           - "8.3"
         operating-system:
           - "ubuntu-latest"
@@ -148,6 +151,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
+            # Does not work on 8.4
           - "8.3"
         operating-system:
           - "ubuntu-latest"
@@ -192,7 +196,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
           - "windows-latest"
@@ -234,7 +238,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 
@@ -268,7 +272,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
           - "windows-latest"
@@ -347,7 +351,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 

composer.json

@@ -3,7 +3,7 @@
     "description": "Better Reflection - an improved code reflection API",
     "license": "MIT",
     "require": {
-        "php": "~8.2.0 || ~8.3.2",
+        "php": "~8.2.0 || ~8.3.2 || ~8.4.1",
         "ext-json": "*",
         "jetbrains/phpstorm-stubs": "2024.2",
         "nikic/php-parser": "^5.3.1"

phpstan.neon

@@ -25,6 +25,10 @@ parameters:
         - phar://%currentWorkingDirectory%/test/unit/Fixture/autoload.phar/vendor/autoload.php
 
     ignoreErrors:
+        -
+            identifier: class.notFound
+            message: '#(unknown class|invalid type) PropertyHookType#'
+
         -
             identifier: missingType.generics
         -

psalm-baseline.xml

@@ -144,11 +144,15 @@
       <code><![CDATA[getEndLine]]></code>
       <code><![CDATA[getEndLine]]></code>
       <code><![CDATA[getEndLine]]></code>
+      <code><![CDATA[getEndLine]]></code>
+      <code><![CDATA[getReturnType]]></code>
+      <code><![CDATA[getStartLine]]></code>
       <code><![CDATA[getStartLine]]></code>
       <code><![CDATA[getStartLine]]></code>
       <code><![CDATA[getStartLine]]></code>
       <code><![CDATA[getStartLine]]></code>
       <code><![CDATA[getStmts]]></code>
+      <code><![CDATA[getStmts]]></code>
       <code><![CDATA[getSubNodeNames]]></code>
       <code><![CDATA[traverse]]></code>
     </ImpureMethodCall>
@@ -201,14 +205,19 @@
     <ImpureMethodCall>
       <code><![CDATA[__invoke]]></code>
       <code><![CDATA[classExists]]></code>
+      <code><![CDATA[createFromNode]]></code>
       <code><![CDATA[getEndLine]]></code>
       <code><![CDATA[getStartLine]]></code>
+      <code><![CDATA[getStmts]]></code>
       <code><![CDATA[isPrivate]]></code>
+      <code><![CDATA[isPrivateSet]]></code>
       <code><![CDATA[isProtected]]></code>
+      <code><![CDATA[isProtectedSet]]></code>
       <code><![CDATA[isPublic]]></code>
       <code><![CDATA[isReadonly]]></code>
       <code><![CDATA[isStatic]]></code>
       <code><![CDATA[traitExists]]></code>
+      <code><![CDATA[traverse]]></code>
     </ImpureMethodCall>
   </file>
   <file src="src/Reflection/ReflectionType.php">

src/Reflection/Adapter/ReflectionClass.php

@@ -33,6 +33,12 @@
  */
 final class ReflectionClass extends CoreReflectionClass
 {
+    /** @internal */
+    public const SKIP_INITIALIZATION_ON_SERIALIZE_COMPATIBILITY = 8;
+
+    /** @internal */
+    public const SKIP_DESTRUCTOR_COMPATIBILITY = 16;
+
     public function __construct(private BetterReflectionClass|BetterReflectionEnum $betterReflectionClass)
     {
         unset($this->name);
@@ -450,6 +456,50 @@ public function newInstanceArgs(array|null $args = null): object
         throw new Exception\NotImplemented('Not implemented');
     }
 
+    /** @param int-mask-of<self::SKIP_*> $options */
+    public function newLazyGhost(callable $initializer, int $options = 0): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    /** @param int-mask-of<self::SKIP_*> $options */
+    public function newLazyProxy(callable $factory, int $options = 0): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function markLazyObjectAsInitialized(object $object): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function getLazyInitializer(object $object): callable|null
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function initializeLazyObject(object $object): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function isUninitializedLazyObject(object $object): bool
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    /** @param int-mask-of<self::SKIP_*> $options */
+    public function resetAsLazyGhost(object $object, callable $initializer, int $options = 0): void
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    /** @param int-mask-of<self::SKIP_*> $options */
+    public function resetAsLazyProxy(object $object, callable $factory, int $options = 0): void
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
     /** @psalm-mutation-free */
     public function getParentClass(): ReflectionClass|false
     {

src/Reflection/Adapter/ReflectionClassConstant.php

@@ -160,6 +160,11 @@ public function isEnumCase(): bool
         return $this->betterClassConstantOrEnumCase instanceof BetterReflectionEnumCase;
     }
 
+    public function isDeprecated(): bool
+    {
+        return $this->betterClassConstantOrEnumCase->isDeprecated();
+    }
+
     public function __get(string $name): mixed
     {
         if ($name === 'name') {

src/Reflection/Adapter/ReflectionEnum.php

@@ -376,6 +376,50 @@ public function newInstanceArgs(array|null $args = null): object
         throw new Exception\NotImplemented('Not implemented');
     }
 
+    /** @param int-mask-of<ReflectionClass::SKIP_*> $options */
+    public function newLazyGhost(callable $initializer, int $options = 0): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    /** @param int-mask-of<ReflectionClass::SKIP_*> $options */
+    public function newLazyProxy(callable $factory, int $options = 0): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function markLazyObjectAsInitialized(object $object): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function getLazyInitializer(object $object): callable|null
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function initializeLazyObject(object $object): object
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    public function isUninitializedLazyObject(object $object): bool
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    /** @param int-mask-of<ReflectionClass::SKIP_*> $options */
+    public function resetAsLazyGhost(object $object, callable $initializer, int $options = 0): void
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
+    /** @param int-mask-of<ReflectionClass::SKIP_*> $options */
+    public function resetAsLazyProxy(object $object, callable $factory, int $options = 0): void
+    {
+        throw new Exception\NotImplemented('Not implemented');
+    }
+
     public function getParentClass(): ReflectionClass|false
     {
         return false;

src/Reflection/Adapter/ReflectionEnumBackedCase.php

@@ -129,6 +129,11 @@ public function getBackingValue(): int|string
         return $this->betterReflectionEnumCase->getValue();
     }
 
+    public function isDeprecated(): bool
+    {
+        return $this->betterReflectionEnumCase->isDeprecated();
+    }
+
     public function __get(string $name): mixed
     {
         if ($name === 'name') {

src/Reflection/Adapter/ReflectionEnumUnitCase.php

@@ -124,6 +124,11 @@ public function getEnum(): ReflectionEnum
         return new ReflectionEnum($this->betterReflectionEnumCase->getDeclaringEnum());
     }
 
+    public function isDeprecated(): bool
+    {
+        return $this->betterReflectionEnumCase->isDeprecated();
+    }
+
     public function __get(string $name): mixed
     {
         if ($name === 'name') {

src/Reflection/Adapter/ReflectionNamedType.php

@@ -12,29 +12,48 @@
 /** @psalm-immutable */
 final class ReflectionNamedType extends CoreReflectionNamedType
 {
-    public function __construct(private BetterReflectionNamedType $betterReflectionType, private bool $allowsNull)
+    /** @var non-empty-string */
+    private string $nameType;
+
+    private bool $isBuiltin;
+
+    /** @var non-empty-string */
+    private string $toString;
+
+    /** @param \Roave\BetterReflection\Reflection\ReflectionNamedType|non-empty-string $type */
+    public function __construct(BetterReflectionNamedType|string $type, private bool $allowsNull)
     {
+        if ($type instanceof BetterReflectionNamedType) {
+            $nameType        = $type->getName();
+            $this->nameType  = $nameType;
+            $this->isBuiltin = $this->computeIsBuiltin($nameType, $type->isBuiltin());
+            $this->toString  = $type->__toString();
+        } else {
+            $this->nameType  = $type;
+            $this->isBuiltin = true;
+            $this->toString  = $type;
+        }
     }
 
     public function getName(): string
     {
-        return $this->betterReflectionType->getName();
+        return $this->nameType;
     }
 
     /** @return non-empty-string */
     public function __toString(): string
     {
-        $type = strtolower($this->betterReflectionType->getName());
+        $normalizedType = strtolower($this->nameType);
 
         if (
             ! $this->allowsNull
-            || $type === 'mixed'
-            || $type === 'null'
+            || $normalizedType === 'mixed'
+            || $normalizedType === 'null'
         ) {
-            return $this->betterReflectionType->__toString();
+            return $this->toString;
         }
 
-        return '?' . $this->betterReflectionType->__toString();
+        return '?' . $this->toString;
     }
 
     public function allowsNull(): bool
@@ -44,12 +63,17 @@ public function allowsNull(): bool
 
     public function isBuiltin(): bool
     {
-        $type = strtolower($this->betterReflectionType->getName());
+        return $this->isBuiltin;
+    }
+
+    private function computeIsBuiltin(string $namedType, bool $isBuiltin): bool
+    {
+        $normalizedType = strtolower($namedType);
 
-        if ($type === 'self' || $type === 'parent' || $type === 'static') {
+        if ($normalizedType === 'self' || $normalizedType === 'parent' || $normalizedType === 'static') {
             return false;
         }
 
-        return $this->betterReflectionType->isBuiltin();
+        return $isBuiltin;
     }
 }