mirror of
https://github.com/twigphp/Twig.git
synced 2026-09-05 06:56:51 +00:00
Merge branch '3.x' into 4.x
* 3.x: re-add mixed return type
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user