Merge pull request #1443 from kukulich/fix

Remove unnecessary constants
Roave · Aug 3, 2024 · 8a8ca73 · 8a8ca73
2 parents 7f16c80 + 5ea77d6
commit 8a8ca73
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,8 +3,6 @@ includes:
     - tools/vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
-    phpVersion: 80100
-
     level: 6
 
     paths:

diff --git a/src/Reflection/Adapter/ReflectionClass.php b/src/Reflection/Adapter/ReflectionClass.php
@@ -33,9 +33,6 @@
  */
 final class ReflectionClass extends CoreReflectionClass
 {
-    /** @internal */
-    public const IS_READONLY_COMPATIBILITY = 65536;
-
     public function __construct(private BetterReflectionClass|BetterReflectionEnum $betterReflectionClass)
     {
         unset($this->name);

diff --git a/src/Reflection/Adapter/ReflectionClassConstant.php b/src/Reflection/Adapter/ReflectionClassConstant.php
@@ -21,9 +21,6 @@
  */
 final class ReflectionClassConstant extends CoreReflectionClassConstant
 {
-    /** @internal */
-    public const IS_FINAL_COMPATIBILITY = 32;
-
     public function __construct(private BetterReflectionClassConstant|BetterReflectionEnumCase $betterClassConstantOrEnumCase)
     {
         unset($this->name);

diff --git a/src/Reflection/Adapter/ReflectionProperty.php b/src/Reflection/Adapter/ReflectionProperty.php
@@ -23,9 +23,6 @@
 /** @psalm-suppress PropertyNotSetInConstructor */
 final class ReflectionProperty extends CoreReflectionProperty
 {
-    /** @internal */
-    public const IS_READONLY_COMPATIBILITY = 128;
-
     public function __construct(private BetterReflectionProperty $betterReflectionProperty)
     {
         unset($this->name);

diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -1201,7 +1201,7 @@ public function isFinal(): bool
 
     public function isReadOnly(): bool
     {
-        return ($this->modifiers & ReflectionClassAdapter::IS_READONLY_COMPATIBILITY) === ReflectionClassAdapter::IS_READONLY_COMPATIBILITY;
+        return ($this->modifiers & CoreReflectionClass::IS_READONLY) === CoreReflectionClass::IS_READONLY;
     }
 
     /**
@@ -1223,7 +1223,7 @@ private function computeModifiers(ClassNode|InterfaceNode|TraitNode|EnumNode $no
 
         $modifiers  = $node->isAbstract() ? CoreReflectionClass::IS_EXPLICIT_ABSTRACT : 0;
         $modifiers += $node->isFinal() ? CoreReflectionClass::IS_FINAL : 0;
-        $modifiers += $node->isReadonly() ? ReflectionClassAdapter::IS_READONLY_COMPATIBILITY : 0;
+        $modifiers += $node->isReadonly() ? CoreReflectionClass::IS_READONLY : 0;
 
         return $modifiers;
     }

diff --git a/test/unit/Reflection/ReflectionClassTest.php b/test/unit/Reflection/ReflectionClassTest.php
@@ -23,7 +23,6 @@
 use ReflectionClassConstant as CoreReflectionClassConstant;
 use ReflectionMethod as CoreReflectionMethod;
 use ReflectionProperty as CoreReflectionProperty;
-use Roave\BetterReflection\Reflection\Adapter\ReflectionClass as ReflectionClassAdapter;
 use Roave\BetterReflection\Reflection\Adapter\ReflectionClassConstant as ReflectionClassConstantAdapter;
 use Roave\BetterReflection\Reflection\Exception\CircularReference;
 use Roave\BetterReflection\Reflection\Exception\NotAClassReflection;
@@ -1308,7 +1307,7 @@ public static function modifierProvider(): array
             ['ExampleClass', 0],
             ['AbstractClass', CoreReflectionClass::IS_EXPLICIT_ABSTRACT],
             ['FinalClass', CoreReflectionClass::IS_FINAL],
-            ['ReadOnlyClass', ReflectionClassAdapter::IS_READONLY_COMPATIBILITY],
+            ['ReadOnlyClass', CoreReflectionClass::IS_READONLY],
             ['ExampleTrait', 0],
         ];
     }