Merge branch '3.3' into 3.4

* 3.3:
  Hash cache keys on save
  [HttpKernel] Remove isset call used for legacy

Author: nicolas-grekas

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -55,19 +55,20 @@ function ($key, $value, $isHit) use ($defaultLifetime) {
             null,
             CacheItem::class
         );
+        $getId = function ($key) { return $this->getId((string) $key); };
         $this->mergeByLifetime = \Closure::bind(
-            function ($deferred, $namespace, &$expiredIds) {
+            function ($deferred, $namespace, &$expiredIds) use ($getId) {
                 $byLifetime = array();
                 $now = time();
                 $expiredIds = array();
 
                 foreach ($deferred as $key => $item) {
                     if (null === $item->expiry) {
-                        $byLifetime[0 < $item->defaultLifetime ? $item->defaultLifetime : 0][$namespace.$key] = $item->value;
+                        $byLifetime[0 < $item->defaultLifetime ? $item->defaultLifetime : 0][$getId($key)] = $item->value;
                     } elseif ($item->expiry > $now) {
-                        $byLifetime[$item->expiry - $now][$namespace.$key] = $item->value;
+                        $byLifetime[$item->expiry - $now][$getId($key)] = $item->value;
                     } else {
-                        $expiredIds[] = $namespace.$key;
+                        $expiredIds[] = $getId($key);
                     }
                 }
 

src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php

@@ -22,6 +22,7 @@ class PhpArrayAdapterTest extends AdapterTestCase
 {
     protected $skippedTests = array(
         'testBasicUsage' => 'PhpArrayAdapter is read-only.',
+        'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
         'testClear' => 'PhpArrayAdapter is read-only.',
         'testClearWithDeferredItems' => 'PhpArrayAdapter is read-only.',
         'testDeleteItem' => 'PhpArrayAdapter is read-only.',

src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php

@@ -21,6 +21,8 @@
 class PhpArrayCacheTest extends CacheTestCase
 {
     protected $skippedTests = array(
+        'testBasicUsageWithLongKey' => 'PhpArrayCache does no writes',
+
         'testDelete' => 'PhpArrayCache does no writes',
         'testDeleteMultiple' => 'PhpArrayCache does no writes',
         'testDeleteMultipleGenerator' => 'PhpArrayCache does no writes',
@@ -57,6 +59,7 @@ protected function tearDown()
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
     }
+
     public function createSimpleCache()
     {
         return new PhpArrayCacheWrapper(self::$file, new NullCache());

src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php

@@ -107,8 +107,7 @@ public function onKernelTerminate(PostResponseEvent $event)
     {
         // attach children to parents
         foreach ($this->profiles as $request) {
-            // isset call should be removed when requestStack is required
-            if (isset($this->parents[$request]) && null !== $parentRequest = $this->parents[$request]) {
+            if (null !== $parentRequest = $this->parents[$request]) {
                 if (isset($this->profiles[$parentRequest])) {
                     $this->profiles[$parentRequest]->addChild($this->profiles[$request]);
                 }