Extract twig runtimes

phpstan-baseline.neon

@@ -15,55 +15,35 @@ parameters:
 			count: 1
 			path: tests/Bridge/Symfony/App/AppKernel.php
 
-		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'Twig\\\\\\\\TwigFilter' and Twig\\\\TwigFilter will always evaluate to true\\.$#"
-			count: 1
-			path: tests/Twig/Extension/RouterTwigExtensionTest.php
-
-		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'Twig\\\\\\\\TwigFunction' and Twig\\\\TwigFunction will always evaluate to true\\.$#"
-			count: 1
-			path: tests/Twig/Extension/RouterTwigExtensionTest.php
-
-		-
-			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Twig\\\\Extension\\\\RouterTwigExtensionTest\\:\\:getSplitList\\(\\) return type has no value type specified in iterable type iterable\\.$#"
-			count: 1
-			path: tests/Twig/Extension/RouterTwigExtensionTest.php
-
-		-
-			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Twig\\\\Extension\\\\RouterTwigExtensionTest\\:\\:testSplitTag\\(\\) has parameter \\$output with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Twig/Extension/RouterTwigExtensionTest.php
-
-		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'Twig\\\\\\\\TwigFilter' and Twig\\\\TwigFilter will always evaluate to true\\.$#"
-			count: 1
-			path: tests/Twig/Extension/StringTwigExtensionTest.php
-
 		-
 			message: "#^Call to method getResponse\\(\\) on an unknown class Symfony\\\\Component\\\\HttpKernel\\\\Client\\.$#"
 			count: 1
-			path: tests/Twig/Extension/TwigExtensionIntegrationTest.php
+			path: tests/Bridge/Symfony/App/TwigExtensionIntegrationTest.php
 
 		-
 			message: "#^Call to method request\\(\\) on an unknown class Symfony\\\\Component\\\\HttpKernel\\\\Client\\.$#"
 			count: 1
-			path: tests/Twig/Extension/TwigExtensionIntegrationTest.php
+			path: tests/Bridge/Symfony/App/TwigExtensionIntegrationTest.php
 
 		-
 			message: "#^Instantiated class Symfony\\\\Component\\\\HttpKernel\\\\Client not found\\.$#"
 			count: 1
-			path: tests/Twig/Extension/TwigExtensionIntegrationTest.php
+			path: tests/Bridge/Symfony/App/TwigExtensionIntegrationTest.php
+
+		-
+			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Runtime\\\\RouterRuntimeTest\\:\\:getSplitList\\(\\) return type has no value type specified in iterable type iterable\\.$#"
+			count: 1
+			path: tests/Runtime/RouterRuntimeTest.php
 
 		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'Twig\\\\\\\\TwigFilter' and Twig\\\\TwigFilter will always evaluate to true\\.$#"
+			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Runtime\\\\RouterRuntimeTest\\:\\:testSplitTag\\(\\) has parameter \\$output with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Twig/Extension/UrlAutoConverterTwigExtensionTest.php
+			path: tests/Runtime/RouterRuntimeTest.php
 
 		-
-			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Twig\\\\Extension\\\\UrlAutoConverterTwigExtensionTest\\:\\:getLinkText\\(\\) return type has no value type specified in iterable type iterable\\.$#"
+			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Runtime\\\\UrlAutoConverterRuntimeTest\\:\\:getLinkText\\(\\) return type has no value type specified in iterable type iterable\\.$#"
 			count: 1
-			path: tests/Twig/Extension/UrlAutoConverterTwigExtensionTest.php
+			path: tests/Runtime/UrlAutoConverterRuntimeTest.php
 
 		-
 			message: "#^Method Nucleos\\\\Twig\\\\Tests\\\\Util\\\\StringUtilsTest\\:\\:getObfuscatedStrings\\(\\) return type has no value type specified in iterable type iterable\\.$#"

src/Bridge/Symfony/Resources/config/services.php

@@ -9,22 +9,31 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Nucleos\Twig\Extension\RouterTwigExtension;
-use Nucleos\Twig\Extension\StringTwigExtension;
-use Nucleos\Twig\Extension\UrlAutoConverterTwigExtension;
+use Nucleos\Twig\Extension\RouterExtension;
+use Nucleos\Twig\Extension\StringExtension;
+use Nucleos\Twig\Extension\UrlAutoConverterExtension;
 use Symfony\Component\DependencyInjection\Reference;
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
 
-        ->set(UrlAutoConverterTwigExtension::class)
+        ->set(UrlAutoConverterExtension::class)
             ->tag('twig.extension')
 
-        ->set(StringTwigExtension::class)
+        ->set(StringExtension::class)
             ->tag('twig.extension')
 
-        ->set(RouterTwigExtension::class)
+        ->set(RouterExtension::class)
             ->tag('twig.extension')
+
+        ->set(UrlAutoConverterExtension::class)
+            ->tag('twig.runtime')
+
+        ->set(StringExtension::class)
+            ->tag('twig.runtime')
+
+        ->set(RouterExtension::class)
+            ->tag('twig.runtime')
             ->args([
                 new Reference('router'),
             ])

