Fix Assets Twig extension

webeweb · Mar 21, 2022 · b41755b · b41755b
1 parent ba57f5b
commit b41755b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/Tests/Twig/Extension/AssetsTwigExtensionTest.php b/Tests/Twig/Extension/AssetsTwigExtensionTest.php
@@ -22,6 +22,17 @@
  */
 class AssetsTwigExtensionTest extends AbstractTestCase {
 
+    /**
+     * Tests renderIcon()
+     *
+     * @return void
+     */
+    public function testRenderIcon(): void {
+
+        $this->assertNull(AssetsTwigExtension::renderIcon($this->twigEnvironment, "::"));
+        $this->assertNull(AssetsTwigExtension::renderIcon($this->twigEnvironment, null));
+    }
+
     /**
      * Tests renderIcon()
      *
@@ -71,18 +82,6 @@ public function testRenderIconWithOther(): void {
         $this->assertEquals($res, AssetsTwigExtension::renderIcon($this->twigEnvironment, "fa:home"));
     }
 
-    /**
-     * Tests renderIcon()
-     *
-     * @return void
-     */
-    public function testRenderIconWithoutArguments(): void {
-
-        $res = "";
-
-        $this->assertEquals($res, AssetsTwigExtension::renderIcon($this->twigEnvironment, "::"));
-    }
-
     /**
      * Tests __construct()
      *

diff --git a/Twig/Extension/AssetsTwigExtension.php b/Twig/Extension/AssetsTwigExtension.php
@@ -36,22 +36,21 @@ class AssetsTwigExtension extends BaseTwigExtension {
      */
     public static function renderIcon(Environment $twigEnvironment, ?string $name, string $style = null): ?string {
 
-        // Determines the handler.
         $handler = explode(":", $name);
         if (1 === count($handler)) {
             array_unshift($handler, "g");
         }
-        if (2 !== count($handler)) {
+        if (2 !== count($handler) || null === $name) {
             return null;
         }
 
         switch ($handler[0]) {
 
-            case "b": // Bootstrap
             case "bi": // Bootstrap icons
                 $output = (new IconTwigExtension($twigEnvironment))->renderIcon($handler[1], $style);
                 break;
 
+            case "b": // Bootstrap
             case "g": // Glyphicon
                 $output = (new GlyphiconTwigExtension($twigEnvironment))->renderIcon($handler[1], $style);
                 break;