Skip to content

Commit 5fabdd0

Browse files
committed
minor #4764 re-add mixed return type (xabbuh)
This PR was merged into the 3.x branch. Discussion ---------- re-add mixed return type re-doing #4582, see https://github.com/symfony/symfony/actions/runs/21779345389/job/62840897500#step:8:3635 Commits ------- 3a90366 re-add mixed return type
2 parents 3e213d1 + 3a90366 commit 5fabdd0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'single_line_throw' => false,
1919
'ordered_imports' => true,
2020
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
21+
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
2122
])
2223
->setRiskyAllowed(true)
2324
->setParallelConfig(ParallelConfigFactory::detect())

src/Markup.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public function count()
4646
return mb_strlen($this->content, $this->charset);
4747
}
4848

49+
/**
50+
* @return mixed
51+
*/
4952
#[\ReturnTypeWillChange]
5053
public function jsonSerialize()
5154
{

0 commit comments

Comments
 (0)