Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit d2e7e61725dc · 2021-12-16T22:37:57.000+01:00
* 4.4:
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  [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
@@ -646,7 +646,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);
 
@@ -695,7 +695,7 @@ protected function doRead(string $sessionId)
             }
 
             return '';
-        } while (true);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ protected function doRead(string $sessionId)`
`646`	`646`	`$selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);`
`647`	`647`	`$insertStmt = null;`
`648`	`648`
`649`		`- do {`
	`649`	`+ while (true) {`
`650`	`650`	`$selectStmt->execute();`
`651`	`651`	`$sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);`
`652`	`652`
`@@ -695,7 +695,7 @@ protected function doRead(string $sessionId)`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`return '';`
`698`		`- } while (true);`
	`698`	`+ }`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`/**`