Merge pull request #473 from greg0ire/php84-min

Require PHP 8.4

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -14,7 +14,7 @@ jobs:
     name: "PHPUnit"
     uses: "doctrine/.github/.github/workflows/continuous-integration.yml@12.1.0"
     with:
-      php-versions: '["8.1", "8.2", "8.3", "8.4", "8.5"]'
+      php-versions: '["8.4", "8.5"]'
       phpunit-options-lowest: "--do-not-fail-on-deprecation"
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

UPGRADE.md

@@ -6,6 +6,14 @@ awareness about deprecated code.
 - Use of our low-overhead runtime deprecation API, details:
   https://github.com/doctrine/deprecations/
 
+# Upgrade to 5.0
+
+## BC Break: added type declarations to constants
+
+The code base now has constants with type declarations. If you extend types
+from the library and override the constants, you will need to add compatible
+type declarations.
+
 # Upgrade to 4.2
 
 ## Add `getFieldValue` and `setFieldValue` to `ClassMetadata` implementation

composer.json

@@ -20,7 +20,7 @@
         {"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.4",
         "doctrine/deprecations": "^1",
         "doctrine/event-manager": "^1 || ^2",
         "psr/cache": "^1.0 || ^2.0 || ^3.0"

phpcs.xml.dist

@@ -12,7 +12,7 @@
     <!-- Ignore warnings and show progress of the run -->
     <arg value="nps"/>
 
-    <config name="php_version" value="80100"/>
+    <config name="php_version" value="80400"/>
 
     <file>src</file>
     <file>tests</file>

phpstan.neon

@@ -6,7 +6,7 @@ includes:
 
 parameters:
     level: 7
-    phpVersion: 80100
+    phpVersion: 80400
 
     paths:
         - src

src/Mapping/ClassMetadata.php

@@ -35,7 +35,7 @@ public function getIdentifier(): array;
     /**
      * Gets the ReflectionClass instance for this mapped class.
      *
-     * @return ReflectionClass<T>
+     * @return ReflectionClass<covariant T>
      */
     public function getReflectionClass(): ReflectionClass;
 

src/Proxy.php

@@ -14,12 +14,12 @@ interface Proxy
     /**
      * Marker for Proxy class names.
      */
-    public const MARKER = '__CG__';
+    public const string MARKER = '__CG__';
 
     /**
      * Length of the proxy marker.
      */
-    public const MARKER_LENGTH = 6;
+    public const int MARKER_LENGTH = 6;
 
     /**
      * Initializes this proxy if its not yet initialized.

tests/RuntimeReflectionPropertyTest.php

@@ -54,6 +54,7 @@ public function testGetValueOnProxyProperty(string $proxyClass): void
         $reflProperty = new RuntimeReflectionProperty($proxyClass, 'checkedProperty');
 
         self::assertSame('testValue', $reflProperty->getValue($mockProxy));
+        /** @phpstan-ignore unset.possiblyHookedProperty */
         unset($mockProxy->checkedProperty);
         self::assertNull($reflProperty->getValue($mockProxy));
     }