6654: Upgrade codebase with rector fixes for PHP 8.5

turegjorup · turegjorup · commit 4ac1a39c02b9 · 2026-03-19T11:29:10.000+01:00
diff --git a/config/bundles.php b/config/bundles.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
diff --git a/config/reference.php b/config/reference.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 // This file is auto-generated and is for apps only. Bundles SHOULD NOT rely on its content.
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
@@ -1371,7 +1373,7 @@
  *     mercure?: bool|array{
  *         enabled?: bool|Param, // Default: false
  *         hub_url?: scalar|Param|null, // The URL sent in the Link HTTP header. If not set, will default to the URL for MercureBundle's default hub. // Default: null
- *         include_type?: bool|Param, // Always include @type in updates (including delete ones). // Default: false
+ *         include_type?: bool|Param, // Always include @var in updates (including delete ones). // Default: false
  *     },
  *     messenger?: bool|array{
  *         enabled?: bool|Param, // Default: true
diff --git a/rector.php b/rector.php
@@ -18,12 +18,13 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_83,
-        SymfonySetList::SYMFONY_64,
+        LevelSetList::UP_TO_PHP_85,
+        SymfonySetList::SYMFONY_74,
         SymfonySetList::CONFIGS,
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
         Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_100,
         Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_110,
+        Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_120,
     ]);
 };
diff --git a/src/Admin/Field/AdvisoryCountField.php b/src/Admin/Field/AdvisoryCountField.php
@@ -14,7 +14,7 @@ class AdvisoryCountField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/ChangesField.php b/src/Admin/Field/ChangesField.php
@@ -14,7 +14,7 @@ class ChangesField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/ClonedByField.php b/src/Admin/Field/ClonedByField.php
@@ -14,7 +14,7 @@ class ClonedByField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/ConfigFilePathField.php b/src/Admin/Field/ConfigFilePathField.php
@@ -14,7 +14,7 @@ class ConfigFilePathField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/DomainField.php b/src/Admin/Field/DomainField.php
@@ -14,7 +14,7 @@ class DomainField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/EolTypeField.php b/src/Admin/Field/EolTypeField.php
@@ -14,7 +14,7 @@ class EolTypeField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/LatestStatusField.php b/src/Admin/Field/LatestStatusField.php
@@ -14,7 +14,7 @@ class LatestStatusField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/RootDirField.php b/src/Admin/Field/RootDirField.php
@@ -14,7 +14,7 @@ class RootDirField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/ServerTypeField.php b/src/Admin/Field/ServerTypeField.php
@@ -15,7 +15,7 @@ class ServerTypeField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/SiteTypeField.php b/src/Admin/Field/SiteTypeField.php
@@ -14,7 +14,7 @@ class SiteTypeField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/SourcesField.php b/src/Admin/Field/SourcesField.php
@@ -14,7 +14,7 @@ class SourcesField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/TextMonospaceField.php b/src/Admin/Field/TextMonospaceField.php
@@ -14,7 +14,7 @@ class TextMonospaceField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/VersionField.php b/src/Admin/Field/VersionField.php
@@ -14,7 +14,7 @@ class VersionField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Admin/Field/WarningField.php b/src/Admin/Field/WarningField.php
@@ -14,7 +14,7 @@ class WarningField implements FieldInterface
 
     public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setProperty($propertyName)
             ->setLabel($label)
 
diff --git a/src/Controller/Admin/DashboardController.php b/src/Controller/Admin/DashboardController.php
@@ -5,11 +5,11 @@
 namespace App\Controller\Admin;
 
 use App\Repository\AdvisoryRepository;
+use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminDashboard;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Dashboard;
 use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
