[SoftDeleteable] Remove dollar sign from cache key

.github/workflows/qa-dockerfile.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Lint Dockerfile
-        uses: hadolint/hadolint-action@v3.2.0
+        uses: hadolint/hadolint-action@v3.3.0
         with:
           dockerfile: ".docker/php/Dockerfile"
 

CHANGELOG.md

@@ -18,22 +18,23 @@ a release.
 ---
 
 ## [Unreleased]
+### Fixed
+- SoftDeleteable: Remove dollar sign ($) from the default cache key of soft deleteable metadata - to be compatible with stricter cache key naming conventions (#2978)
+
+## [3.21.0] - 2025-09-22
 ### Added
-- SoftDeleteable: Add option to enable or disable handling of the `postFlush` event (#2958)
+- SoftDeleteable: `$handlePostFlushEvent` parameter to `SoftDeleteableListener::__construct()` to enable or disable handling of the `postFlush` event (#2958)
 
 ### Changed
 - Translatable: Optimized database indexes for better performance by reordering unique constraint fields and removing redundant indexes
-- SoftDeleteable: Handling of the `postFlush` event is now disabled by default (#2958)
-
-### Fixed
-- SoftDeleteable: Prevent cascade persist from re-inserting soft-deleted entities still referenced in the identity map (#2958)
-
-### Changed
+- SoftDeleteable: Handling of the `postFlush` event is disabled by default (#2958)
 - Sluggable: Replaced abandoned `behat/transliterator` with `symfony/string` for default transliteration and urlization steps (#2985)
-- Use `ClassMetadata::getFieldValue()` and `ClassMetadata::setFieldValue(` methods to support `doctrine/orm` >= 3.4 (#2966)
+- Use `ClassMetadata::getFieldValue()` and `ClassMetadata::setFieldValue()` methods to support `doctrine/orm` >= 3.4 (#2966)
 
 ### Fixed
+- SoftDeleteable: Prevent cascade persist from re-inserting soft-deleted entities still referenced in the identity map (#2958)
 - Sluggable: Fix type error when generating slug using embedded properties (#2965)
+- SoftDeleteable: Remove dollar sign ($) from the default cache key of soft deleteable metadata - to be compatible with stricter cache key naming conventions (#2978)
 
 ## [3.20.1] - 2025-09-14
 ### Fixed

composer.json

@@ -68,7 +68,7 @@
         "rector/rector": "^2.0.6",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/phpunit-bridge": "^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
         "symfony/uid": "^5.4 || ^6.0 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
     },

phpunit.xml.dist

@@ -67,7 +67,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="ignoreFile=./tests/symfony-deprecations-baseline&amp;max[self]=0" />
         <env name="MONGODB_SERVER" value="mongodb://mongodb:27017"/>
     </php>
     <listeners>

src/DoctrineExtensions.php

@@ -30,7 +30,7 @@ final class DoctrineExtensions
     /**
      * Current version of extensions
      */
-    public const VERSION = '3.20.1';
+    public const VERSION = '3.21.0';
 
     /**
      * Hooks all extension metadata mapping drivers into

src/Mapping/ExtensionMetadataFactory.php

@@ -181,7 +181,7 @@ public function getExtensionMetadata($meta)
      */
     public static function getCacheId($className, $extensionNamespace)
     {
-        return str_replace('\\', '_', $className).'_$'.strtoupper(str_replace('\\', '_', $extensionNamespace)).'_CLASSMETADATA';
+        return str_replace('\\', '_', $className).'__'.strtoupper(str_replace('\\', '_', $extensionNamespace)).'_CLASSMETADATA';
     }
 
     /**

tests/symfony-deprecations-baseline

@@ -0,0 +1,6 @@
+# Ignore MongoDB deprecations from low dependencies
+%Passing an integer mode to "MongoDB\\Driver\\ReadPreference::__construct" is deprecated%
+# Ignore deprecated ORM 2.x proxies
+%class implements "Doctrine\\ORM\\Proxy\\Proxy" that is deprecated%
+# Ignore symfony/var-dumper lazy ghost deprecations (required for PHP 8.3 and earlier compat)
+%Using ProxyHelper::generateLazyGhost() is deprecated%