Skip to content

Commit 2c17a41

Browse files
committed
Fix compatibility.
1 parent def06c0 commit 2c17a41

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

src/BaseRenderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ abstract class BaseRenderer implements Renderer
1515
{
1616
private ?string $baseUrl = null;
1717

18-
/** @var string[] */
18+
/** @var array<int, string> */
1919
private array $safeDomains = ['baraja.cz'];
2020

2121

@@ -39,7 +39,7 @@ public function setBaseUrl(string $baseUrl): void
3939

4040

4141
/**
42-
* @param string[] $safeDomains
42+
* @param array<int, string> $safeDomains
4343
*/
4444
public function setSafeDomains(array $safeDomains): void
4545
{

src/CommonMarkRenderer.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
final class CommonMarkRenderer extends BaseRenderer
1111
{
12-
/** @var string[] */
12+
/** @var array<string, string> */
1313
private static array $helpers = [
1414
'\(' => 'LATEX-L',
1515
'\)' => 'LATEX-R',
@@ -30,15 +30,16 @@ public function render(string|\Stringable $content): string
3030
static $cache = [];
3131
if (isset($cache[$content]) === false) {
3232
$html = $this->process(
33-
$this->commonMarkConverter->get()->convertToHtml(
34-
$this->beforeProcess($content),
35-
),
33+
$this->commonMarkConverter
34+
->get()
35+
->convert($this->beforeProcess($content))
36+
->getContent(),
3637
);
3738

3839
$baseUrl = $this->resolveBaseUrl();
3940
$html = preg_replace_callback(
4041
'/src="\/?((?:img|static)\/([^"]+))"/',
41-
static fn(array $match): string => 'src="' . $baseUrl . '/' . $match[1] . '"',
42+
static fn(array $match): string => sprintf('src="%s/%s"', $baseUrl, $match[1]),
4243
$this->afterProcess($html),
4344
);
4445

src/ConverterAccessor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
use League\CommonMark\CommonMarkConverter;
9-
use League\CommonMark\Environment;
109
use League\CommonMark\Extension\ExtensionInterface;
1110
use League\CommonMark\Extension\Table\TableExtension;
1211

@@ -45,11 +44,12 @@ public function get(): CommonMarkConverter
4544

4645
private function createInstance(): CommonMarkConverter
4746
{
48-
$environment = Environment::createCommonMarkEnvironment();
47+
$converter = new CommonMarkConverter($this->config);
48+
$environment = $converter->getEnvironment();
4949
foreach ($this->extensions as $extension) {
5050
$environment->addExtension($extension);
5151
}
5252

53-
return new CommonMarkConverter($this->config, $environment);
53+
return $converter;
5454
}
5555
}

0 commit comments

Comments
 (0)