-use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminDashboard;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractDashboardController;
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Form/Type/Admin/DetectionFilter.php b/src/Form/Type/Admin/DetectionFilter.php
@@ -18,7 +18,7 @@ class DetectionFilter implements FilterInterface
 
     public static function new(string $propertyName, false|string|TranslatableInterface|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setFilterFqcn(self::class)
             ->setProperty($propertyName)
             ->setLabel($label)
diff --git a/src/Form/Type/Admin/FrameworkFilter.php b/src/Form/Type/Admin/FrameworkFilter.php
@@ -18,7 +18,7 @@ class FrameworkFilter implements FilterInterface
 
     public static function new(string $propertyName, false|string|TranslatableInterface|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setFilterFqcn(self::class)
             ->setProperty($propertyName)
             ->setLabel($label)
diff --git a/src/Form/Type/Admin/HostingProviderFilter.php b/src/Form/Type/Admin/HostingProviderFilter.php
@@ -18,7 +18,7 @@ class HostingProviderFilter implements FilterInterface
 
     public static function new(string $propertyName, false|string|TranslatableInterface|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setFilterFqcn(self::class)
             ->setProperty($propertyName)
             ->setLabel($label)
diff --git a/src/Form/Type/Admin/MariaDbVersionFilter.php b/src/Form/Type/Admin/MariaDbVersionFilter.php
@@ -18,7 +18,7 @@ class MariaDbVersionFilter implements FilterInterface
 
     public static function new(string $propertyName, false|string|TranslatableInterface|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setFilterFqcn(self::class)
             ->setProperty($propertyName)
             ->setLabel($label)
diff --git a/src/Form/Type/Admin/ServerTypeFilter.php b/src/Form/Type/Admin/ServerTypeFilter.php
@@ -18,7 +18,7 @@ class ServerTypeFilter implements FilterInterface
 
     public static function new(string $propertyName, false|string|TranslatableInterface|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setFilterFqcn(self::class)
             ->setProperty($propertyName)
             ->setLabel($label)
diff --git a/src/Form/Type/Admin/SystemFilter.php b/src/Form/Type/Admin/SystemFilter.php
@@ -18,7 +18,7 @@ class SystemFilter implements FilterInterface
 
     public static function new(string $propertyName, false|string|TranslatableInterface|null $label = null): self
     {
-        return (new self())
+        return new self()
             ->setFilterFqcn(self::class)
             ->setProperty($propertyName)
             ->setLabel($label)
diff --git a/src/Service/Exporter.php b/src/Service/Exporter.php
@@ -33,7 +33,7 @@ public function export(AbstractQuery $query, string $className, string $format =
             'itksites-export-%s-%s.%s',
             preg_replace('@^.+\\\\([^\\\\]+)$@', '$1', $className),
             // Windows cannot handle colons in filenames so we use . to separate time parts.
-            (new \DateTimeImmutable())->format('Y-m-d\TH.i.s'),
+            new \DateTimeImmutable()->format('Y-m-d\TH.i.s'),
             $format
         );
 
diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php
@@ -36,9 +36,9 @@ public function entityDisplay(AbstractBaseEntity $entity, string $action): strin
         if (method_exists($entity, 'display')) {
             if ('detail' == $action) {
                 return $entity->display(1);
-            } else {
-                return $entity->display(0);
             }
+
+            return $entity->display(0);
         }
 
         return $entity->__toString();
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -7,7 +7,7 @@
 require dirname(__DIR__).'/vendor/autoload.php';
 
 if (method_exists(Dotenv::class, 'bootEnv')) {
-    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+    new Dotenv()->bootEnv(dirname(__DIR__).'/.env');
 }
 
 if ($_SERVER['APP_DEBUG']) {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AdvisoryCountField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ChangesField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ClonedByField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ConfigFilePathField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class DomainField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class EolTypeField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class LatestStatusField implements FieldInterface`
`14`	`14`
`15`	`15`	`public static function new(string $propertyName, TranslatableInterface\|string\|bool\|null $label = null): self`
`16`	`16`	`{`
`17`		`- return (new self())`
	`17`	`+ return new self()`
`18`	`18`	`->setProperty($propertyName)`
`19`	`19`	`->setLabel($label)`
`20`	`20`