Merge branch '6.0' into 6.1

fabpot · fabpot · commit 7fccea8728aa · 2022-08-26T12:32:31.000+02:00
* 6.0:
  [LokaliseBridge] Fix push command --delete-missing options when there are no missing messages
  fix bad help message in cache warmup command
  [Console] Fix OutputFormatterStyleStack::getCurrent return type
  Count cookie parts before accessing the second
  Fix RequestStack state if throwable is thrown
  [Serializer] Fix caching context-aware encoders/decoders in ChainEncoder/ChainDecoder
diff --git a/Formatter/OutputFormatterStyleStack.php b/Formatter/OutputFormatterStyleStack.php
@@ -77,7 +77,7 @@ public function pop(OutputFormatterStyleInterface $style = null): OutputFormatte
     /**
      * Computes current style with stacks top codes.
      */
-    public function getCurrent(): OutputFormatterStyle
+    public function getCurrent(): OutputFormatterStyleInterface
     {
         if (empty($this->styles)) {
             return $this->emptyStyle;

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function pop(OutputFormatterStyleInterface $style = null): OutputFormatte`
`77`	`77`	`/**`
`78`	`78`	`* Computes current style with stacks top codes.`
`79`	`79`	`*/`
`80`		`- public function getCurrent(): OutputFormatterStyle`
	`80`	`+ public function getCurrent(): OutputFormatterStyleInterface`
`81`	`81`	`{`
`82`	`82`	`if (empty($this->styles)) {`
`83`	`83`	`return $this->emptyStyle;`