feat: add support for PHP 8.4

CuyZ · Nov 1, 2024 · 02a4a8f · 02a4a8f
1 parent 6e68d6f
commit 02a4a8f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,6 +15,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     env:
       php-extensions: ds,yaml
@@ -30,6 +31,12 @@ jobs:
           ini-values: zend.assertions=1
           coverage: none # Xdebug is installed by default, so we remove it manually
 
+      # Removing Psalm until it is ready for PHP 8.4
+      # @see https://github.com/vimeo/psalm/pull/10928
+      - uses: php-actions/composer@v6
+        with:
+          command: composer remove --dev vimeo/psalm --no-interaction
+
       - uses: "ramsey/composer-install@v2"
         with:
           dependency-versions: ${{ matrix.dependencies }}

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "composer-runtime-api": "^2.0",
         "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Definition/Repository/Reflection/ReflectionFunctionDefinitionRepository.php b/src/Definition/Repository/Reflection/ReflectionFunctionDefinitionRepository.php
@@ -19,6 +19,7 @@
 
 use function array_map;
 use function str_ends_with;
+use function str_starts_with;
 
 /** @internal */
 final class ReflectionFunctionDefinitionRepository implements FunctionDefinitionRepository
@@ -57,7 +58,8 @@ public function for(callable $function): FunctionDefinition
         $class = $reflection->getClosureScopeClass();
         $returnType = $returnTypeResolver->resolveReturnTypeFor($reflection);
         $nativeReturnType = $returnTypeResolver->resolveNativeReturnTypeFor($reflection);
-        $isClosure = $name === '{closure}' || str_ends_with($name, '\\{closure}');
+        // PHP8.2 use `ReflectionFunction::isAnonymous()`
+        $isClosure = $name === '{closure}' || str_ends_with($name, '\\{closure}') || str_starts_with($name, '{closure:');
 
         if ($returnType instanceof UnresolvableType) {
             $returnType = $returnType->forFunctionReturnType($signature);
@@ -83,7 +85,8 @@ public function for(callable $function): FunctionDefinition
      */
     private function signature(ReflectionFunction $reflection): string
     {
-        if (str_contains($reflection->name, '{closure}')) {
+        // PHP8.2 use `ReflectionFunction::isAnonymous()`
+        if ($reflection->name === '{closure}' || str_ends_with($reflection->name, '\\{closure}') || str_starts_with($reflection->name, '{closure:')) {
             $startLine = $reflection->getStartLine();
             $endLine = $reflection->getEndLine();
 

diff --git a/...unctional/Definition/Repository/Reflection/ReflectionFunctionDefinitionRepositoryTest.php b/...unctional/Definition/Repository/Reflection/ReflectionFunctionDefinitionRepositoryTest.php
@@ -12,6 +12,8 @@
 use CuyZ\Valinor\Type\Types\UnresolvableType;
 use PHPUnit\Framework\TestCase;
 
+use function var_dump;
+
 final class ReflectionFunctionDefinitionRepositoryTest extends TestCase
 {
     private ReflectionFunctionDefinitionRepository $repository;
@@ -39,7 +41,11 @@ public function test_function_data_can_be_retrieved(): void
         $function = $this->repository->for($callback);
         $parameters = $function->parameters;
 
-        self::assertSame(__NAMESPACE__ . '\{closure}', $function->name);
+        if (PHP_VERSION_ID < 8_04_00) {
+            self::assertSame(__NAMESPACE__ . '\{closure}', $function->name);
+        } else {
+            self::assertSame('{closure:' . self::class . '::' . __FUNCTION__ . '():37}', $function->name);
+        }
         self::assertInstanceOf(NativeStringType::class, $function->returnType);
 
         self::assertTrue($parameters->has('foo'));

diff --git a/...s/Functional/Definition/Repository/Reflection/TypeResolver/ReflectionTypeResolverTest.php b/...s/Functional/Definition/Repository/Reflection/TypeResolver/ReflectionTypeResolverTest.php
@@ -98,7 +98,7 @@ public static function native_type_is_resolved_properly_data_provider(): iterabl
     }
 
     // PHP8.2 move to data provider
-    #[RequiresPhp('8.2')]
+    #[RequiresPhp('>=8.2')]
     public function test_disjunctive_normal_form_type_is_resolved_properly(): void
     {
         $reflectionType = (new ReflectionProperty(ObjectWithPropertyWithNativeDisjunctiveNormalFormType::class, 'someProperty'))->getType();
@@ -109,7 +109,7 @@ public function test_disjunctive_normal_form_type_is_resolved_properly(): void
     }
 
     // PHP8.2 move to data provider
-    #[RequiresPhp('8.2')]
+    #[RequiresPhp('>=8.2')]
     public function test_native_null_type_is_resolved_properly(): void
     {
         $reflectionType = (new ReflectionProperty(ObjectWithPropertyWithNativePhp82StandaloneTypes::class, 'nativeNull'))->getType();
@@ -120,7 +120,7 @@ public function test_native_null_type_is_resolved_properly(): void
     }
 
     // PHP8.2 move to data provider
-    #[RequiresPhp('8.2')]
+    #[RequiresPhp('>=8.2')]
     public function test_native_true_type_is_resolved_properly(): void
     {
         $reflectionType = (new ReflectionProperty(ObjectWithPropertyWithNativePhp82StandaloneTypes::class, 'nativeTrue'))->getType();
@@ -131,7 +131,7 @@ public function test_native_true_type_is_resolved_properly(): void
     }
 
     // PHP8.2 move to data provider
-    #[RequiresPhp('8.2')]
+    #[RequiresPhp('>=8.2')]
     public function test_native_false_type_is_resolved_properly(): void
     {
         $reflectionType = (new ReflectionProperty(ObjectWithPropertyWithNativePhp82StandaloneTypes::class, 'nativeFalse'))->getType();