Skip to content

Commit 4ad55ff

Browse files
committed
Merge branch '3.x' into 4.x
* 3.x: Fix wrong rounding_mode values #4677: Add use statements for classes referenced in the getOperators @psalm-return doc Update LeagueMarkdown.php
2 parents c649c16 + 9c94bfe commit 4ad55ff

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

doc/filters/format_number.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ The list of supported options:
6060
* ``floor``: Floor rounding
6161
* ``down``: Rounding towards zero
6262
* ``up``: Rounding away from zero
63-
* ``half_even``: Round halves to the nearest even integer
64-
* ``half_up``: Round halves up
65-
* ``half_down``: Round halves down
63+
* ``halfeven``: Round halves to the nearest even integer
64+
* ``halfup``: Round halves up
65+
* ``halfdown``: Round halves down
6666

6767
.. code-block:: twig
6868

extra/markdown-extra/LeagueMarkdown.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
namespace Twig\Extra\Markdown;
1313

1414
use League\CommonMark\CommonMarkConverter;
15+
use League\CommonMark\MarkdownConverter;
1516

1617
class LeagueMarkdown implements MarkdownInterface
1718
{
1819
private $converter;
1920
private $legacySupport;
2021

21-
public function __construct(?CommonMarkConverter $converter = null)
22+
public function __construct(?MarkdownConverter $converter = null)
2223
{
2324
$this->converter = $converter ?: new CommonMarkConverter();
2425
$this->legacySupport = !method_exists($this->converter, 'convert');

0 commit comments

Comments
 (0)