Merge branch 'doctrine-extensions:main' into patch-1

doctrine-extensions · Nov 22, 2024 · 1df60f4 · 1df60f4
2 parents 132d483 + 22418b1
commit 1df60f4
Show file tree

Hide file tree

Showing 164 changed files with 1,332 additions and 1,649 deletions.
diff --git a/.github/workflows/qa-dockerfile.yml b/.github/workflows/qa-dockerfile.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build "php" container
-        uses: isbang/compose-action@v2.0.1
+        uses: isbang/compose-action@v2.0.2
         with:
           compose-file: "./compose.yaml"
           services: |

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -83,6 +83,11 @@
         'static_lambda' => true,
         'strict_param' => true,
         'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => [
+                'arrays',
+            ],
+        ],
         // @todo: Change the following rule to `true` in the next major release.
         'void_return' => false,
     ])

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,12 +18,28 @@ 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)
+
+## [3.17.1] - 2024-10-07
+### Fixed
+- Removed invalid `@note` annotation from `AbstractLogEntry::$data`, which was causing issues in projects using annotation parsers
+
+## [3.17.0] - 2024-10-06
+### Added
+- Support for `doctrine/dbal` >= 4.0 with all extensions, except Loggable
+
+### Changed
+- Extend `Throwable` from `Gedmo\Exception` interface
 
-## [3.16.1]
+## [3.16.1] - 2024-06-25
 ### Fixed
 - Restructure the SqlWalkerCompat trait to fix optimized autoloading
 
-## [3.16.0]
+## [3.16.0] - 2024-06-24
 ### Added
 - Support for `doctrine/orm` 3
 - Blameable: Added UUID in allowed types list for Blameable fields in Annotation
@@ -39,7 +55,7 @@ a release.
 - Tree: Cascade remove not being triggered on entity children at `MaterializedPath::removeNode()`.
 - Tree: Materialize Path strategy when using autogenerated identifiers.
 
-## [3.15.0]
+## [3.15.0] - 2024-02-12
 ### Added
 - SoftDeleteable: `Gedmo\SoftDeleteable\Event\PreSoftDeleteEventArgs` and
   `Gedmo\SoftDeleteable\Event\PostSoftDeleteEventArgs` classes.
@@ -60,7 +76,7 @@ a release.
 - Add conflict against "doctrine/orm" >= 3.
 - Add conflict against "doctrine/dbal" => 4.
 
-## [3.14.0]
+## [3.14.0] - 2023-12-03
 ### Added
 - Support for Symfony 7
 - Tree: Added `@template` and `@template-extends` annotations to the Tree repositories

diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ can be easily implemented using Mapping extension to handle the additional metad
 
 ### Version Compatibility
 
-* DBAL: `^3.2`
+* DBAL: `^3.2` (for all the extensions) or `^4.0` (for all the extensions, except **Loggable**)
 * ORM: `^2.14` or `^3.0`
 * MongoDB ODM: `^2.3`
 

diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
     "require-dev": {
         "doctrine/annotations": "^1.13 || ^2.0",
         "doctrine/cache": "^1.11 || ^2.0",
-        "doctrine/dbal": "^3.2",
+        "doctrine/dbal": "^3.7 || ^4.0",
         "doctrine/doctrine-bundle": "^2.3",
         "doctrine/mongodb-odm": "^2.3",
         "doctrine/orm": "^2.14.0 || ^3.0",
@@ -73,7 +73,7 @@
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >=3.0",
-        "doctrine/dbal": "<3.2 || >=4.0",
+        "doctrine/dbal": "<3.7 || >=5.0",
         "doctrine/mongodb-odm": "<2.3 || >=3.0",
         "doctrine/orm": "<2.14.0 || 2.16.0 || 2.16.1 || >=4.0"
     },

diff --git a/doc/attributes.md b/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