Remove requirement to doctrine/cache

Author: alexander-schranz

DependencyInjection/ONGRElasticsearchExtension.php

@@ -29,9 +29,7 @@ class ONGRElasticsearchExtension extends Extension implements PrependExtensionIn
 {
     public function prepend(ContainerBuilder $container)
     {
-        if ($container->hasExtension('framework')
-            && \class_exists(\Doctrine\Common\Annotations\PsrCachedReader::class)
-        ) {
+        if ($container->hasExtension('framework')) {
             $container->prependExtensionConfig(
                 'framework',
                 [
@@ -89,26 +87,5 @@ public function load(array $configs, ContainerBuilder $container)
         );
         $definition->setPublic(true);
         $container->setDefinition('es.manager_factory', $definition);
-
-        if (!\class_exists(\Doctrine\Common\Annotations\PsrCachedReader::class)) {
-            $container->setDefinition('es.cache_engine', (new Definition(
-                \Doctrine\Common\Cache\FilesystemCache::class,
-                [
-                    '%kernel.cache_dir%/ongr/elasticsearch',
-                    '.ongr.data',
-                ]
-            ))->setPublic(true));
-        }
-
-        $container->setDefinition('es.annotations.cached_reader', (new Definition(
-            \class_exists(\Doctrine\Common\Annotations\PsrCachedReader::class)
-                ? \Doctrine\Common\Annotations\PsrCachedReader::class
-                : \Doctrine\Common\Annotations\CachedReader::class,
-            [
-                new Reference('annotations.reader'),
-                new Reference('es.cache_engine'),
-                '%kernel.debug%',
-            ]
-        ))->setPublic(true));
     }
 }

README.md

@@ -5,7 +5,7 @@ With some basic changes to support wider range of Symfony Versions.
 
 | Version     | Supported Elasticsearch Version | Supported Symfony Version      | Supported Doctrine Annotations Version |
 |-------------|---------------------------------|--------------------------------|----------------------------------------|
-| `5.5`       | `^7.0, ^6.0, ^5.0`              | `^6.0, ^5.0, ^4.0, ^3.4`       | `^1.10, ^2.0`                          |
+| `5.5`       | `^7.0, ^6.0, ^5.0`              | `^6.0, ^5.0, ^4.0, ^3.4`       | `^1.13, ^2.0`                          |
 | `5.0 - 5.4` | `^7.0, ^6.0, ^5.0`              | `^6.0, ^5.0, ^4.0, ^3.4, ^2.8` | `^1.0`                                 |
 | `1.x`       | `^1.0, ^2.0`                    | `^3.0, ^2.7`                   | `^1.0`                                 |
 

Resources/config/services.yml

@@ -15,6 +15,11 @@ services:
         class: 'ONGR\ElasticsearchBundle\Service\IndexSuffixFinder'
         public: true
 
+    es.annotations.cached_reader:
+        class: 'Doctrine\Common\Annotations\PsrCachedReader'
+        public: true
+        arguments: ["@annotations.reader", "@es.cache_engine", "%kernel.debug%"]
+
     es.document_finder:
         class: 'ONGR\ElasticsearchBundle\Mapping\DocumentFinder'
         public: true

composer.json

@@ -22,9 +22,8 @@
         "symfony/stopwatch": "^3.4|^4|^5|^6",
         "symfony/templating": "^3.4|^4|^5|^6",
         "symfony/asset": "^3.4|^4|^5|^6",
-        "doctrine/annotations": "^1.10 || ^2.0",
+        "doctrine/annotations": "^1.13 || ^2.0",
         "doctrine/inflector": "^1.0 || ^2.0",
-        "doctrine/cache": "~1.4",
         "doctrine/collections": "~1.4",
         "monolog/monolog": "^1.10 || ^2.0 || ^3.0",
         "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1|^6.2.0.1|^7.2.0.1",