Merge branch '5.4' into 6.0

derrabus · derrabus · commit dcc33b3b0219 · 2021-12-27T22:05:08.000+01:00
* 5.4:
  [Profiler] relax return type for memory data collector
  Fix param annotation in HttpKernelBrowser
  [Cache] fix compat with apcu &lt; 5.1.10
  Expand FormView key to include int
  [PropertyInfo] PhpStan extractor nested object fix
  [Console] Fix autocompletion of argument with default value
  Run `open_basedir` tests in separate processes
diff --git a/DataCollector/MemoryDataCollector.php b/DataCollector/MemoryDataCollector.php
@@ -58,7 +58,7 @@ public function getMemory(): int
         return $this->data['memory'];
     }
 
-    public function getMemoryLimit(): int
+    public function getMemoryLimit(): int|float
     {
         return $this->data['memory_limit'];
     }
diff --git a/HttpKernelBrowser.php b/HttpKernelBrowser.php
@@ -188,7 +188,7 @@ protected function filterFiles(array $files): array
     /**
      * {@inheritdoc}
      *
-     * @param Request $request
+     * @param Response $response
      */
     protected function filterResponse(object $response): DomResponse
     {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function getMemory(): int`
`58`	`58`	`return $this->data['memory'];`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function getMemoryLimit(): int`
	`61`	`+ public function getMemoryLimit(): int\|float`
`62`	`62`	`{`
`63`	`63`	`return $this->data['memory_limit'];`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ protected function filterFiles(array $files): array`
`188`	`188`	`/**`
`189`	`189`	`* {@inheritdoc}`
`190`	`190`	`*`
`191`		`- * @param Request $request`
	`191`	`+ * @param Response $response`
`192`	`192`	`*/`
`193`	`193`	`protected function filterResponse(object $response): DomResponse`
`194`	`194`	`{`