Merge 4.x into 5.x

sonata-project · Feb 7, 2024 · 2a1a2ec · 2a1a2ec
2 parents e87ad73 + d873322
commit 2a1a2ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/rector.php b/rector.php
@@ -21,7 +21,6 @@
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
-use Rector\PHPUnit\Set\PHPUnitLevelSetList;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 
@@ -33,7 +32,7 @@
 
     $rectorConfig->sets([
         LevelSetList::UP_TO_PHP_80,
-        PHPUnitLevelSetList::UP_TO_PHPUNIT_90,
+        PHPUnitSetList::PHPUNIT_90,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
     ]);
 

diff --git a/tests/Functional/Admin/BaseAdminTestCase.php b/tests/Functional/Admin/BaseAdminTestCase.php
@@ -115,7 +115,7 @@ abstract public static function provideCrudUrlsCases(): iterable;
     abstract public static function provideFormsUrlsCases(): iterable;
 
     /**
-     * @return iterable<array<string|array|integer>>
+     * @return iterable<array<string|array|int>>
      *
      * @phpstan-return iterable<array{0: string, 1?: array<string>, 2?: integer}>
      */