Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabpot committed Aug 26, 2022
2 parents 06d2b27 + c5c2e31 commit 7fccea8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Formatter/OutputFormatterStyleStack.php
Expand Up @@ -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;
Expand Down

0 comments on commit 7fccea8

Please sign in to comment.