fix: Fix deprecation notice in trim_words method when null is passed. (#3131)

Levdbas · gchtr · web-flow · commit 78d928d792af · 2025-09-02T09:48:17.000+02:00
* fix: fix deprecation notice in trim_words method when null is passed.

---------

Co-authored-by: Lukas Gächter &lt;lukas.gaechter@mind.ch&gt;
diff --git a/src/TextHelper.php b/src/TextHelper.php
@@ -43,6 +43,10 @@ public static function trim_characters($text, $num_chars = 60, $more = '&hellip;
      */
     public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote')
     {
+        if (empty($text)) {
+            return '';
+        }
+
         if (null === $more) {
             $more = \__('&hellip;');
         }
@@ -62,7 +66,7 @@ public static function trim_words($text, $num_words = 55, $more = null, $allowed
          *                             Default `p a span b i br blockquote`.
          */
         $allowed_tags_array = \explode(' ', (string) \apply_filters('timber/trim_words/allowed_tags', $allowed_tags));
-        $allowed_tags_array = \array_filter($allowed_tags_array, fn ($value) => $value !== '');
+        $allowed_tags_array = \array_filter($allowed_tags_array, fn($value) => $value !== '');
         $allowed_tag_string = '<' . \implode('><', $allowed_tags_array) . '>';
 
         $text = \strip_tags($text, $allowed_tag_string);
diff --git a/tests/test-timber-text-helper.php b/tests/test-timber-text-helper.php
@@ -31,4 +31,12 @@ public function testTruncaseEnglish()
         $result = Timber::compile_string($str);
         $this->assertEquals(wp_trim_words($this->gettysburg, 5), $result);
     }
+
+    public function testNullTruncate()
+    {
+        $chars = null;
+        $str = '{{ null|truncate( 5, true ) }}';
+        $result = Timber::compile_string($str);
+        $this->assertEquals('', $result);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,12 @@ public function testTruncaseEnglish()`
`31`	`31`	`$result = Timber::compile_string($str);`
`32`	`32`	`$this->assertEquals(wp_trim_words($this->gettysburg, 5), $result);`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+ public function testNullTruncate()`
	`36`	`+ {`
	`37`	`+ $chars = null;`
	`38`	`+ $str = '{{ null\|truncate( 5, true ) }}';`
	`39`	`+ $result = Timber::compile_string($str);`
	`40`	`+ $this->assertEquals('', $result);`
	`41`	`+ }`
`34`	`42`	`}`