Require PHP 8.4

It is going to be the requirement of the next versions of all our
packages.

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, methods, and
+properties.
+
 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",

config/dbal.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
@@ -36,15 +38,15 @@
         ->alias(Connection::class, 'database_connection')
         ->alias(ManagerRegistry::class, 'doctrine')
 
-        ->set('data_collector.doctrine', param('doctrine.data_collector.class'))
+        ->set('data_collector.doctrine', (string) param('doctrine.data_collector.class'))
             ->args([
                 service('doctrine'),
                 true,
                 service('doctrine.debug_data_holder')->nullOnInvalid(),
             ])
             ->tag('data_collector', ['template' => '@Doctrine/Collector/db.html.twig', 'id' => 'db', 'priority' => 250])
 
-        ->set('doctrine.dbal.connection_factory', param('doctrine.dbal.connection_factory.class'))
+        ->set('doctrine.dbal.connection_factory', (string) param('doctrine.dbal.connection_factory.class'))
             ->args([
                 param('doctrine.dbal.connection_factory.types'),
                 service('doctrine.dbal.connection_factory.dsn_parser'),
@@ -59,23 +61,23 @@
             ->abstract()
             ->factory([service('doctrine.dbal.connection_factory'), 'createConnection'])
 
-        ->set('doctrine.dbal.connection.event_manager', param('doctrine.dbal.connection.event_manager.class'))
+        ->set('doctrine.dbal.connection.event_manager', (string) param('doctrine.dbal.connection.event_manager.class'))
             ->abstract()
             ->args([
                 service('service_container'),
             ])
 
-        ->set('doctrine.dbal.connection.configuration', param('doctrine.dbal.configuration.class'))
+        ->set('doctrine.dbal.connection.configuration', (string) param('doctrine.dbal.configuration.class'))
             ->abstract()
 
-        ->set('doctrine', param('doctrine.class'))
+        ->set('doctrine', (string) param('doctrine.class'))
             ->public()
             ->args([
                 service('service_container'),
-                param('doctrine.connections'),
-                param('doctrine.entity_managers'),
-                param('doctrine.default_connection'),
-                param('doctrine.default_entity_manager'),
+                (string) param('doctrine.connections'),
+                (string) param('doctrine.entity_managers'),
+                (string) param('doctrine.default_connection'),
+                (string) param('doctrine.default_entity_manager'),
             ])
             ->tag('kernel.reset', ['method' => 'reset'])
 

config/messenger.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber;

config/middlewares.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use ArrayObject;

config/orm.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Doctrine\Bundle\DoctrineBundle\ManagerConfigurator;
@@ -114,13 +116,13 @@
 
         ->alias(EntityManagerInterface::class, 'doctrine.orm.entity_manager')
 
-        ->set('doctrine.orm.proxy_cache_warmer', param('doctrine.orm.proxy_cache_warmer.class'))
+        ->set('doctrine.orm.proxy_cache_warmer', (string) param('doctrine.orm.proxy_cache_warmer.class'))
             ->tag('kernel.cache_warmer')
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('form.type_guesser.doctrine', param('form.type_guesser.doctrine.class'))
+        ->set('form.type_guesser.doctrine', (string) param('form.type_guesser.doctrine.class'))
             ->tag('form.type_guesser')
             ->args([
                 service('doctrine'),
@@ -132,10 +134,10 @@
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.configuration', param('doctrine.orm.configuration.class'))
+        ->set('doctrine.orm.configuration', (string) param('doctrine.orm.configuration.class'))
             ->abstract()
 
-        ->set('doctrine.orm.entity_manager.abstract', param('doctrine.orm.entity_manager.class'))
+        ->set('doctrine.orm.entity_manager.abstract', (string) param('doctrine.orm.entity_manager.class'))
             ->abstract()
             ->lazy()
 
@@ -146,32 +148,32 @@
                 ]),
             ])
 
-        ->set('doctrine.orm.manager_configurator.abstract', param('doctrine.orm.manager_configurator.class'))
+        ->set('doctrine.orm.manager_configurator.abstract', (string) param('doctrine.orm.manager_configurator.class'))
             ->abstract()
             ->args([
                 [],
                 [],
             ])
 
-        ->set('doctrine.orm.validator.unique', param('doctrine.orm.validator.unique.class'))
+        ->set('doctrine.orm.validator.unique', (string) param('doctrine.orm.validator.unique.class'))
             ->tag('validator.constraint_validator', ['alias' => 'doctrine.orm.validator.unique'])
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.validator_initializer', param('doctrine.orm.validator_initializer.class'))
+        ->set('doctrine.orm.validator_initializer', (string) param('doctrine.orm.validator_initializer.class'))
             ->tag('validator.initializer')
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.security.user.provider', param('doctrine.orm.security.user.provider.class'))
+        ->set('doctrine.orm.security.user.provider', (string) param('doctrine.orm.security.user.provider.class'))
             ->abstract()
             ->args([
                 service('doctrine'),
             ])
 
-        ->set('doctrine.orm.listeners.resolve_target_entity', param('doctrine.orm.listeners.resolve_target_entity.class'))
+        ->set('doctrine.orm.listeners.resolve_target_entity', (string) param('doctrine.orm.listeners.resolve_target_entity.class'))
 
         ->set('doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener', DoctrineDbalCacheAdapterSchemaListener::class)
             ->args([
@@ -197,21 +199,21 @@
             ])
             ->tag('doctrine.event_listener', ['event' => 'postGenerateSchema'])
 
-        ->set('doctrine.orm.naming_strategy.default', param('doctrine.orm.naming_strategy.default.class'))
+        ->set('doctrine.orm.naming_strategy.default', (string) param('doctrine.orm.naming_strategy.default.class'))
 
-        ->set('doctrine.orm.naming_strategy.underscore', param('doctrine.orm.naming_strategy.underscore.class'))
+        ->set('doctrine.orm.naming_strategy.underscore', (string) param('doctrine.orm.naming_strategy.underscore.class'))
 
-        ->set('doctrine.orm.naming_strategy.underscore_number_aware', param('doctrine.orm.naming_strategy.underscore.class'))
+        ->set('doctrine.orm.naming_strategy.underscore_number_aware', (string) param('doctrine.orm.naming_strategy.underscore.class'))
             ->args([
                 CASE_LOWER,
                 true,
             ])
 
-        ->set('doctrine.orm.quote_strategy.default', param('doctrine.orm.quote_strategy.default.class'))
+        ->set('doctrine.orm.quote_strategy.default', (string) param('doctrine.orm.quote_strategy.default.class'))
 
-        ->set('doctrine.orm.quote_strategy.ansi', param('doctrine.orm.quote_strategy.ansi.class'))
+        ->set('doctrine.orm.quote_strategy.ansi', (string) param('doctrine.orm.quote_strategy.ansi.class'))
 
-        ->set('doctrine.orm.typed_field_mapper.default', param('doctrine.orm.typed_field_mapper.default.class'))
+        ->set('doctrine.orm.typed_field_mapper.default', (string) param('doctrine.orm.typed_field_mapper.default.class'))
 
         ->set('doctrine.ulid_generator', 'Symfony\\Bridge\\Doctrine\\IdGenerator\\UlidGenerator')
             ->args([

phpcs.xml.dist

@@ -11,16 +11,13 @@
     <!-- 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/Attribute/AsDoctrineListener.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Bundle\DoctrineBundle\Attribute;
 
 use Attribute;

src/Attribute/AsEntityListener.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Bundle\DoctrineBundle\Attribute;
 
 use Attribute;