Merge branch '3.1'

* 3.1:
  [Cache] Make directory hashing case insensitive

Author: nicolas-grekas

DependencyInjection/Compiler/CachePoolPass.php

@@ -89,7 +89,7 @@ public function process(ContainerBuilder $container)
 
     private function getNamespace($namespaceSuffix, $id)
     {
-        return substr(str_replace('/', '-', base64_encode(md5($id.$namespaceSuffix, true))), 0, 10);
+        return substr(str_replace('/', '-', base64_encode(hash('sha256', $id.$namespaceSuffix, true))), 0, 10);
     }
 
     /**

DependencyInjection/FrameworkExtension.php

@@ -1235,7 +1235,7 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container)
     {
-        $version = substr(str_replace('/', '-', base64_encode(md5(uniqid(mt_rand(), true), true))), 0, -2);
+        $version = substr(str_replace('/', '-', base64_encode(hash('sha256', uniqid(mt_rand(), true), true))), 0, 22);
         $container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);

Tests/DependencyInjection/Compiler/CachePoolPassTest.php

@@ -41,7 +41,7 @@ public function testNamespaceArgumentIsReplaced()
 
         $this->cachePoolPass->process($container);
 
-        $this->assertSame('VcRIZlUhEv', $cachePool->getArgument(0));
+        $this->assertSame('kRFqMp5odS', $cachePool->getArgument(0));
     }
 
     public function testArgsAreReplaced()
@@ -61,7 +61,7 @@ public function testArgsAreReplaced()
 
         $this->assertInstanceOf(Reference::class, $cachePool->getArgument(0));
         $this->assertSame('foobar', (string) $cachePool->getArgument(0));
-        $this->assertSame('VcRIZlUhEv', $cachePool->getArgument(1));
+        $this->assertSame('kRFqMp5odS', $cachePool->getArgument(1));
         $this->assertSame(3, $cachePool->getArgument(2));
     }