[FrameworkBundle] removed doctrine/cache as a dependency

symfony · fabpot · Jun 12, 2017 · Jun 11, 2017 · Jun 11, 2017 · Jun 12, 2017
commit a4e336ea3494a5acc9343d537254807df10ee3a6
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -16,6 +16,9 @@ Finder
 FrameworkBundle
 ---------------
 
+ * The `doctrine/cache` dependency has been removed; require it via `composer
+   require doctrine/cache` if you are using Doctrine cache in your project.
+
  * The `validator.mapping.cache.doctrine.apc` service has been deprecated.
 
  * Using the `KERNEL_DIR` environment variable or the automatic guessing based

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 3.4.0
 -----
 
+* Removed `doctrine/cache` from the list of required dependencies in `composer.json`
+* Deprecated `validator.mapping.cache.doctrine.apc` service
 * Deprecated using the `KERNEL_DIR` environment variable with `KernelTestCase::getKernelClass()`.
 * Deprecated the `KernelTestCase::getPhpUnitXmlDir()` and `KernelTestCase::getPhpUnitCliConfigArgument()` methods.
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -663,9 +663,9 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                     ->children()
                         ->scalarNode('cache')
                             ->beforeNormalization()
-                                // Can be removed in 4.0, when validator.mapping.cache.apc is removed
+                                // Can be removed in 4.0, when validator.mapping.cache.doctrine.apc is removed
                                 ->ifString()->then(function ($v) {
-                                    if ('validator.mapping.cache.apc' === $v && !class_exists('Doctrine\Common\Cache\ApcCache')) {
+                                    if ('validator.mapping.cache.doctrine.apc' === $v && !class_exists('Doctrine\Common\Cache\ApcCache')) {
                                         throw new LogicException('Doctrine APC cache for the validator cannot be enabled as the Doctrine Cache package is not installed.');
                                     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1220,6 +1220,10 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
         $loader->load('annotations.xml');
 
         if ('none' !== $config['cache']) {
+            if (!class_exists('Doctrine\Common\Cache\CacheProvider')) {
+                throw new LogicException('Annotations cannot be enabled as the Doctrine Cache library is not installed.');
+            }
+
             $cacheService = $config['cache'];
 
             if ('php_array' === $config['cache']) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -29,10 +29,10 @@
         "symfony/filesystem": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "symfony/routing": "~3.4|~4.0",
-        "symfony/stopwatch": "~2.8|~3.0|~4.0",
-        "doctrine/cache": "~1.0"
+        "symfony/stopwatch": "~2.8|~3.0|~4.0"
     },
     "require-dev": {
+        "doctrine/cache": "~1.0",
         "fig/link-util": "^1.0",
         "symfony/asset": "~3.3|~4.0",
         "symfony/browser-kit": "~2.8|~3.0|~4.0",