fix(code-style): used rector to cleanup and update code

Author: Fahl-Design

.php-cs-fixer.php

@@ -17,6 +17,7 @@
     ->append(
         [
             __FILE__,
+            __DIR__ . '/rector.php',
         ]
     )
 ;

config/routes.php

@@ -46,8 +46,8 @@
             return new TextResponse($content, 200, [
                 'Content-Type' => $contentType,
             ]);
-        } catch (Throwable $e) {
-            return new TextResponse('Error loading spec: ' . $e->getMessage(), 500);
+        } catch (Throwable $throwable) {
+            return new TextResponse('Error loading spec: ' . $throwable->getMessage(), 500);
         }
     };
 
@@ -94,7 +94,7 @@
             <script>
               window.onload = () => {
                 window.ui = SwaggerUIBundle({
-                  url: '$specUrl',
+                  url: '{$specUrl}',
                   dom_id: '#swagger-ui',
                   deepLinking: true,
                   presets: [

rector.php

@@ -12,6 +12,7 @@
         __DIR__ . '/public',
         __DIR__ . '/src',
         __DIR__ . '/tests',
+        __DIR__ . '/bin',
     ])
     // Target PHP version
     ->withPhpVersion(PhpVersion::PHP_83)
@@ -21,8 +22,9 @@
         codeQuality: true,
         typeDeclarations: true,
         privatization: true,
-        earlyReturn: true,
         naming: true,
+        instanceOf: true,
+        earlyReturn: true,
     )
     ->withSets([
         SetList::CODING_STYLE,
@@ -37,6 +39,7 @@
     ->withPHPStanConfigs([
         __DIR__ . '/phpstan.neon',
         __DIR__ . '/vendor/slam/phpstan-laminas-framework/extension.neon',
+        __DIR__ . '/vendor/phpstan/phpstan-webmozart-assert/extension.neon',
     ])
     // Parallel processing
     ->withParallel(

src/Middleware/MockMiddleware/Faker/SchemaFaker/BooleanFaker.php

@@ -52,7 +52,7 @@ private function generateStatic(Schema $schema): ?bool
             /** @var array<bool> $enums */
             $enums = $schema->enum;
 
-            return (bool) reset($enums);
+            return reset($enums);
         }
 
         return true;

src/Middleware/MockMiddleware/Faker/SchemaFaker/FakerContext.php

@@ -8,6 +8,7 @@
 final readonly class FakerContext
 {
     public const string REQUEST  = 'request';
+
     public const string RESPONSE = 'response';
 
     /**

src/Middleware/MockMiddleware/Faker/SchemaFaker/NumberFaker.php

@@ -105,8 +105,6 @@ private function generateStaticFromFormat(Schema $schema): int|float
 
         switch ($schema->format) {
             case 'int32':
-                return (int) NumberUtils::ensureRange(0, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum, $multipleOf);
-
             case 'int64':
                 return (int) NumberUtils::ensureRange(0, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum, $multipleOf);
 

src/Middleware/MockMiddleware/Faker/SchemaFaker/StringFaker.php

@@ -13,13 +13,13 @@
 use WebProject\PhpOpenApiMockServer\Middleware\MockMiddleware\Faker\Options;
 
 /** @internal */
-final class StringFaker implements FakerInterface
+final readonly class StringFaker implements FakerInterface
 {
-    private Generator $faker;
+    private Generator $generator;
 
     public function __construct()
     {
-        $this->faker = Factory::create();
+        $this->generator = Factory::create();
     }
 
     public function generate(Schema $schema, Options $options, FakerRegistry $fakerRegistry, FakerContext $fakerContext): ?string
@@ -35,27 +35,27 @@ private function generateDynamic(Schema $schema): string
     {
         if (!empty($schema->enum)) {
             /** @var string $value */
-            $value = $this->faker->randomElement($schema->enum);
+            $value = $this->generator->randomElement($schema->enum);
 
             return $value;
         }
 
         if (null !== $schema->pattern) {
-            return $this->faker->regexify($schema->pattern);
+            return $this->generator->regexify($schema->pattern);
         }
 
         $maxLength = $schema->maxLength ?? 255;
 
         return match ($schema->format) {
-            'date'      => $this->faker->date(),
-            'date-time' => $this->faker->iso8601(),
-            'email'     => $this->faker->email(),
-            'uuid'      => $this->faker->uuid(),
-            'uri'       => $this->faker->url(),
-            'hostname'  => $this->faker->domainName(),
-            'ipv4'      => $this->faker->ipv4(),
-            'ipv6'      => $this->faker->ipv6(),
-            default     => $this->faker->text($maxLength > 5 ? $maxLength : 20),
+            'date'      => $this->generator->date(),
+            'date-time' => $this->generator->iso8601(),
+            'email'     => $this->generator->email(),
+            'uuid'      => $this->generator->uuid(),
+            'uri'       => $this->generator->url(),
+            'hostname'  => $this->generator->domainName(),
+            'ipv4'      => $this->generator->ipv4(),
+            'ipv6'      => $this->generator->ipv6(),
+            default     => $this->generator->text($maxLength > 5 ? $maxLength : 20),
         };
     }
 

src/Middleware/MockMiddleware/OpenApiMockMiddleware.php

@@ -91,9 +91,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             }
 
             return $response;
-        } catch (Throwable $exception) {
+        } catch (Throwable $throwable) {
             return $this->requestHandler->handleInvalidRequest(
-                $exception,
+                $throwable,
                 isset($requestValidatorResult) ? $requestValidatorResult->getSchema() : null,
                 isset($requestValidatorResult) ? $requestValidatorResult->getOperationAddress() : null,
                 $acceptedContentTypes,

src/Middleware/MockMiddleware/Request/RequestHandler.php

@@ -62,27 +62,27 @@ public function handleValidRequest(
      * @throws Throwable
      */
     public function handleInvalidRequest(
-        Throwable $exception,
+        Throwable $throwable,
         ?OpenApi $openApi,
         ?OperationAddress $operationAddress,
         array $acceptedContentTypes,
         array $pathParameters = []
     ): ResponseInterface {
         $errorContentType = $acceptedContentTypes[0] ?? 'application/json';
 
-        if (null === $openApi || null === $operationAddress) {
-            return $this->responseFaker->handleException(ValidationException::forViolations($exception), $errorContentType);
+        if (!$openApi instanceof OpenApi || !$operationAddress instanceof OperationAddress) {
+            return $this->responseFaker->handleException(ValidationException::forViolations($throwable), $errorContentType);
         }
 
         return match (true) {
-            $exception instanceof NoPath,
-            $exception instanceof FakerNoPath => $this->handleNoPathMatchedRequest($exception, $openApi, $operationAddress, $acceptedContentTypes, $pathParameters),
+            $throwable instanceof NoPath,
+            $throwable instanceof FakerNoPath => $this->handleNoPathMatchedRequest($throwable, $openApi, $operationAddress, $acceptedContentTypes, $pathParameters),
 
-            $exception instanceof InvalidSecurity => $this->handleInvalidSecurityRequest($exception, $openApi, $operationAddress, $acceptedContentTypes, $pathParameters),
+            $throwable instanceof InvalidSecurity => $this->handleInvalidSecurityRequest($throwable, $openApi, $operationAddress, $acceptedContentTypes, $pathParameters),
 
-            $exception instanceof ValidationFailed => $this->handleValidationFailedRequest($exception, $openApi, $operationAddress, $acceptedContentTypes, $pathParameters),
+            $throwable instanceof ValidationFailed => $this->handleValidationFailedRequest($throwable, $openApi, $operationAddress, $acceptedContentTypes, $pathParameters),
 
-            default => $this->responseFaker->handleException(ValidationException::forViolations($exception), $errorContentType),
+            default => $this->responseFaker->handleException(ValidationException::forViolations($throwable), $errorContentType),
         };
     }
 

src/Middleware/MockMiddleware/Response/ResponseFaker.php

@@ -148,13 +148,13 @@ private function negotiateContentType(
             return $acceptedContentTypes[0] ?? 'application/json';
         }
 
-        foreach ($acceptedContentTypes as $acceptedType) {
-            if ('*/*' === $acceptedType) {
+        foreach ($acceptedContentTypes as $acceptedContentType) {
+            if ('*/*' === $acceptedContentType) {
                 return $availableTypes[0];
             }
 
-            if (in_array($acceptedType, $availableTypes, true)) {
-                return $acceptedType;
+            if (in_array($acceptedContentType, $availableTypes, true)) {
+                return $acceptedContentType;
             }
         }