Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit cf5830e03633 · 2021-12-16T22:52:00.000+01:00
* 5.3:
  [5.3] cs fixes
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  [HttpClient] Fix tracing requests made after calling withOptions()
  [Cache] disable lock on CLI
  [VarDumper] add more "transient-on-macos" groups
diff --git a/Session/Storage/Handler/PdoSessionHandler.php b/Session/Storage/Handler/PdoSessionHandler.php
@@ -663,7 +663,7 @@ protected function doRead(string $sessionId)
         $selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
         $insertStmt = null;
 
-        do {
+        while (true) {
             $selectStmt->execute();
             $sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);
 
@@ -712,7 +712,7 @@ protected function doRead(string $sessionId)
             }
 
             return '';
-        } while (true);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ protected function doRead(string $sessionId)`
`663`	`663`	`$selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);`
`664`	`664`	`$insertStmt = null;`
`665`	`665`
`666`		`- do {`
	`666`	`+ while (true) {`
`667`	`667`	`$selectStmt->execute();`
`668`	`668`	`$sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);`
`669`	`669`
`@@ -712,7 +712,7 @@ protected function doRead(string $sessionId)`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`return '';`
`715`		`- } while (true);`
	`715`	`+ }`
`716`	`716`	`}`
`717`	`717`
`718`	`718`	`/**`