Remove support for Symfony 5

Author: derrabus

.github/workflows/continuous-integration.yml

@@ -21,10 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         dependencies:
           - "highest"
         stability:
@@ -37,32 +36,27 @@ jobs:
           # Tests the lowest set of dependencies
           - dependencies: "lowest"
             stability: "stable"
-            php-version: "7.4"
+            php-version: "8.1"
 
           # Test LTS
-          - symfony-require: "5.4.*"
-            dependencies: "highest"
-            php-version: "8.0"
-
-          # Test last supported minor version
           - symfony-require: "6.*"
             dependencies: "highest"
-            php-version: "8.3"
+            php-version: "8.1"
 
           # DBAL only without ORM
-          - php-version: "8.3"
+          - php-version: "8.4"
             dependencies: "highest"
             stability: "stable"
             remove-orm: true
 
           # DBAL 4
-          - php-version: "8.3"
+          - php-version: "8.4"
             dependencies: "highest"
             stability: "dev"
             remove-orm: true
 
           # Bleeding edge
-          - php-version: "8.3"
+          - php-version: "8.4"
             dependencies: "highest"
             stability: "dev"
 
@@ -83,7 +77,7 @@ jobs:
 
       - name: "Require symfony/messenger"
         run: "composer require --dev symfony/messenger --no-update"
-        if: "${{ startsWith(matrix.symfony-require, '5.') }}"
+        if: "${{ startsWith(matrix.symfony-require, '6.') }}"
 
       - name: "Enforce using stable dependencies"
         run: "composer config minimum-stability stable"
@@ -93,6 +87,10 @@ jobs:
         run: "composer remove doctrine/orm --dev --no-update"
         if: "${{ matrix.remove-orm }}"
 
+      - name: "Remove Psalm"
+        run: "composer remove vimeo/psalm psalm/plugin-phpunit psalm/plugin-symfony --dev --no-update"
+        if: "${{ matrix.php-version == '8.4' }}"
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v3"
         with:

.github/workflows/static-analysis.yml

@@ -22,7 +22,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "8.2"
+          php-version: "8.3"
 
       - name: "Enforce using stable dependencies"
         run: "composer config minimum-stability stable"

composer.json

@@ -29,56 +29,56 @@
     ],
     "homepage": "https://www.doctrine-project.org",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/dbal": "^3.7.0 || ^4.0",
         "doctrine/persistence": "^2.2 || ^3",
         "doctrine/sql-formatter": "^1.0.1",
-        "symfony/cache": "^5.4 || ^6.0 || ^7.0",
-        "symfony/config": "^5.4 || ^6.0 || ^7.0",
-        "symfony/console": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/cache": "^6.4 || ^7.0",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
         "symfony/deprecation-contracts": "^2.1 || ^3",
