Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 050bc3e8a2ae · 2021-12-16T23:14:15.000+01:00
* 6.0:
  [6.0] cs fixes
  [5.4] cs fixes
  [5.3] cs fixes
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  fix merge
  Remove pointless assignment
  [HttpClient] Fix tracing requests made after calling withOptions()
  [Cache] disable lock on CLI
  Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)"
  [HttpKernel] fix how configuring log-level and status-code by exception works
  [VarDumper] add more "transient-on-macos" groups
diff --git a/Command/WorkflowDumpCommand.php b/Command/WorkflowDumpCommand.php
@@ -36,7 +36,8 @@
 class WorkflowDumpCommand extends Command
 {
     /**
-     * string is the service id
+     * string is the service id.
+     *
      * @var array<string, Definition>
      */
     private array $workflows = [];
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
@@ -70,8 +70,6 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
 
     /**
      * Gets a container parameter by its name.
-     *
-     * @return array|bool|float|int|string|null
      */
     protected function getParameter(string $name): array|bool|float|int|string|null
     {
diff --git a/KernelBrowser.php b/KernelBrowser.php
@@ -62,8 +62,6 @@ public function getKernel(): KernelInterface
 
     /**
      * Gets the profile associated with the current Response.
-     *
-     * @return HttpProfile|false|null
      */
     public function getProfile(): HttpProfile|false|null
     {
diff --git a/Test/TestContainer.php b/Test/TestContainer.php
@@ -63,8 +63,6 @@ public function getParameterBag(): ParameterBagInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return array|bool|float|int|string|null
      */
     public function getParameter(string $name): array|bool|float|int|string|null
     {

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,6 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface`
`70`	`70`
`71`	`71`	`/**`
`72`	`72`	`* Gets a container parameter by its name.`
`73`		`- *`
`74`		`- * @return array\|bool\|float\|int\|string\|null`
`75`	`73`	`*/`
`76`	`74`	`protected function getParameter(string $name): array\|bool\|float\|int\|string\|null`
`77`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@ public function getKernel(): KernelInterface`
`62`	`62`
`63`	`63`	`/**`
`64`	`64`	`* Gets the profile associated with the current Response.`
`65`		`- *`
`66`		`- * @return HttpProfile\|false\|null`
`67`	`65`	`*/`
`68`	`66`	`public function getProfile(): HttpProfile\|false\|null`
`69`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,6 @@ public function getParameterBag(): ParameterBagInterface`
`63`	`63`
`64`	`64`	`/**`
`65`	`65`	`* {@inheritdoc}`
`66`		`- *`
`67`		`- * @return array\|bool\|float\|int\|string\|null`
`68`	`66`	`*/`
`69`	`67`	`public function getParameter(string $name): array\|bool\|float\|int\|string\|null`
`70`	`68`	`{`