refactor: PHP 8.5 language features via Rector

rector.php gets the PHP sets up to 8.5. Mostly constructor promotion with
readonly properties, typed class constants, ??=, arrow functions,
str_contains/str_starts_with, catch without unused variables, array_any
and #[\Override] on overridden properties; array_key_exists() keys are
cast to string (null keys are deprecated in PHP 8.5). Long promoted
constructor signatures are wrapped one parameter per line.

Checked locally: a crawl of ~1,900 frontend URLs over all sites and the
backchannel APIs (/api/hotel, /api/product, content feed manifest and
records of every type) render the same as before.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
frommeandClaude Opus 5.5 committed 2026-10-26 10:59:53 +01:00
1 parent 96632edf44
commit b51fa4ddad
61 files changed
+320 -609

No files matched your search

@@ -19,6 +19,7 @@ class ContainerViewHelper extends AbstractViewHelper
/**
* @var bool
*/
#[\Override]
protected $escapeOutput = false;
/**
@@ -45,9 +46,7 @@ class ContainerViewHelper extends AbstractViewHelper
public function render()
{
$content = $this->renderChildren();
if ($content === null) {
$content = $this->arguments['content'];
}
$content ??= $this->arguments['content'];
$classes = [];
if (\in_array($this->arguments['data']['colPos'] ?? null, static::$columnsWithoutContainers, false)) {
$classes[] = 'container';
@@ -11,6 +11,7 @@ class FilterSettingsEncoderViewHelper extends AbstractViewHelper
/**
* @var bool
*/
#[\Override]
protected $escapeOutput = false;
public function initializeArguments()
@@ -29,9 +30,7 @@ class FilterSettingsEncoderViewHelper extends AbstractViewHelper
public function render()
{
$argument = $this->renderChildren();
if ($argument === null) {
$argument = $this->arguments['argument'];
}
$argument ??= $this->arguments['argument'];
if ($argument === null) {
return '';
}
@@ -12,6 +12,7 @@ class GmapsUrlViewHelper extends AbstractViewHelper
/**
* @var bool
*/
#[\Override]
protected $escapeOutput = false;
const URLBASE = 'http://maps.google.com/maps?q=%s,%s&t=%s&z=%d';
@@ -11,6 +11,7 @@ class IconViewHelper extends AbstractTagBasedViewHelper
/**
* @var string
*/
#[\Override]
protected $tagName = 'svg';
public function initializeArguments()
@@ -11,6 +11,7 @@ class RatingViewHelper extends AbstractViewHelper
/**
* @var bool
*/
#[\Override]
protected $escapeOutput = false;
public function initializeArguments()
@@ -29,9 +30,7 @@ class RatingViewHelper extends AbstractViewHelper
public function render()
{
$product = $this->renderChildren();
if ($product === null) {
$product = $this->arguments['product'];
}
$product ??= $this->arguments['product'];
$ratingAverage = $product->getRatingAverage();
$ratingVotesCount = $product->getRatingVotesCount();
$fullStars = floor($ratingAverage);
@@ -24,7 +24,7 @@ class ThemeClassesViewHelper extends AbstractViewHelper
public function render()
{
$themeKey = $this->arguments['key'];
if (!array_key_exists($themeKey, $this->arguments['classes'])) {
if (!array_key_exists((string) $themeKey, $this->arguments['classes'])) {
return '';
}
return $this->arguments['classes'][$themeKey];
@@ -10,6 +10,7 @@ class VideoViewHelper extends AbstractViewHelper
/**
* @var bool
*/
#[\Override]
protected $escapeOutput = false;
public function initializeArguments()