Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 2e23f0f78a8b · 2022-10-18T15:11:10.000+02:00
* 4.4:
  [HttpKernel] Fix empty request stack when terminating with exception
  [HttpKernel] Remove EOL when using error_log() in HttpKernel Logger
  s/annd/and
  s/gargage/garbage
  [Console] Fix error output on windows cli
  Reserve keys when using numeric ones
  add missing Azerbaijani translations
  fix few typos/inconsistencies in latvian translations
  fix: use message object from event
diff --git a/Adapter/RedisTagAwareAdapter.php b/Adapter/RedisTagAwareAdapter.php
@@ -208,7 +208,7 @@ protected function doInvalidate(array $tagIds): bool
         // and removes the linked items. When the set is still not empty after
         // the scan, it means we're in cluster mode and that the linked items
         // are on other nodes: we move the links to a temporary set and we
-        // gargage collect that set from the client side.
+        // garbage collect that set from the client side.
 
         $lua = <<<'EOLUA'
             redis.replicate_commands()
diff --git a/Tests/Adapter/AdapterTestCase.php b/Tests/Adapter/AdapterTestCase.php
@@ -341,6 +341,19 @@ public function testNullByteInKey()
 
         $this->assertSame(123, $cache->getItem("a\0b")->get());
     }
+
+    public function testNumericKeysWorkAfterMemoryLeakPrevention()
+    {
+        $cache = $this->createCachePool(0, __FUNCTION__);
+
+        for ($i = 0; $i < 1001; ++$i) {
+            $cacheItem = $cache->getItem((string) $i);
+            $cacheItem->set('value-'.$i);
+            $cache->save($cacheItem);
+        }
+
+        $this->assertEquals('value-50', $cache->getItem((string) 50)->get());
+    }
 }
 
 class NotUnserializable
diff --git a/Traits/AbstractAdapterTrait.php b/Traits/AbstractAdapterTrait.php
@@ -394,7 +394,7 @@ private function getId($key)
         $this->ids[$key] = $key;
 
         if (\count($this->ids) > 1000) {
-            array_splice($this->ids, 0, 500); // stop memory leak if there are many keys
+            $this->ids = \array_slice($this->ids, 500, null, true); // stop memory leak if there are many keys
         }
 
         if (null === $this->maxIdLength) {

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ private function getId($key)`
`394`	`394`	`$this->ids[$key] = $key;`
`395`	`395`
`396`	`396`	`if (\count($this->ids) > 1000) {`
`397`		`- array_splice($this->ids, 0, 500); // stop memory leak if there are many keys`
	`397`	`+ $this->ids = \array_slice($this->ids, 500, null, true); // stop memory leak if there are many keys`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`if (null === $this->maxIdLength) {`