Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit c31c09f762c9 · 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/Store/PdoStore.php b/Store/PdoStore.php
@@ -144,7 +144,7 @@ public function save(Key $key)
                 $this->createTable();
             }
             $stmt->execute();
-        } catch (DBALException | Exception $e) {
+        } catch (DBALException|Exception $e) {
             // the lock is already acquired. It could be us. Let's try to put off.
             $this->putOffExpiration($key, $this->initialTtl);
         } catch (\PDOException $e) {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function save(Key $key)`
`144`	`144`	`$this->createTable();`
`145`	`145`	`}`
`146`	`146`	`$stmt->execute();`
`147`		`- } catch (DBALException \| Exception $e) {`
	`147`	`+ } catch (DBALException\|Exception $e) {`
`148`	`148`	`// the lock is already acquired. It could be us. Let's try to put off.`
`149`	`149`	`$this->putOffExpiration($key, $this->initialTtl);`
`150`	`150`	`} catch (\PDOException $e) {`