[html-extra] filter classes

twigphp · Jan 23, 2024 · 2dbc861 · 2dbc861
1 parent 284a510
commit 2dbc861
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/extra/html-extra/HtmlExtension.php b/extra/html-extra/HtmlExtension.php
@@ -75,7 +75,7 @@ public function dataUri(string $data, string $mime = null, array $parameters = [
             $repr .= ';'.$key.'='.rawurlencode($value);
         }
 
-        if (0 === strpos($mime, 'text/')) {
+        if (str_starts_with($mime, 'text/')) {
             $repr .= ','.rawurlencode($data);
         } else {
             $repr .= ';base64,'.base64_encode($data);
@@ -108,6 +108,6 @@ public static function htmlClasses(...$args): string
             }
         }
 
-        return implode(' ', array_unique($classes));
+        return implode(' ', array_unique(array_filter($classes)));
     }
 }
diff --git a/extra/html-extra/Tests/Fixtures/html_classes.test b/extra/html-extra/Tests/Fixtures/html_classes.test
@@ -1,12 +1,12 @@
 --TEST--
 "html_classes" function
 --TEMPLATE--
-{{ html_classes('a', {'b': true, 'c': false}, 'd') }}
+{{ html_classes('a', {'b': true, 'c': false}, 'd', false ? 'e', true ? 'f') }}
 {% set class_a = 'a' %}
 {% set class_b = 'b' %}
 {{ html_classes(class_a, {(class_b): true})}}
 --DATA--
 return []
 --EXPECT--
-a b d
+a b d f
 a b