[Cache] Make directory hashing case insensitve

nicolas-grekas · nicolas-grekas · commit d892be193734 · 2016-11-09T14:57:44.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -84,7 +84,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);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1037,7 +1037,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']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/src/Symfony/Bundle/FrameworkBundle/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));
     }
 
diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php b/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
@@ -146,13 +146,13 @@ protected function doSave(array $values, $lifetime)
 
     private function getFile($id, $mkdir = false)
     {
-        $hash = str_replace('/', '-', base64_encode(md5($id, true)));
-        $dir = $this->directory.$hash[0].DIRECTORY_SEPARATOR.$hash[1].DIRECTORY_SEPARATOR;
+        $hash = str_replace('/', '-', base64_encode(hash('sha256', $id, true)));
+        $dir = $this->directory.strtoupper($hash[0].DIRECTORY_SEPARATOR.$hash[1].DIRECTORY_SEPARATOR);
 
         if ($mkdir && !file_exists($dir)) {
             @mkdir($dir, 0777, true);
         }
 
-        return $dir.substr($hash, 2, -2);
+        return $dir.substr($hash, 2, 20);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function process(ContainerBuilder $container)`
`84`	`84`
`85`	`85`	`private function getNamespace($namespaceSuffix, $id)`
`86`	`86`	`{`
`87`		`- return substr(str_replace('/', '-', base64_encode(md5($id.$namespaceSuffix, true))), 0, 10);`
	`87`	`+ return substr(str_replace('/', '-', base64_encode(hash('sha256', $id.$namespaceSuffix, true))), 0, 10);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild`
`1037`	`1037`
`1038`	`1038`	`private function registerCacheConfiguration(array $config, ContainerBuilder $container)`
`1039`	`1039`	`{`
`1040`		`- $version = substr(str_replace('/', '-', base64_encode(md5(uniqid(mt_rand(), true), true))), 0, -2);`
	`1040`	`+ $version = substr(str_replace('/', '-', base64_encode(hash('sha256', uniqid(mt_rand(), true), true))), 0, 22);`
`1041`	`1041`	`$container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);`
`1042`	`1042`	`$container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);`
`1043`	`1043`	`$container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testNamespaceArgumentIsReplaced()`
`41`	`41`
`42`	`42`	`$this->cachePoolPass->process($container);`
`43`	`43`
`44`		`- $this->assertSame('VcRIZlUhEv', $cachePool->getArgument(0));`
	`44`	`+ $this->assertSame('kRFqMp5odS', $cachePool->getArgument(0));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function testArgsAreReplaced()`
`@@ -61,7 +61,7 @@ public function testArgsAreReplaced()`
`61`	`61`
`62`	`62`	`$this->assertInstanceOf(Reference::class, $cachePool->getArgument(0));`
`63`	`63`	`$this->assertSame('foobar', (string) $cachePool->getArgument(0));`
`64`		`- $this->assertSame('VcRIZlUhEv', $cachePool->getArgument(1));`
	`64`	`+ $this->assertSame('kRFqMp5odS', $cachePool->getArgument(1));`
`65`	`65`	`$this->assertSame(3, $cachePool->getArgument(2));`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -146,13 +146,13 @@ protected function doSave(array $values, $lifetime)`
`146`	`146`
`147`	`147`	`private function getFile($id, $mkdir = false)`
`148`	`148`	`{`
`149`		`- $hash = str_replace('/', '-', base64_encode(md5($id, true)));`
`150`		`- $dir = $this->directory.$hash[0].DIRECTORY_SEPARATOR.$hash[1].DIRECTORY_SEPARATOR;`
	`149`	`+ $hash = str_replace('/', '-', base64_encode(hash('sha256', $id, true)));`
	`150`	`+ $dir = $this->directory.strtoupper($hash[0].DIRECTORY_SEPARATOR.$hash[1].DIRECTORY_SEPARATOR);`
`151`	`151`
`152`	`152`	`if ($mkdir && !file_exists($dir)) {`
`153`	`153`	`@mkdir($dir, 0777, true);`
`154`	`154`	`}`
`155`	`155`
`156`		`- return $dir.substr($hash, 2, -2);`
	`156`	`+ return $dir.substr($hash, 2, 20);`
`157`	`157`	`}`
`158`	`158`	`}`