-        "symfony/doctrine-bridge": "^5.4.46 || ~6.3.12 || ^6.4.3 || ^7.0.3",
-        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/polyfill-php80": "^1.15",
-        "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3"
+        "symfony/doctrine-bridge": "^6.4.3 || ^7.0.3",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/service-contracts": "^2.5 || ^3"
     },
     "require-dev": {
         "doctrine/annotations": "^1 || ^2",
         "doctrine/coding-standard": "^12",
         "doctrine/deprecations": "^1.0",
         "doctrine/orm": "^2.17 || ^3.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "phpunit/phpunit": "^9.5.26",
-        "psalm/plugin-phpunit": "^0.18.4",
+        "phpunit/phpunit": "^9.6.22",
+        "psalm/plugin-phpunit": "^0.19.0",
         "psalm/plugin-symfony": "^5",
         "psr/log": "^1.1.4 || ^2.0 || ^3.0",
-        "symfony/phpunit-bridge": "^6.1 || ^7.0",
-        "symfony/property-info": "^5.4 || ^6.0 || ^7.0",
-        "symfony/proxy-manager-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/security-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0",
-        "symfony/string": "^5.4 || ^6.0 || ^7.0",
-        "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/validator": "^5.4 || ^6.0 || ^7.0",
-        "symfony/var-exporter": "^5.4 || ^6.2 || ^7.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
-        "twig/twig": "^1.34 || ^2.12 || ^3.0",
+        "symfony/phpunit-bridge": "^7.2",
+        "symfony/property-info": "^6.4 || ^7.0",
+        "symfony/proxy-manager-bridge": "^6.4 || ^7.0",
+        "symfony/security-bundle": "^6.4 || ^7.0",
+        "symfony/stopwatch": "^6.4 || ^7.0",
+        "symfony/string": "^6.4 || ^7.0",
+        "symfony/twig-bridge": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0",
+        "symfony/var-exporter": "^6.4.1 || ^7.0.1",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0",
+        "twig/twig": "^2.13 || ^3.0.4",
         "vimeo/psalm": "^5.15"
     },
     "conflict": {
         "doctrine/annotations": ">=3.0",
         "doctrine/orm": "<2.17 || >=4.0",
-        "twig/twig": "<1.34 || >=2.0 <2.4"
+        "symfony/var-exporter": "< 6.4.1 || 7.0.0",
+        "twig/twig": "<2.13 || >=3.0 <3.0.4"
     },
     "suggest": {
         "ext-pdo": "*",
         "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
         "symfony/web-profiler-bundle": "To use the data collector."
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "autoload": {
         "psr-4": {
             "Doctrine\\Bundle\\DoctrineBundle\\": "src"

config/messenger.xml

@@ -51,10 +51,6 @@
             <tag name="messenger.transport_factory" />
         </service>
 
-        <service id="doctrine.orm.messenger.doctrine_schema_subscriber" class="Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaSubscriber">
-            <argument type="tagged_iterator" tag="messenger.receiver" />
-            <tag name="doctrine.event_subscriber" />
-        </service>
         <service id="doctrine.orm.messenger.doctrine_schema_listener" class="Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaListener">
             <argument type="tagged_iterator" tag="messenger.receiver" />
             <tag name="doctrine.event_listener" event="postGenerateSchema" />

config/orm.xml

@@ -135,22 +135,10 @@
 
         <!-- listeners -->
         <service id="doctrine.orm.listeners.resolve_target_entity" class="%doctrine.orm.listeners.resolve_target_entity.class%" public="false" />
-        <service id="doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_subscriber" class="Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber">
-            <argument type="collection" /> <!-- DoctrineDbalAdapter instances -->
-            <tag name="doctrine.event_subscriber" />
-        </service>
         <service id="doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener" class="Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaListener">
             <argument type="collection" /> <!-- DoctrineDbalAdapter instances -->
             <tag name="doctrine.event_listener" event="postGenerateSchema" />
         </service>
-        <service id="doctrine.orm.listeners.pdo_cache_adapter_doctrine_schema_subscriber" class="Symfony\Bridge\Doctrine\SchemaListener\PdoCacheAdapterDoctrineSchemaSubscriber">
-            <argument type="collection" /> <!-- PdoAdapter instances -->
-            <tag name="doctrine.event_subscriber" />
-        </service>
-        <service id="doctrine.orm.listeners.doctrine_token_provider_schema_subscriber" class="Symfony\Bridge\Doctrine\SchemaListener\RememberMeTokenProviderDoctrineSchemaSubscriber">
-            <argument type="tagged_iterator" tag="security.remember_me_handler" />
-            <tag name="doctrine.event_subscriber" />
-        </service>
         <service id="doctrine.orm.listeners.doctrine_token_provider_schema_listener" class="Symfony\Bridge\Doctrine\SchemaListener\RememberMeTokenProviderDoctrineSchemaListener">
             <argument type="tagged_iterator" tag="security.remember_me_handler" />
             <tag name="doctrine.event_listener" event="postGenerateSchema" />

phpcs.xml.dist

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

src/Attribute/AsDoctrineListener.php

@@ -12,8 +12,8 @@ class AsDoctrineListener
 {
     public function __construct(
         public string $event,
-        public ?int $priority = null,
-        public ?string $connection = null,
+        public int|null $priority = null,
+        public string|null $connection = null,
     ) {
     }
 }

src/Attribute/AsEntityListener.php

@@ -11,12 +11,12 @@
 class AsEntityListener
 {
     public function __construct(
-        public ?string $event = null,
-        public ?string $method = null,
-        public ?bool $lazy = null,
-        public ?string $entityManager = null,
-        public ?string $entity = null,
-        public ?int $priority = null,
+        public string|null $event = null,
+        public string|null $method = null,
+        public bool|null $lazy = null,
+        public string|null $entityManager = null,
+        public string|null $entity = null,
+        public int|null $priority = null,
     ) {
     }
 }

src/Attribute/AsMiddleware.php

@@ -10,7 +10,7 @@ class AsMiddleware
     /** @param string[] $connections */
     public function __construct(
         public array $connections = [],
-        public ?int $priority = null,
+        public int|null $priority = null,
     ) {
     }
 }

src/CacheWarmer/DoctrineMetadataCacheWarmer.php

@@ -13,14 +13,10 @@
 /** @final since 2.11 */
 class DoctrineMetadataCacheWarmer extends AbstractPhpFileCacheWarmer
 {
-    private EntityManagerInterface $entityManager;
-    private string $phpArrayFile;
-
-    public function __construct(EntityManagerInterface $entityManager, string $phpArrayFile)
-    {
-        $this->entityManager = $entityManager;
-        $this->phpArrayFile  = $phpArrayFile;
-
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly string $phpArrayFile,
+    ) {
         parent::__construct($phpArrayFile);
     }
 
@@ -32,7 +28,7 @@ public function isOptional(): bool
         return false;
     }
 
-    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string|null $buildDir = null): bool
     {
         // cache already warmed up, no needs to do it again
         if (is_file($this->phpArrayFile)) {