Merge pull request #399 from garak/fix-deprecation

fix spaceless deprecation
KnpLabs · Feb 28, 2025 · 328bb43 · 328bb43
2 parents f452411 + 6371b22
commit 328bb43
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -42,29 +42,29 @@ jobs:
                 include:
                     - description: 'No Symfony specified'
                       php: '8.1'
-                      max_deprecations: 1
+                      max_deprecations: 0
                     - description: 'No Symfony specified'
                       php: '8.2'
-                      max_deprecations: 1
+                      max_deprecations: 0
                     - description: 'No Symfony specified'
                       php: '8.3'
-                      max_deprecations: 1
+                      max_deprecations: 0
                     - description: 'No Symfony specified'
                       php: '8.4'
-                      max_deprecations: 1
+                      max_deprecations: 0
                     - description: 'Lowest deps'
                       php: '8.1'
                       composer_option: '--prefer-lowest'
                       max_deprecations: 0
                     - description: 'Symfony 6'
                       php: '8.1'
                       symfony: 6.4.*
-                      max_deprecations: 1
+                      max_deprecations: 0
                     - description: 'Symfony 7'
                       php: '8.4'
                       dev: true
                       symfony: 7.2.*
-                      max_deprecations: 1
+                      max_deprecations: 0
         name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
         steps:
             - name: Checkout

diff --git a/src/Knp/Menu/Resources/views/knp_menu.html.twig b/src/Knp/Menu/Resources/views/knp_menu.html.twig
@@ -9,7 +9,7 @@
 {% endmacro %}
 
 {% block compressed_root %}
-{% apply spaceless %}
+{% apply knp_menu_spaceless %}
 {{ block('root') }}
 {% endapply %}
 {% endblock %}

diff --git a/src/Knp/Menu/Twig/MenuExtension.php b/src/Knp/Menu/Twig/MenuExtension.php
@@ -43,6 +43,7 @@ public function getFilters(): array
 
         return [
             new TwigFilter('knp_menu_as_string', $legacy ? [$this, 'pathAsString'] : [MenuRuntimeExtension::class, 'pathAsString']),
+            new TwigFilter('knp_menu_spaceless', [self::class, 'spaceless'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -121,4 +122,12 @@ public function isAncestor(ItemInterface $item, ?int $depth = null): bool
 
         return $this->runtimeExtension->isAncestor($item, $depth);
     }
+
+    /**
+     * @internal
+     */
+    public static function spaceless(string $content): string
+    {
+        return trim((string) preg_replace('/>\s+</', '><', $content));
+    }
 }
diff --git a/tests/Knp/Menu/Tests/Renderer/TwigRendererTest.php b/tests/Knp/Menu/Tests/Renderer/TwigRendererTest.php
@@ -7,6 +7,7 @@
 use Knp\Menu\MenuItem;
 use Knp\Menu\Renderer\RendererInterface;
 use Knp\Menu\Renderer\TwigRenderer;
+use Knp\Menu\Twig\MenuExtension;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
@@ -16,6 +17,7 @@ public function createRenderer(MatcherInterface $matcher): RendererInterface
     {
         $loader = new FilesystemLoader(__DIR__.'/../../../../../src/Knp/Menu/Resources/views');
         $environment = new Environment($loader);
+        $environment->addExtension(new MenuExtension());
 
         return new TwigRenderer($environment, 'knp_menu.html.twig', $matcher, ['compressed' => true]);
     }