Amend based on feedback from #807.

doctrine · Jun 9, 2023 · 3c971d0 · 3c971d0
1 parent 11edab0
commit 3c971d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -117,10 +117,7 @@ public function getValidatorConfig(): array
      */
     public function getCachesConfig(): array
     {
-        $defaultOptions = [
-            'namespace' => 'DoctrineModule',
-            'key_pattern' => '/^[a-z0-9_\+\-\[\]\\\\$#]*$/Di',
-        ];
+        $defaultOptions = ['namespace' => 'DoctrineModule'];
 
         return [
             'doctrinemodule.cache.apcu' => [
@@ -133,7 +130,11 @@ public function getCachesConfig(): array
             ],
             'doctrinemodule.cache.filesystem' => [
                 'adapter' => 'filesystem',
-                'options' => $defaultOptions + ['cache_dir' => 'data/DoctrineModule/cache'],
+                'options' => $defaultOptions + [
+                    'cache_dir' => 'data/DoctrineModule/cache',
+                    // We need to be slightly less restrictive than Filesystem defaults:
+                    'key_pattern' => '/^[a-z0-9_\+\-\[\]\\\\$#]*$/Di',
+                ],
                 'plugins' => [['name' => 'serializer']],
             ],
             'doctrinemodule.cache.memcached' => [

diff --git a/tests/ConfigProviderTest.php b/tests/ConfigProviderTest.php
@@ -39,8 +39,8 @@ public function testInvokeHasCorrectKeys(): void
 
     public function testDoctrineCompatibleCacheKeyConfiguration(): void
     {
-        $config = (new ConfigProvider())->getCachesConfig()['doctrinemodule.cache.array'];
-        $adapter = new \Laminas\Cache\Storage\Adapter\Memory($config['options']);
+        $config = (new ConfigProvider())->getCachesConfig()['doctrinemodule.cache.filesystem'];
+        $adapter = new \Laminas\Cache\Storage\Adapter\Filesystem($config['options']);
         $key = 'MyTestKey[something\inside\here#with$specialChars]';
         $adapter->setItem($key, 'foo');
         $this->assertEquals('foo', $adapter->getItem($key));