build: twig is now optional; spinoff encoder service (#41)

rekalogika · Apr 6, 2024 · 4ab5989 · 4ab5989
1 parent a25aafc
commit 4ab5989
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+# 0.8.0
+
+* build: spinoff encoder service definition
+* build: twig & twigbundle is now optional
+
 # 0.7.2
 
 * fix: next page skipping bug & lazy loading Pager

diff --git a/packages/rekapager-bundle/composer.json b/packages/rekapager-bundle/composer.json
@@ -34,13 +34,10 @@
         "symfony/config": "^6.4 || ^7.0",
         "symfony/dependency-injection": "^6.4 || ^7.0",
         "symfony/flex": ">=1.3.1",
-        "symfony/framework-bundle": "^6.4 || ^7.0",
         "symfony/http-foundation": "^6.4 || ^7.0",
         "symfony/http-kernel": "^6.4 || ^7.0",
         "symfony/routing": "^6.4 || ^7.0",
         "symfony/serializer": "^6.4 || ^7.0",
-        "symfony/stimulus-bundle": "^2.16",
-        "symfony/twig-bundle": "^6.4 || ^7.0",
-        "twig/twig": "^3.8"
+        "symfony/stimulus-bundle": "^2.16"
     }
 }
diff --git a/packages/rekapager-bundle/config/encoders.php b/packages/rekapager-bundle/config/encoders.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of rekalogika/rekapager package.
+ *
+ * (c) Priyadi Iman Nurcahyo <https://rekalogika.dev>
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+use Rekalogika\Rekapager\Keyset\PageIdentifierEncoder\SymfonySerializerKeysetPageIdentifierEncoder;
+use Rekalogika\Rekapager\Offset\OffsetPageIdentifierEncoder;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\Serializer\Encoder\DecoderInterface;
+use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    if (class_exists(SymfonySerializerKeysetPageIdentifierEncoder::class)) {
+        $services
+            ->set(SymfonySerializerKeysetPageIdentifierEncoder::class)
+            ->args([
+                service(NormalizerInterface::class),
+                service(DenormalizerInterface::class),
+                service(EncoderInterface::class),
+                service(DecoderInterface::class),
+            ])
+            ->tag('rekalogika.rekapager.page_identifier_encoder');
+    }
+
+    if (class_exists(OffsetPageIdentifierEncoder::class)) {
+        $services
+            ->set(OffsetPageIdentifierEncoder::class)
+            ->tag('rekalogika.rekapager.page_identifier_encoder');
+    }
+};
diff --git a/packages/rekapager-bundle/config/services.php b/packages/rekapager-bundle/config/services.php
@@ -20,14 +20,8 @@
 use Rekalogika\Rekapager\Bundle\Twig\RekapagerRuntime;
 use Rekalogika\Rekapager\Bundle\Twig\TwigPagerRenderer;
 use Rekalogika\Rekapager\Contracts\PageIdentifierEncoderLocatorInterface;
-use Rekalogika\Rekapager\Keyset\PageIdentifierEncoder\SymfonySerializerKeysetPageIdentifierEncoder;
-use Rekalogika\Rekapager\Offset\OffsetPageIdentifierEncoder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Serializer\Encoder\DecoderInterface;
-use Symfony\Component\Serializer\Encoder\EncoderInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_locator;
@@ -69,24 +63,6 @@
             )
         ]);
 
-    if (class_exists(SymfonySerializerKeysetPageIdentifierEncoder::class)) {
-        $services
-            ->set(SymfonySerializerKeysetPageIdentifierEncoder::class)
-            ->args([
-                service(NormalizerInterface::class),
-                service(DenormalizerInterface::class),
-                service(EncoderInterface::class),
-                service(DecoderInterface::class),
-            ])
-            ->tag('rekalogika.rekapager.page_identifier_encoder');
-    }
-
-    if (class_exists(OffsetPageIdentifierEncoder::class)) {
-        $services
-            ->set(OffsetPageIdentifierEncoder::class)
-            ->tag('rekalogika.rekapager.page_identifier_encoder');
-    }
-
     $services
         ->set(
             PageUrlGeneratorFactoryInterface::class,

diff --git a/packages/rekapager-bundle/src/DependencyInjection/RekalogikaRekapagerExtension.php b/packages/rekapager-bundle/src/DependencyInjection/RekalogikaRekapagerExtension.php
@@ -35,6 +35,7 @@ public function load(array $configs, ContainerBuilder $container)
             new FileLocator(__DIR__ . '/../../config')
         );
         $loader->load('services.php');
+        $loader->load('encoders.php');
 
         if ($debug) {
             $loader->load('debug.php');

diff --git a/packages/rekapager-bundle/src/DependencyInjection/RemoveMissingDepsPass.php b/packages/rekapager-bundle/src/DependencyInjection/RemoveMissingDepsPass.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of rekalogika/rekapager package.
+ *
+ * (c) Priyadi Iman Nurcahyo <https://rekalogika.dev>
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+namespace Rekalogika\Rekapager\Bundle\DependencyInjection;
+
+use Rekalogika\Rekapager\Bundle\Twig\TwigPagerRenderer;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class RemoveMissingDepsPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('twig')) {
+            $container->removeDefinition(TwigPagerRenderer::class);
+            $container->removeDefinition('rekalogika.rekapager.twig.runtime');
+            $container->removeDefinition('rekalogika.rekapager.twig.extension');
+        }
+    }
+}
diff --git a/packages/rekapager-bundle/src/RekalogikaRekapagerBundle.php b/packages/rekapager-bundle/src/RekalogikaRekapagerBundle.php
@@ -13,6 +13,8 @@
 
 namespace Rekalogika\Rekapager\Bundle;
 
+use Rekalogika\Rekapager\Bundle\DependencyInjection\RemoveMissingDepsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class RekalogikaRekapagerBundle extends Bundle
@@ -21,4 +23,11 @@ public function getPath(): string
     {
         return \dirname(__DIR__);
     }
+
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new RemoveMissingDepsPass());
+    }
 }