Merge pull request #135 from magnetik/green

Make all tests pass on Symfony 4

Author: fabpot

DependencyInjection/CacheProviderLoader.php

@@ -2,6 +2,7 @@
 namespace Doctrine\Bundle\DoctrineCacheBundle\DependencyInjection;
 
 use Doctrine\Common\Inflector\Inflector;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
@@ -28,9 +29,10 @@ public function loadCacheProvider($name, array $config, ContainerBuilder $contai
         if ($config['namespace']) {
             $service->addMethodCall('setNamespace', array($config['namespace']));
         }
+        $service->setPublic(true);
 
         foreach ($config['aliases'] as $alias) {
-            $container->setAlias($alias, $serviceId);
+            $container->setAlias($alias, new Alias($serviceId, true));
         }
 
         if ($this->definitionClassExists($type, $container)) {

DependencyInjection/DoctrineCacheExtension.php

@@ -2,6 +2,7 @@
 namespace Doctrine\Bundle\DoctrineCacheBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -95,7 +96,7 @@ protected function loadCacheProviders(array $rootConfig, ContainerBuilder $conta
     protected function loadCacheAliases(array $rootConfig, ContainerBuilder $container)
     {
         foreach ($rootConfig['aliases'] as $alias => $name) {
-            $container->setAlias($alias, 'doctrine_cache.providers.' . $name);
+            $container->setAlias($alias, new Alias('doctrine_cache.providers.' . $name, true));
         }
     }
 

Tests/DependencyInjection/AbstractDoctrineCacheExtensionTest.php

@@ -353,7 +353,10 @@ protected function compileContainer($file, ContainerBuilder $container = null)
 
         $compilerPassConfig = $container->getCompilerPassConfig();
 
-        $compilerPassConfig->setOptimizationPasses(array(new ResolveDefinitionTemplatesPass()));
+        $pass = class_exists('Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass')
+            ? 'Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass'
+            : 'Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass';
+        $compilerPassConfig->setOptimizationPasses(array(new $pass()));
         $compilerPassConfig->setRemovingPasses(array());
 
         $this->loadFromFile($container, $file);