PHP8 - Adapter Signatures Compatibility

src/Reflection/Adapter/ReflectionClass.php

@@ -250,9 +250,9 @@ public function hasConstant($name)
     /**
      * {@inheritDoc}
      */
-    public function getConstants()
+    public function getConstants(?int $filter = null)
     {
-        return $this->betterReflectionClass->getConstants();
+        return $this->betterReflectionClass->getConstants($filter);
     }
 
     /**
@@ -279,11 +279,11 @@ public function getReflectionConstant($name)
     /**
      * {@inheritdoc}
      */
-    public function getReflectionConstants()
+    public function getReflectionConstants(?int $filter = null)
     {
         return array_values(array_map(static function (BetterReflectionClassConstant $betterConstant): ReflectionClassConstant {
             return new ReflectionClassConstant($betterConstant);
-        }, $this->betterReflectionClass->getReflectionConstants()));
+        }, $this->betterReflectionClass->getReflectionConstants($filter)));
     }
 
     /**

src/Reflection/Adapter/ReflectionFunction.php

@@ -253,7 +253,7 @@ public function isDisabled()
     /**
      * {@inheritDoc}
      */
-    public function invoke($args = null)
+    public function invoke($arg = null, ...$args)
     {
         try {
             return $this->betterReflectionFunction->invoke(...func_get_args());

src/Reflection/Adapter/ReflectionMethod.php

@@ -335,7 +335,7 @@ public function getModifiers()
     /**
      * {@inheritDoc}
      */
-    public function invoke($object = null, $args = null)
+    public function invoke($object = null, $arg = null, ...$args)
     {
         if (! $this->isAccessible()) {
             throw new CoreReflectionException('Method not accessible');

src/Reflection/Adapter/ReflectionObject.php

@@ -226,9 +226,9 @@ public function hasConstant($name)
     /**
      * {@inheritDoc}
      */
-    public function getConstants()
+    public function getConstants(?int $filter = null)
     {
-        return $this->betterReflectionObject->getConstants();
+        return $this->betterReflectionObject->getConstants($filter);
     }
 
     /**

src/Reflection/ReflectionClass.php

@@ -490,14 +490,16 @@ public function getImmediateConstants(): array
     /**
      * Get an associative array of the defined constants in this class,
      * with keys as constant names and values as constant values.
+
+     * @see ReflectionClass::getConstants() for the usage of filter
      *
      * @return array<string, scalar|array<scalar>|null>
      */
-    public function getConstants(): array
+    public function getConstants(?int $filter = null): array
     {
         return array_map(static function (ReflectionClassConstant $classConstant) {
             return $classConstant->getValue();
-        }, $this->getReflectionConstants());
+        }, $this->getReflectionConstants($filter));
     }
 
     /**
@@ -584,9 +586,11 @@ static function (ReflectionClassConstant $constant): string {
      * Get an associative array of the defined constants in this class,
      * with keys as constant names and values as {@see ReflectionClassConstant} objects.
      *
+     * @see ReflectionClass::getConstants() for the usage of filter
+     *
      * @return array<string, ReflectionClassConstant> indexed by name
      */
-    public function getReflectionConstants(): array
+    public function getReflectionConstants(?int $filter = null): array
     {
         // Note: constants are not merged via their name as array index, since internal PHP constant
         //       sorting does not follow `\array_merge()` semantics
@@ -624,7 +628,16 @@ static function (ReflectionClass $interface): array {
             $reflectionConstants[$constantName] = $constant;
         }
 
-        return $reflectionConstants;
+        if ($filter === null) {
+            return $reflectionConstants;
+        }
+
+        return array_filter(
+            $reflectionConstants,
+            static function (ReflectionClassConstant $constant) use ($filter): bool {
+                return (bool) ($filter & $constant->getModifiers());
+            },
+        );
     }
 
     /**

src/Reflection/ReflectionClassConstant.php

@@ -15,6 +15,10 @@
 
 class ReflectionClassConstant
 {
+    public const IS_PUBLIC    = 1;
+    public const IS_PROTECTED = 2;
+    public const IS_PRIVATE   = 4;
+
     private bool $valueWasCached = false;
 
     /** @var scalar|array<scalar>|null const value */

src/Reflection/ReflectionObject.php

@@ -190,9 +190,9 @@ public function getImmediateConstants(): array
     /**
      * {@inheritdoc}
      */
-    public function getConstants(): array
+    public function getConstants(?int $filter = null): array
     {
-        return $this->reflectionClass->getConstants();
+        return $this->reflectionClass->getConstants($filter);
     }
 
     /**
@@ -224,9 +224,9 @@ public function getImmediateReflectionConstants(): array
     /**
      * {@inheritdoc}
      */
-    public function getReflectionConstants(): array
+    public function getReflectionConstants(?int $filter = null): array
     {
-        return $this->reflectionClass->getReflectionConstants();
+        return $this->reflectionClass->getReflectionConstants($filter);
     }
 
     public function getConstructor(): ReflectionMethod

test/unit/Reflection/ReflectionClassTest.php

@@ -1813,6 +1813,33 @@ public function testGetConstantsReturnsInheritedConstants(): void
         self::assertSame($expectedConstants, $classInfo->getConstants());
     }
 
+    public function getConstantsWithFilterDataProvider(): array
+    {
+        return [
+            [ReflectionClassConstant::IS_PUBLIC, 3],
+            [ReflectionClassConstant::IS_PROTECTED, 1],
+            [ReflectionClassConstant::IS_PRIVATE, 1],
+            [
+                ReflectionClassConstant::IS_PUBLIC |
+                ReflectionClassConstant::IS_PROTECTED |
+                ReflectionClassConstant::IS_PRIVATE,
+                5,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getConstantsWithFilterDataProvider
+     */
+    public function testGetConstantsWithFilter(int $filter, int $count): void
+    {
+        $reflector = new ClassReflector($this->getComposerLocator());
+        $classInfo = $reflector->reflect(ExampleClass::class);
+
+        self::assertCount($count, $classInfo->getConstants($filter));
+        self::assertCount($count, $classInfo->getReflectionConstants($filter));
+    }
+
     public function testGetImmediateConstants(): void
     {
         $classInfo = (new ClassReflector(new SingleFileSourceLocator(