Merge remote-tracking branch 'upstream/main' into fix-deprecations

.docker/php/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG PHP_VERSION=8.2-cli
+ARG PHP_VERSION=8.4-cli
 
 FROM composer:2 AS composer
 

.github/workflows/coding-standards.yml

@@ -19,7 +19,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "8.3"
+          php-version: "8.4"
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v3"
@@ -28,6 +28,8 @@ jobs:
 
       - name: "Run PHP-CS-Fixer"
         run: "vendor/bin/php-cs-fixer fix --ansi --verbose --diff --dry-run"
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: 1
 
   rector:
     name: "Rector"
@@ -40,7 +42,7 @@ jobs:
       - name: "Install PHP"
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           coverage: "none"
           tools: "composer:v2"
 
@@ -65,7 +67,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
           tools: composer:v2, composer-normalize:2
         env:

.github/workflows/continuous-integration.yml

@@ -29,6 +29,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         deps:
           - "highest"
         no-annotations:
@@ -39,20 +40,20 @@ jobs:
           - deps: "lowest"
             php-version: "7.4"
           - deps: "highest"
-            php-version: "8.3"
+            php-version: "8.4"
           # Run builds on low and high PHP versions with `doctrine/annotations` removed
           - deps: "highest"
             php-version: "7.4"
             no-annotations: true
           - deps: "highest"
-            php-version: "8.3"
+            php-version: "8.4"
             no-annotations: true
           # Run builds on high PHP version with `doctrine/orm` version pinned
           - deps: "highest"
-            php-version: "8.3"
+            php-version: "8.4"
             orm: "^2.14"
           - deps: "highest"
-            php-version: "8.3"
+            php-version: "8.4"
             orm: "^3.0"
 
     steps:
@@ -140,7 +141,7 @@ jobs:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v4"
+        uses: "codecov/codecov-action@v5"
         with:
           directory: reports
           token: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/qa-dockerfile.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build "php" container
-        uses: isbang/[email protected].1
+        uses: isbang/[email protected].2
         with:
           compose-file: "./compose.yaml"
           services: |

.github/workflows/qa.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
           extensions: mongodb, zip
           tools: composer:v2

CHANGELOG.md

@@ -18,6 +18,9 @@ a release.
 ---
 
 ## [Unreleased]
+### Deprecated
+- Sluggable: Annotation-specific mapping parameters (#2837)
+
 ### Fixed
 - Fix regression with `doctrine/dbal` >= 4.0 that caused MariaDB to improperly attempt LONGTEXT casting in `TranslationWalker` (issue #2887)
 

compose.yaml

@@ -5,7 +5,7 @@ services:
       target: php
       dockerfile: ./.docker/php/Dockerfile
       args:
-        PHP_VERSION: ${PHP_VERSION:-8.3-cli}
+        PHP_VERSION: ${PHP_VERSION:-8.4-cli}
     volumes:
       - .:/var/www
     working_dir: /var/www

doc/attributes.md

@@ -474,7 +474,8 @@ Optional Parameters:
 
 - **suffix** - An optional suffix for the generated slug
 
-- **handlers** - Unused with attributes
+- **handlers** - Deprecated to be removed in 4.0, this parameter is unused with attributes in favor of
+                 the `SlugHandler` attribute
 
 Basic Example:
 
@@ -552,8 +553,8 @@ class Article
 
 #### `#[Gedmo\Mapping\Annotation\SlugHandlerOption]`
 
-The `SlugHandlerOption` attribute is not supported when using attributes for configuration. Instead, the options
-can be configured directly in the `SlugHandler` attribute's **options** parameter.
+> [!WARNING]
+> The `SlugHandlerOption` attribute is deprecated and will be removed in 4.0. Using this attribute is not supported, and instead, the options can be configured directly in the `SlugHandler` attribute's **options** parameter.
 
 ### Soft Deleteable Extension