Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 2ad9fabadd66 · 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/Response.php b/Response.php
@@ -397,8 +397,6 @@ public function setContent(?string $content): static
 
     /**
      * Gets the current response content.
-     *
-     * @return string|false
      */
     public function getContent(): string|false
     {
diff --git a/Session/Storage/Handler/PdoSessionHandler.php b/Session/Storage/Handler/PdoSessionHandler.php
@@ -582,7 +582,7 @@ protected function doRead(string $sessionId): string
         $selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
         $insertStmt = null;
 
-        do {
+        while (true) {
             $selectStmt->execute();
             $sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);
 
@@ -628,7 +628,7 @@ protected function doRead(string $sessionId): string
             }
 
             return '';
-        } while (true);
+        }
     }
 
     /**
diff --git a/Session/Storage/NativeSessionStorage.php b/Session/Storage/NativeSessionStorage.php
@@ -112,8 +112,6 @@ public function __construct(array $options = [], AbstractProxy|\SessionHandlerIn
 
     /**
      * Gets the save handler instance.
-     *
-     * @return AbstractProxy|\SessionHandlerInterface
      */
     public function getSaveHandler(): AbstractProxy|\SessionHandlerInterface
     {

Original file line number	Diff line number	Diff line change
`@@ -397,8 +397,6 @@ public function setContent(?string $content): static`
`397`	`397`
`398`	`398`	`/**`
`399`	`399`	`* Gets the current response content.`
`400`		`- *`
`401`		`- * @return string\|false`
`402`	`400`	`*/`
`403`	`401`	`public function getContent(): string\|false`
`404`	`402`	`{`
Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ protected function doRead(string $sessionId): string`
`582`	`582`	`$selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);`
`583`	`583`	`$insertStmt = null;`
`584`	`584`
`585`		`- do {`
	`585`	`+ while (true) {`
`586`	`586`	`$selectStmt->execute();`
`587`	`587`	`$sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);`
`588`	`588`
`@@ -628,7 +628,7 @@ protected function doRead(string $sessionId): string`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`return '';`
`631`		`- } while (true);`
	`631`	`+ }`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,6 @@ public function __construct(array $options = [], AbstractProxy\|\SessionHandlerIn`
`112`	`112`
`113`	`113`	`/**`
`114`	`114`	`* Gets the save handler instance.`
`115`		`- *`
`116`		`- * @return AbstractProxy\|\SessionHandlerInterface`
`117`	`115`	`*/`
`118`	`116`	`public function getSaveHandler(): AbstractProxy\|\SessionHandlerInterface`
`119`	`117`	`{`