Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 235e1bb90c15 · 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/Parser/Reader.php b/Parser/Reader.php
@@ -60,9 +60,6 @@ public function getOffset(string $string)
         return false === $position ? false : $position - $this->position;
     }
 
-    /**
-     * @return array|false
-     */
     public function findPattern(string $pattern): array|false
     {
         $source = substr($this->source, $this->position);

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,6 @@ public function getOffset(string $string)`
`60`	`60`	`return false === $position ? false : $position - $this->position;`
`61`	`61`	`}`
`62`	`62`
`63`		`- /**`
`64`		`- * @return array\|false`
`65`		`- */`
`66`	`63`	`public function findPattern(string $pattern): array\|false`
`67`	`64`	`{`
`68`	`65`	`$source = substr($this->source, $this->position);`