Merge pull request #369 from becoded/avoid-deprecation-warning-php-8.1

neilime · Jul 6, 2022 · 2aba614 · 2aba614
2 parents ce8418c + e227d92
commit 2aba614
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/TwbsHelper/View/HtmlAttributesSet.php b/src/TwbsHelper/View/HtmlAttributesSet.php
@@ -40,6 +40,7 @@ public function __construct(
         $this->cleanAttributes();
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($key)
     {
         if (!$this->offsetExists($key) && isset(static::$attributeWithSet[$key])) {

diff --git a/src/TwbsHelper/View/HtmlClassAttributeSet.php b/src/TwbsHelper/View/HtmlClassAttributeSet.php
@@ -66,7 +66,7 @@ public function cleanAttribute(): self
     {
         $classes = $this->getArrayCopy();
 
-        $classes = array_unique(array_filter(array_map('trim', $classes)));
+        $classes = array_unique(array_filter(array_map('trim', array_filter($classes))));
         sort($classes);
 
         $this->exchangeArray($classes);