Rector: FunctionLikeToFirstClassCallableRector, ClosureToArrowFunctionRector, NullToStrictStringFuncCallArgRector, FunctionFirstClassCallableRector

Author: johanib

ci/qa/rector.php

@@ -3,19 +3,27 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+use Rector\Php82\Rector\Class_\ReadOnlyClassRector;
 
 return RectorConfig::configure()
     ->withPaths([
-         __DIR__ . '/../../config',
-         __DIR__ . '/../../src',
-         __DIR__ . '/../../tests',
-         __DIR__ . '/../../templates',
+        __DIR__ . '/../../config',
+        __DIR__ . '/../../src',
+        __DIR__ . '/../../tests',
+        __DIR__ . '/../../templates',
     ])
-    // uncomment to reach your current PHP version
-//     ->withPhpSets()
+    ->withPhpSets()
     ->withAttributesSets(all: true)
     ->withComposerBased(symfony: true, twig: true, doctrine: true, phpunit: true)
     ->withTypeCoverageLevel(10)
     ->withDeadCodeLevel(10)
-    ->withCodeQualityLevel(0)
-;
+    ->withCodeQualityLevel(10)
+    ->withSkip([
+        ReadOnlyClassRector::class,
+        ReadOnlyPropertyRector::class,
+        ClassPropertyAssignToConstructorPromotionRector::class,
+        RestoreDefaultNullToNullableTypePropertyRector::class,
+    ]);

src/Surfnet/Stepup/Configuration/Value/InstitutionSet.php

@@ -83,7 +83,7 @@ public function getInstitutions(): array
 
     public function toScalarArray(): array
     {
-        return array_map('strval', $this->institutions);
+        return array_map(strval(...), $this->institutions);
     }
 
     /**

src/Surfnet/Stepup/Helper/UserDataFormatter.php

@@ -27,7 +27,7 @@ public function format(array $userData, array $errors): array
     {
         $data = [];
         foreach ($userData as $name => $event) {
-            $name = explode('-', $name)[1];
+            $name = explode('-', (string) $name)[1];
             $data[] = [
                 'name' => $name,
                 'value' => $event,

src/Surfnet/StepupMiddleware/ApiBundle/Tests/Service/DeprovisionServiceTest.php

@@ -156,9 +156,7 @@ public function test_is_allowed_to_deprovision_user(): void
 
         $this->raListingRepo
             ->shouldReceive('contains')
-            ->with(m::on(function (IdentityId $identityId) use ($identity): bool {
-                return $identityId->getIdentityId() === $identity->id;
-            }))
+            ->with(m::on(fn(IdentityId $identityId): bool => $identityId->getIdentityId() === $identity->id))
             ->once()
             ->andReturn(false);
 

src/Surfnet/StepupMiddleware/ManagementBundle/Validator/ReconfigureInstitutionRequestValidator.php

@@ -250,7 +250,7 @@ private function getWhitelistedInstitutions(): array
     public function determineNonExistentInstitutions(array $institutions, array $configuredInstitutions): array
     {
         $normalizedConfiguredInstitutions = array_map(
-            fn($institution): string => strtolower($institution),
+            strtolower(...),
             $configuredInstitutions,
         );