Merge branch '5.3' into 5.4

derrabus · derrabus · commit c4922fb76f08 · 2021-12-27T22:01:00.000+01:00
* 5.3:
  Fix param annotation in HttpKernelBrowser
  [Cache] fix compat with apcu &lt; 5.1.10
  Run `open_basedir` tests in separate processes
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -60,7 +60,14 @@ protected function doFetch(array $ids)
         $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         try {
             $values = [];
-            foreach (apcu_fetch($ids, $ok) ?: [] as $k => $v) {
+            $ids = array_flip($ids);
+            foreach (apcu_fetch(array_keys($ids), $ok) ?: [] as $k => $v) {
+                if (!isset($ids[$k])) {
+                    // work around https://github.com/krakjoe/apcu/issues/247
+                    $k = key($ids);
+                }
+                unset($ids[$k]);
+
                 if (null !== $v || $ok) {
                     $values[$k] = null !== $this->marshaller ? $this->marshaller->unmarshall($v) : $v;
                 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -306,6 +306,15 @@ public function testWeirdDataMatchingMetadataWrappedValues()
 
         $this->assertTrue($cache->hasItem('foobar'));
     }
+
+    public function testNullByteInKey()
+    {
+        $cache = $this->createCachePool(0, __FUNCTION__);
+
+        $cache->save($cache->getItem("a\0b")->set(123));
+
+        $this->assertSame(123, $cache->getItem("a\0b")->get());
+    }
 }
 
 class NotUnserializable
diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
@@ -192,7 +192,7 @@ protected function filterFiles(array $files)
     /**
      * {@inheritdoc}
      *
-     * @param Request $request
+     * @param Response $response
      *
      * @return DomResponse
      */
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -96,6 +96,9 @@ public function testFindWithExtraDirs()
         $this->assertSamePath(\PHP_BINARY, $result);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testFindWithOpenBaseDir()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -114,6 +117,9 @@ public function testFindWithOpenBaseDir()
         $this->assertSamePath(\PHP_BINARY, $result);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testFindProcessInOpenBasedir()
     {
         if (ini_get('open_basedir')) {

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,15 @@ public function testWeirdDataMatchingMetadataWrappedValues()`
`306`	`306`
`307`	`307`	`$this->assertTrue($cache->hasItem('foobar'));`
`308`	`308`	`}`
	`309`	`+`
	`310`	`+ public function testNullByteInKey()`
	`311`	`+ {`
	`312`	`+ $cache = $this->createCachePool(0, __FUNCTION__);`
	`313`	`+`
	`314`	`+ $cache->save($cache->getItem("a\0b")->set(123));`
	`315`	`+`
	`316`	`+ $this->assertSame(123, $cache->getItem("a\0b")->get());`
	`317`	`+ }`
`309`	`318`	`}`
`310`	`319`
`311`	`320`	`class NotUnserializable`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ protected function filterFiles(array $files)`
`192`	`192`	`/**`
`193`	`193`	`* {@inheritdoc}`
`194`	`194`	`*`
`195`		`- * @param Request $request`
	`195`	`+ * @param Response $response`
`196`	`196`	`*`
`197`	`197`	`* @return DomResponse`
`198`	`198`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ public function testFindWithExtraDirs()`
`96`	`96`	`$this->assertSamePath(\PHP_BINARY, $result);`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ /**`
	`100`	`+ * @runInSeparateProcess`
	`101`	`+ */`
`99`	`102`	`public function testFindWithOpenBaseDir()`
`100`	`103`	`{`
`101`	`104`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`@@ -114,6 +117,9 @@ public function testFindWithOpenBaseDir()`
`114`	`117`	`$this->assertSamePath(\PHP_BINARY, $result);`
`115`	`118`	`}`
`116`	`119`
	`120`	`+ /**`
	`121`	`+ * @runInSeparateProcess`
	`122`	`+ */`
`117`	`123`	`public function testFindProcessInOpenBasedir()`
`118`	`124`	`{`
`119`	`125`	`if (ini_get('open_basedir')) {`