Merge branch '3.x' into 4.x

* 3.x: re-add mixed return type
twigphp · Feb 14, 2025 · 3e97fc6 · 3e97fc6
2 parents 9a0f896 + 576b412
commit 3e97fc6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Markup.php b/src/Markup.php
@@ -42,6 +42,9 @@ public function count(): int
         return mb_strlen($this->content, $this->charset);
     }
 
+    /**
+     * @return mixed
+     */
     public function jsonSerialize(): mixed
     {
         return $this->content;

diff --git a/src/Util/TemplateDirIterator.php b/src/Util/TemplateDirIterator.php
@@ -16,11 +16,17 @@
  */
 class TemplateDirIterator extends \IteratorIterator
 {
+    /**
+     * @return string
+     */
     public function current(): mixed
     {
         return file_get_contents(parent::current());
     }
 
+    /**
+     * @return string
+     */
     public function key(): mixed
     {
         return (string) parent::key();