Merge branch '3.x' into 4.x

* 3.x:
  re-add mixed return type
This commit is contained in:
Fabien Potencier
2025-02-14 14:08:09 +01:00
2 changed files with 9 additions and 0 deletions
+3
View File
@@ -42,6 +42,9 @@ class Markup implements \Countable, \JsonSerializable, \Stringable
return mb_strlen($this->content, $this->charset);
}
/**
* @return mixed
*/
public function jsonSerialize(): mixed
{
return $this->content;
+6
View File
@@ -16,11 +16,17 @@ namespace Twig\Util;
*/
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();