From 976cea04035074f0481bfc62e9ec70321b6dbe20 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 1 Sep 2024 22:31:33 +0200 Subject: [PATCH] Fix tests --- extra/cache-extra/CacheExtension.php | 2 +- extra/cache-extra/Tests/FunctionalTest.php | 6 ++---- extra/cache-extra/Tests/IntegrationTest.php | 6 ++---- extra/cssinliner-extra/CssInlinerExtension.php | 2 +- extra/inky-extra/InkyExtension.php | 2 +- extra/intl-extra/IntlExtension.php | 4 ++-- extra/markdown-extra/MarkdownExtension.php | 2 +- extra/markdown-extra/Tests/FunctionalTest.php | 8 +++----- extra/string-extra/StringExtension.php | 2 +- 9 files changed, 14 insertions(+), 20 deletions(-) diff --git a/extra/cache-extra/CacheExtension.php b/extra/cache-extra/CacheExtension.php index 5cf849dc6..3898b6e0f 100644 --- a/extra/cache-extra/CacheExtension.php +++ b/extra/cache-extra/CacheExtension.php @@ -16,7 +16,7 @@ use Twig\Extra\Cache\TokenParser\CacheTokenParser; final class CacheExtension extends AbstractExtension { - public function getTokenParsers() + public function getTokenParsers(): array { return [ new CacheTokenParser(), diff --git a/extra/cache-extra/Tests/FunctionalTest.php b/extra/cache-extra/Tests/FunctionalTest.php index 0ae24436e..a91858c91 100644 --- a/extra/cache-extra/Tests/FunctionalTest.php +++ b/extra/cache-extra/Tests/FunctionalTest.php @@ -78,11 +78,9 @@ class FunctionalTest extends TestCase $this->cache = $cache; } - public function load($class) + public function load(string $class): ?object { - if (CacheRuntime::class === $class) { - return new CacheRuntime($this->cache); - } + return CacheRuntime::class === $class ? new CacheRuntime($this->cache) : null; } }); diff --git a/extra/cache-extra/Tests/IntegrationTest.php b/extra/cache-extra/Tests/IntegrationTest.php index 8e216aaa5..4f597b0aa 100644 --- a/extra/cache-extra/Tests/IntegrationTest.php +++ b/extra/cache-extra/Tests/IntegrationTest.php @@ -30,11 +30,9 @@ class IntegrationTest extends IntegrationTestCase { return [ new class() implements RuntimeLoaderInterface { - public function load($class) + public function load(string $class): ?object { - if (CacheRuntime::class === $class) { - return new CacheRuntime(new ArrayAdapter()); - } + return CacheRuntime::class === $class ? new CacheRuntime(new ArrayAdapter()) : null; } }, ]; diff --git a/extra/cssinliner-extra/CssInlinerExtension.php b/extra/cssinliner-extra/CssInlinerExtension.php index 2ceb2e085..94d3c4b7f 100644 --- a/extra/cssinliner-extra/CssInlinerExtension.php +++ b/extra/cssinliner-extra/CssInlinerExtension.php @@ -17,7 +17,7 @@ use Twig\TwigFilter; class CssInlinerExtension extends AbstractExtension { - public function getFilters() + public function getFilters(): array { return [ new TwigFilter('inline_css', [self::class, 'inlineCss'], ['is_safe' => ['all']]), diff --git a/extra/inky-extra/InkyExtension.php b/extra/inky-extra/InkyExtension.php index 374cb7efb..9ee4f823a 100644 --- a/extra/inky-extra/InkyExtension.php +++ b/extra/inky-extra/InkyExtension.php @@ -17,7 +17,7 @@ use Twig\TwigFilter; class InkyExtension extends AbstractExtension { - public function getFilters() + public function getFilters(): array { return [ new TwigFilter('inky_to_html', [self::class, 'inky'], ['is_safe' => ['html']]), diff --git a/extra/intl-extra/IntlExtension.php b/extra/intl-extra/IntlExtension.php index 7278db214..43fd1c66e 100644 --- a/extra/intl-extra/IntlExtension.php +++ b/extra/intl-extra/IntlExtension.php @@ -156,7 +156,7 @@ final class IntlExtension extends AbstractExtension $this->numberFormatterPrototype = $numberFormatterPrototype; } - public function getFilters() + public function getFilters(): array { return [ // internationalized names @@ -177,7 +177,7 @@ final class IntlExtension extends AbstractExtension ]; } - public function getFunctions() + public function getFunctions(): array { return [ // internationalized names diff --git a/extra/markdown-extra/MarkdownExtension.php b/extra/markdown-extra/MarkdownExtension.php index 6a2450095..7bc737a29 100644 --- a/extra/markdown-extra/MarkdownExtension.php +++ b/extra/markdown-extra/MarkdownExtension.php @@ -17,7 +17,7 @@ use Twig\TwigFilter; final class MarkdownExtension extends AbstractExtension { - public function getFilters() + public function getFilters(): array { return [ new TwigFilter('markdown_to_html', ['Twig\\Extra\\Markdown\\MarkdownRuntime', 'convert'], ['is_safe' => ['all']]), diff --git a/extra/markdown-extra/Tests/FunctionalTest.php b/extra/markdown-extra/Tests/FunctionalTest.php index 0d9b73a59..62c7928fe 100644 --- a/extra/markdown-extra/Tests/FunctionalTest.php +++ b/extra/markdown-extra/Tests/FunctionalTest.php @@ -27,7 +27,7 @@ class FunctionalTest extends TestCase /** * @dataProvider getMarkdownTests */ - public function testMarkdown(string $template, string $expected): void + public function testMarkdown(string $template, string $expected) { foreach ([LeagueMarkdown::class, ErusevMarkdown::class, /* MichelfMarkdown::class, */ DefaultMarkdown::class] as $class) { $twig = new Environment(new ArrayLoader([ @@ -48,11 +48,9 @@ EOF $this->class = $class; } - public function load($c) + public function load(string $c): ?object { - if (MarkdownRuntime::class === $c) { - return new $c(new $this->class()); - } + return MarkdownRuntime::class === $c ? new $c(new $this->class()) : null; } }); $this->assertMatchesRegularExpression('{'.$expected.'}m', trim($twig->render('index'))); diff --git a/extra/string-extra/StringExtension.php b/extra/string-extra/StringExtension.php index e0abb845f..bd575f788 100644 --- a/extra/string-extra/StringExtension.php +++ b/extra/string-extra/StringExtension.php @@ -32,7 +32,7 @@ final class StringExtension extends AbstractExtension $this->slugger = $slugger ?: new AsciiSlugger(); } - public function getFilters() + public function getFilters(): array { return [ new TwigFilter('u', [$this, 'createUnicodeString']),