Support for doctrine cache 2

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": "~8.1.0 || ~8.2.0",
         "doctrine/annotations": "^1.14.2 || ^2.0",
-        "doctrine/cache": "^1.13.0",
+        "doctrine/cache": "^2.0",
         "doctrine/common": "^3.4.3",
         "doctrine/dbal": "^3.5.3",
         "doctrine/event-manager": "^1.2.0 || ^2.0",

example/full-config.php

@@ -3,32 +3,23 @@
 declare(strict_types=1);
 
 use App\Doctrine\CustomCacheProvider;
-use Doctrine\Common\Cache\ApcuCache;
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\ChainCache;
-use Doctrine\Common\Cache\FilesystemCache;
-use Doctrine\Common\Cache\MemcacheCache;
-use Doctrine\Common\Cache\MemcachedCache;
-use Doctrine\Common\Cache\PhpFileCache;
-use Doctrine\Common\Cache\PredisCache;
-use Doctrine\Common\Cache\RedisCache;
-use Doctrine\Common\Cache\WinCacheCache;
-use Doctrine\Common\Cache\XcacheCache;
-use Doctrine\Common\Cache\ZendDataCache;
 use Doctrine\DBAL\Driver\PDOMySql\Driver;
 use Doctrine\Migrations\Configuration\Migration\ConfigurationLoader;
 use Doctrine\Migrations\DependencyFactory;
 use Doctrine\Migrations\Tools\Console\Command;
+use Psr\Container\ContainerInterface;
 use Roave\PsrContainerDoctrine\ConfigurationLoaderFactory;
 use Roave\PsrContainerDoctrine\Migrations\CommandFactory;
 use Roave\PsrContainerDoctrine\Migrations\DependencyFactoryFactory;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
 return [
     'doctrine' => [
         'configuration' => [
             'orm_default' => [
                 'result_cache' => 'array',
-                'metadata_cache' => 'array',
+                'metadata_cache' => 'filesystem',
                 'query_cache' => 'array',
                 'hydration_cache' => 'array',
                 'driver' => 'orm_default', // Actually defaults to the configuration config key, not hard-coded
@@ -100,64 +91,17 @@
             ],
         ],
         'cache' => [
-            'apcu' => [
-                'class' => ApcuCache::class,
-                'namespace' => 'psr-container-doctrine',
-            ],
             'array' => [
-                'class' => ArrayCache::class,
-                'namespace' => 'psr-container-doctrine',
+                'class' => ArrayAdapter::class,
             ],
             'filesystem' => [
-                'class' => FilesystemCache::class,
-                'directory' => 'data/cache/DoctrineCache',
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'memcache' => [
-                'class' => MemcacheCache::class,
-                'instance' => 'my_memcache_alias',
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'memcached' => [
-                'class' => MemcachedCache::class,
-                'instance' => 'my_memcached_alias',
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'phpfile' => [
-                'class' => PhpFileCache::class,
+                'class' => FilesystemAdapter::class,
                 'directory' => 'data/cache/DoctrineCache',
                 'namespace' => 'psr-container-doctrine',
             ],
-            'predis' => [
-                'class' => PredisCache::class,
-                'instance' => 'my_predis_alias',
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'redis' => [
-                'class' => RedisCache::class,
-                'instance' => 'my_redis_alias',
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'wincache' => [
-                'class' => WinCacheCache::class,
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'xcache' => [
-                'class' => XcacheCache::class,
-                'namespace' => 'psr-container-doctrine',
-            ],
-            'zenddata' => [
-                'class' => ZendDataCache::class,
-                'namespace' => 'psr-container-doctrine',
-            ],
             'my_cache_provider' => [
                 'class' => CustomCacheProvider::class, //The class is looked up in the container
             ],
-            'chain' => [
-                'class' => ChainCache::class,
-                'providers' => ['array', 'redis'], // you can use any provider listed above
-                'namespace' => 'psr-container-doctrine', // will be applied to all providers in the chain
-            ],
         ],
         'types' => [],
         'migrations' => [
@@ -193,6 +137,16 @@
 
             DependencyFactory::class => DependencyFactoryFactory::class,
             ConfigurationLoader::class => ConfigurationLoaderFactory::class,
+
+            FilesystemAdapter::class => static function (ContainerInterface $container): FilesystemAdapter {
+                $config = $container->get('config');
+                $params = $config['doctrine']['cache']['filesystem'];
+
+                return new FilesystemAdapter(
+                    $params['namespace'],
+                    $params['directory'],
+                );
+            },
         ],
     ],
 ];

example/minimal-config.php

@@ -19,7 +19,6 @@
             ],
             'my_entity' => [
                 'class' => XmlDriver::class,
-                'cache' => 'array',
                 'paths' => __DIR__ . '/doctrine',
             ],
         ],

psalm.xml.dist

@@ -30,18 +30,6 @@
         </InternalClass>
         <DeprecatedClass>
             <errorLevel type="suppress">
-                <referencedClass name="Doctrine\Common\Cache\ApcuCache"/>
-                <referencedClass name="Doctrine\Common\Cache\ArrayCache"/>
-                <referencedClass name="Doctrine\Common\Cache\Cache"/>
-                <referencedClass name="Doctrine\Common\Cache\CacheProvider"/>
-                <referencedClass name="Doctrine\Common\Cache\ChainCache"/>
-                <referencedClass name="Doctrine\Common\Cache\FilesystemCache"/>
-                <referencedClass name="Doctrine\Common\Cache\MemcachedCache"/>
-                <referencedClass name="Doctrine\Common\Cache\PhpFileCache"/>
-                <referencedClass name="Doctrine\Common\Cache\PredisCache"/>
-                <referencedClass name="Doctrine\Common\Cache\RedisCache"/>
-                <referencedClass name="Doctrine\Common\Cache\WinCacheCache"/>
-                <referencedClass name="Doctrine\Common\Cache\ZendDataCache"/>
                 <referencedClass name="Doctrine\Common\Annotations\CachedReader"/>
                 <referencedClass name="Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver"/>
                 <referencedClass name="Doctrine\Persistence\Mapping\Driver\AnnotationDriver"/>

src/Cache/NullCache.php

@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Roave\PsrContainerDoctrine\Cache;
+
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+
+final class NullCache implements CacheItemPoolInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getItem($key): CacheItemInterface
+    {
+        return new NullCacheItem($key);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItems(array $keys = []): iterable
+    {
+        foreach ($keys as $key) {
+            yield $key => $this->getItem($key);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasItem($key): bool
+    {
+        return false;
+    }
+
+    public function clear(): bool
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteItem($key): bool
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteItems(array $keys): bool
+    {
+        return true;
+    }
+
+    public function save(CacheItemInterface $item): bool
+    {
+        return true;
+    }
+
+    public function saveDeferred(CacheItemInterface $item): bool
+    {
+        return true;
+    }
+
+    public function commit(): bool
+    {
+        return true;
+    }
+}

src/Cache/NullCacheItem.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Roave\PsrContainerDoctrine\Cache;
+
+use Psr\Cache\CacheItemInterface;
+
+final class NullCacheItem implements CacheItemInterface
+{
+    public function __construct(
+        private readonly string $key,
+    ) {
+    }
+
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    public function get(): mixed
+    {
+        return null;
+    }
+
+    public function isHit(): bool
+    {
+        return false;
+    }
+
+    public function set(mixed $value): static
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function expiresAt($expiration): static
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function expiresAfter($time): static
+    {
+        return $this;
+    }
+}