src/Extension/RouterExtension.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * (c) Christian Gripp <mail@core23.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nucleos\Twig\Extension;
+
+use Nucleos\Twig\Runtime\RouterRuntime;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+
+final class RouterExtension extends AbstractExtension
+{
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('routeExists', [RouterRuntime::class, 'routeExists']),
+        ];
+    }
+
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('splitTag', [RouterRuntime::class, 'splitTag']),
+        ];
+    }
+}

src/Extension/StringExtension.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * (c) Christian Gripp <mail@core23.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nucleos\Twig\Extension;
+
+use Nucleos\Twig\Runtime\StringRuntime;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+final class StringExtension extends AbstractExtension
+{
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('format_bytes', [StringRuntime::class, 'formatBytes']),
+            new TwigFilter('obfuscate', [StringRuntime::class, 'obfuscate']),
+        ];
+    }
+}

src/Extension/UrlAutoConverterExtension.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * (c) Christian Gripp <mail@core23.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nucleos\Twig\Extension;
+
+use Nucleos\Twig\Runtime\UrlAutoConverterRuntime;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+final class UrlAutoConverterExtension extends AbstractExtension
+{
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('converturls', [UrlAutoConverterRuntime::class, 'convertLinks'], ['is_safe' => ['html']]),
+        ];
+    }
+}

src/Extension/RouterTwigExtension.php → src/Runtime/RouterRuntime.php

@@ -1,22 +1,18 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * (c) Christian Gripp <mail@core23.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Nucleos\Twig\Extension;
+namespace Nucleos\Twig\Runtime;
 
 use Symfony\Component\Routing\RouterInterface;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
+use Twig\Extension\RuntimeExtensionInterface;
 
-final class RouterTwigExtension extends AbstractExtension
+final class RouterRuntime implements RuntimeExtensionInterface
 {
     private RouterInterface $router;
 
@@ -25,20 +21,6 @@ public function __construct(RouterInterface $router)
         $this->router = $router;
     }
 
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('routeExists', [$this, 'routeExists']),
-        ];
-    }
-
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('splitTag', [$this, 'splitTag']),
-        ];
-    }
-
     public function routeExists(string $name): bool
     {
         return null !== $this->router->getRouteCollection()->get($name);

src/Extension/StringTwigExtension.php → src/Runtime/StringRuntime.php

@@ -1,32 +1,20 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * (c) Christian Gripp <mail@core23.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Nucleos\Twig\Extension;
+namespace Nucleos\Twig\Runtime;
 
 use Locale;
 use Nucleos\Twig\Util\StringUtils;
 use NumberFormatter;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
 
-final class StringTwigExtension extends AbstractExtension
+final class StringRuntime
 {
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('format_bytes', [$this, 'formatBytes']),
-            new TwigFilter('obfuscate', [$this, 'obfuscate']),
-        ];
-    }
-
     public function formatBytes(float $bytes, bool $si = true, int $fractionDigits = 0, ?string $locale = null): string
     {
         if (null === $locale) {

src/Extension/UrlAutoConverterTwigExtension.php → src/Runtime/UrlAutoConverterRuntime.php

@@ -1,34 +1,16 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * (c) Christian Gripp <mail@core23.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Nucleos\Twig\Extension;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
+namespace Nucleos\Twig\Runtime;
 
-final class UrlAutoConverterTwigExtension extends AbstractExtension
+final class UrlAutoConverterRuntime
 {
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter(
-                'converturls',
-                [$this, 'convertLinks'],
-                [
-                    'is_safe' => ['html'],
-                ]
-            ),
-        ];
-    }
-
     /**
      * @param array<string, string> $options
      */

tests/Twig/Extension/TwigExtensionIntegrationTest.php → tests/Bridge/Symfony/App/TwigExtensionIntegrationTest.php

@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Nucleos\Twig\Tests\Twig\Extension;
+namespace Nucleos\Twig\Tests\Bridge\Symfony\App;
 
-use Nucleos\Twig\Tests\Bridge\Symfony\App\AppKernel;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Component\HttpKernel\Client;

tests/Bridge/Symfony/DependencyInjection/NucleosTwigExtensionTest.php

@@ -13,19 +13,19 @@
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Nucleos\Twig\Bridge\Symfony\DependencyInjection\NucleosTwigExtension;
-use Nucleos\Twig\Extension\RouterTwigExtension;
-use Nucleos\Twig\Extension\StringTwigExtension;
-use Nucleos\Twig\Extension\UrlAutoConverterTwigExtension;
+use Nucleos\Twig\Extension\RouterExtension;
+use Nucleos\Twig\Extension\StringExtension;
+use Nucleos\Twig\Extension\UrlAutoConverterExtension;
 
 final class NucleosTwigExtensionTest extends AbstractExtensionTestCase
 {
     public function testLoadDefault(): void
     {
         $this->load();
 
-        $this->assertContainerBuilderHasService(UrlAutoConverterTwigExtension::class);
-        $this->assertContainerBuilderHasService(StringTwigExtension::class);
-        $this->assertContainerBuilderHasService(RouterTwigExtension::class);
+        $this->assertContainerBuilderHasService(UrlAutoConverterExtension::class);
+        $this->assertContainerBuilderHasService(StringExtension::class);
+        $this->assertContainerBuilderHasService(RouterExtension::class);
     }
 
     protected function getContainerExtensions(): array