Skip to content

Commit 7fccea8

Browse files
committed
Merge branch '6.0' into 6.1
* 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
2 parents 06d2b27 + c5c2e31 commit 7fccea8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Formatter/OutputFormatterStyleStack.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function pop(OutputFormatterStyleInterface $style = null): OutputFormatte
7777
/**
7878
* Computes current style with stacks top codes.
7979
*/
80-
public function getCurrent(): OutputFormatterStyle
80+
public function getCurrent(): OutputFormatterStyleInterface
8181
{
8282
if (empty($this->styles)) {
8383
return $this->emptyStyle;

0 commit comments

Comments
 (0)