Merge pull request #1980 from greg0ire/require-php-84

Require PHP 8.4

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -37,9 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
+          - "8.4"
         dependencies:
           - "highest"
         stability:
@@ -52,7 +50,7 @@ jobs:
           # Tests the lowest set of dependencies
           - dependencies: "lowest"
             stability: "stable"
-            php-version: "8.1"
+            php-version: "8.4"
 
           # Test LTS
           - symfony-require: "6.4.*"

UPGRADE-3.0.md

@@ -7,6 +7,8 @@ Compatibility
 Configuring caching options to use services backed by `doctrine/cache` is no
 longer supported. Migrate to PSR-6 services instead.
 
+The minimum required PHP version is now 8.4.
+
 Support for the following major versions of the following packages has been dropped:
 
 - `doctrine/dbal` 3
@@ -73,6 +75,12 @@ You should use stop passing an event manager argument.
 + $connectionFactory->createConnection($params, $config, $mappingTypes)
 ```
 
+Type declarations
+-----------------
+
+Native type declarations have been added to all constants, properties, and
+methods.
+
 Types
 -----
 

composer.json

@@ -29,7 +29,7 @@
     ],
     "homepage": "https://www.doctrine-project.org",
     "require": {
-        "php": "^8.1",
+        "php": "^8.4",
         "doctrine/dbal": "^4.0",
         "doctrine/persistence": "^4",
         "doctrine/sql-formatter": "^1.0.1",

phpcs.xml.dist

@@ -11,16 +11,14 @@
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>
 
-    <config name="php_version" value="80100"/>
+    <config name="php_version" value="80400"/>
 
     <file>config</file>
     <file>src</file>
     <file>tests</file>
 
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/> <!-- we can do it in doctrine-bundle 3.0-->
-        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/> <!-- we can do it in doctrine-bundle 3.0 -->
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
     </rule>

src/Command/DoctrineCommand.php

@@ -21,18 +21,13 @@ public function __construct(
 
     /**
      * Get a doctrine dbal connection by symfony name.
-     *
-     * @param string $name
-     *
-     * @return Connection
      */
-    protected function getDoctrineConnection($name)
+    protected function getDoctrineConnection(string $name): Connection
     {
         return $this->getDoctrine()->getConnection($name);
     }
 
-    /** @return ManagerRegistry */
-    protected function getDoctrine()
+    protected function getDoctrine(): ManagerRegistry
     {
         return $this->doctrine;
     }

src/Command/DropDatabaseDoctrineCommand.php

@@ -23,12 +23,11 @@
  */
 class DropDatabaseDoctrineCommand extends DoctrineCommand
 {
-    public const RETURN_CODE_NOT_DROP = 1;
+    public const int RETURN_CODE_NOT_DROP = 1;
 
-    public const RETURN_CODE_NO_FORCE = 2;
+    public const int RETURN_CODE_NO_FORCE = 2;
 
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('doctrine:database:drop')

src/ConnectionFactory.php

@@ -28,7 +28,7 @@
 class ConnectionFactory
 {
     /** @internal */
-    public const DEFAULT_SCHEME_MAP = [
+    public const array DEFAULT_SCHEME_MAP = [
         'db2'        => 'ibm_db2',
         'mssql'      => 'pdo_sqlsrv',
         'mysql'      => 'pdo_mysql',
@@ -59,14 +59,12 @@ public function __construct(
      * @param mixed[]               $params
      * @param array<string, string> $mappingTypes
      * @phpstan-param Params $params
-     *
-     * @return Connection
      */
     public function createConnection(
         array $params,
         Configuration|null $config = null,
         array $mappingTypes = [],
-    ) {
+    ): Connection {
         if (! $this->initialized) {
             $this->initializeTypes();
         }

src/Controller/ProfilerController.php

@@ -30,13 +30,11 @@ public function __construct(
     /**
      * Renders the profiler panel for the given token.
      *
-     * @param string $token          The profiler token
-     * @param string $connectionName
-     * @param int    $query
+     * @param string $token The profiler token
      *
      * @return Response A Response instance
      */
-    public function explainAction($token, $connectionName, $query)
+    public function explainAction(string $token, string $connectionName, int $query): Response
     {
         $this->profiler->disable();
 

src/DataCollector/DoctrineDataCollector.php

@@ -186,37 +186,33 @@ public function collect(Request $request, Response $response, Throwable|null $ex
     }
 
     /** @return array<string, array<class-string, array{class: class-string, file: false|string, line: false|int}>> */
-    public function getEntities()
+    public function getEntities(): array
     {
         return $this->data['entities'];
     }
 
     /** @return array<string, array<string, list<string>>> */
-    public function getMappingErrors()
+    public function getMappingErrors(): array
     {
         return $this->data['errors'];
     }
 
-    /** @return int */
-    public function getCacheHitsCount()
+    public function getCacheHitsCount(): int
     {
         return $this->data['caches']['counts']['hits'];
     }
 
-    /** @return int */
-    public function getCachePutsCount()
+    public function getCachePutsCount(): int
     {
         return $this->data['caches']['counts']['puts'];
     }
 
-    /** @return int */
-    public function getCacheMissesCount()
+    public function getCacheMissesCount(): int
     {
         return $this->data['caches']['counts']['misses'];
     }
 
-    /** @return bool */
-    public function getCacheEnabled()
+    public function getCacheEnabled(): bool
     {
         return $this->data['caches']['enabled'];
     }
@@ -225,19 +221,18 @@ public function getCacheEnabled()
      * @return array<string, array<string, int>>
      * @phpstan-return array<"puts"|"hits"|"misses", array<string, int>>
      */
-    public function getCacheRegions()
+    public function getCacheRegions(): array
     {
         return $this->data['caches']['regions'];
     }
 
     /** @return array<string, int> */
-    public function getCacheCounts()
+    public function getCacheCounts(): array
     {
         return $this->data['caches']['counts'];
     }
 
-    /** @return int */
-    public function getInvalidEntityCount()
+    public function getInvalidEntityCount(): int
     {
         return $this->invalidEntityCount ??= array_sum(array_map('count', $this->data['errors']));
     }
@@ -266,7 +261,7 @@ public function getManagedEntityCountByClass(): array
      * @return string[][]
      * @phpstan-return array<string, list<QueryType&array{count: int, index: int, executionPercent?: float}>>
      */
-    public function getGroupedQueries()
+    public function getGroupedQueries(): array
     {
         if ($this->groupedQueries !== null) {
             return $this->groupedQueries;
@@ -319,8 +314,7 @@ private function executionTimePercentage(float $executionTimeMS, float $totalExe
         return $executionTimeMS / $totalExecutionTimeMS * 100;
     }
 
-    /** @return int */
-    public function getGroupedQueryCount()
+    public function getGroupedQueryCount(): int
     {
         $count = 0;
         foreach ($this->getGroupedQueries() as $connectionGroupedQueries) {

src/Dbal/BlacklistSchemaAssetFilter.php

@@ -15,8 +15,7 @@ public function __construct(
     ) {
     }
 
-    /** @param string|AbstractAsset $assetName */
-    public function __invoke($assetName): bool
+    public function __invoke(string|AbstractAsset $assetName): bool
     {
         if ($assetName instanceof AbstractAsset) {
             $assetName = $assetName->getName();