Merge pull request #281 from doctrine/5.0.x-merge-up-into-5.1.x_xH9OAENJ

Merge release 5.0.1 into 5.1.x
doctrine · Oct 15, 2023 · 0d39e69 · 0d39e69
2 parents 2f0c146 + 334ee7f
commit 0d39e69
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -47,6 +47,7 @@
     "require": {
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "ext-mongodb": "*",
+        "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/doctrine-laminas-hydrator": "^3.3.0",
         "doctrine/doctrine-module": "^6.0.4",
         "doctrine/event-manager": "^1.2.0 || ^2.0.0",
@@ -87,8 +88,8 @@
     },
     "config": {
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         },
         "platform": {
             "ext-mongodb": "1.11.0"

diff --git a/src/Options/Configuration.php b/src/Options/Configuration.php
@@ -12,6 +12,8 @@
 
 /**
  * Configuration options for doctrine mongo
+ *
+ * @extends AbstractOptions<int|string|array<string, string>|null>
  */
 final class Configuration extends AbstractOptions
 {

diff --git a/src/Options/Connection.php b/src/Options/Connection.php
@@ -8,6 +8,8 @@
 
 /**
  * Connection options for doctrine mongo
+ *
+ * @extends AbstractOptions<int|string|array|null>
  */
 final class Connection extends AbstractOptions
 {

diff --git a/src/Options/DocumentManager.php b/src/Options/DocumentManager.php
@@ -8,6 +8,8 @@
 
 /**
  * Document manager options for doctrine mongo
+ *
+ * @extends AbstractOptions<string>
  */
 final class DocumentManager extends AbstractOptions
 {

diff --git a/src/Options/MongoLoggerCollector.php b/src/Options/MongoLoggerCollector.php
@@ -8,6 +8,8 @@
 
 /**
  * Configuration options for a collector
+ *
+ * @extends AbstractOptions<string>
  */
 final class MongoLoggerCollector extends AbstractOptions
 {

diff --git a/src/Service/ConfigurationFactory.php b/src/Service/ConfigurationFactory.php
@@ -4,6 +4,7 @@
 
 namespace DoctrineMongoODMModule\Service;
 
+use Doctrine\Common\Cache\Psr6\CacheAdapter;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\Types\Type;
 use DoctrineMongoODMModule\Options;
@@ -68,7 +69,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array|nu
         }
 
         // caching
-        $config->setMetadataCacheImpl($container->get($configurationOptions->getMetadataCache()));
+        $cache = $container->get($configurationOptions->getMetadataCache());
+        $config->setMetadataCache(CacheAdapter::wrap($cache));
 
         // Register filters
         foreach ($configurationOptions->getFilters() as $alias => $class) {

diff --git a/tests/Doctrine/ConfigurationFactoryTest.php b/tests/Doctrine/ConfigurationFactoryTest.php
@@ -5,6 +5,7 @@
 namespace DoctrineMongoODMModuleTest\Doctrine;
 
 use Doctrine\Common\Cache\Cache;
+use Doctrine\Common\Cache\Psr6\CacheAdapter;
 use Doctrine\ODM\MongoDB\APM\CommandLoggerInterface;
 use Doctrine\ODM\MongoDB\Configuration as Config;
 use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionFactory;
@@ -99,7 +100,7 @@ public function testCreation(): void
 
         $this->assertInstanceOf(Config::class, $config);
 
-        $this->assertSame($metadataCache, $config->getMetadataCacheImpl());
+        $this->assertEquals(CacheAdapter::wrap($metadataCache), $config->getMetadataCache());
         $this->assertSame($mappingDriver, $config->getMetadataDriverImpl());
 
         $this->assertSame(Config::AUTOGENERATE_EVAL, $config->getAutoGenerateProxyClasses());