Update PHPUnit to fix deprecations

composer.json

@@ -27,6 +27,7 @@
         "phpdocumentor/reflection-docblock": "^5.0"
     },
     "require-dev": {
+        "laravel/pint": "^1.24",
         "orchestra/testbench": "^5.3|^6.0|^7.0|^9.0|^10.0",
         "phpunit/phpunit": "^9.5.13|^10.5|^11.5"
     },

phpunit.xml.dist

@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         shortenArraysForExportThreshold="10"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true">
     <testsuites>
         <testsuite name="Laravel OpenAPI Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
+    <source ignoreIndirectDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
 </phpunit>

pint.json

@@ -0,0 +1,3 @@
+{
+  "preset": "laravel"
+}

src/Attributes/Extension.php

@@ -10,10 +10,12 @@
 class Extension
 {
     public ?string $factory;
+
     public ?string $key;
+
     public ?string $value;
 
-    public function __construct(string $factory = null, string $key = null, string $value = null)
+    public function __construct(?string $factory = null, ?string $key = null, ?string $value = null)
     {
         if ($factory) {
             $this->factory = class_exists($factory) ? $factory : app()->getNamespace().'OpenApi\\Extensions\\'.$factory;

src/Attributes/Operation.php

@@ -21,22 +21,24 @@ class Operation
     public ?array $servers;
 
     /**
-     * @param  string|null  $id
-     * @param  array  $tags
      * @param  \Vyuldashev\LaravelOpenApi\Factories\SecuritySchemeFactory|string|null  $security
-     * @param  string|null  $method
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(string $id = null, array $tags = [], string $security = null, string $method = null, array $servers = null)
-    {
+    public function __construct(
+        ?string $id = null,
+        array $tags = [],
+        ?string $security = null,
+        ?string $method = null,
+        ?array $servers = null
+    ) {
         $this->id = $id;
         $this->tags = $tags;
         $this->method = $method;
         $this->servers = $servers;
 
         if ($security === '') {
-            //user wants to turn off security on this operation
+            // user wants to turn off security on this operation
             $this->security = $security;
 
             return;
@@ -47,7 +49,8 @@ public function __construct(string $id = null, array $tags = [], string $securit
 
             if (! is_a($this->security, SecuritySchemeFactory::class, true)) {
                 throw new InvalidArgumentException(
-                    sprintf('Security class is either not declared or is not an instance of %s', SecuritySchemeFactory::class)
+                    sprintf('Security class is either not declared or is not an instance of %s',
+                        SecuritySchemeFactory::class)
                 );
             }
         }

src/Attributes/Response.php

@@ -15,7 +15,7 @@ class Response
 
     public ?string $description;
 
-    public function __construct(string $factory, int $statusCode = null, string $description = null)
+    public function __construct(string $factory, ?int $statusCode = null, ?string $description = null)
     {
         $this->factory = class_exists($factory) ? $factory : app()->getNamespace().'OpenApi\\Responses\\'.$factory;
 

src/Builders/ComponentsBuilder.php

@@ -13,9 +13,13 @@
 class ComponentsBuilder
 {
     protected CallbacksBuilder $callbacksBuilder;
+
     protected RequestBodiesBuilder $requestBodiesBuilder;
+
     protected ResponsesBuilder $responsesBuilder;
+
     protected SchemasBuilder $schemasBuilder;
+
     protected SecuritySchemesBuilder $securitySchemesBuilder;
 
     public function __construct(

src/Builders/Paths/Operation/ParametersBuilder.php

@@ -31,7 +31,8 @@ protected function buildPath(RouteInformation $route): Collection
 
                 /** @var ReflectionParameter|null $reflectionParameter */
                 $reflectionParameter = collect($route->actionParameters)
-                    ->first(static fn (ReflectionParameter $reflectionParameter) => $reflectionParameter->name === $parameter['name']);
+                    ->first(static fn (ReflectionParameter $reflectionParameter
+                    ) => $reflectionParameter->name === $parameter['name']);
 
                 if ($reflectionParameter) {
                     // The reflected param has no type, so ignore (should be defined in a ParametersFactory instead)
@@ -49,7 +50,8 @@ protected function buildPath(RouteInformation $route): Collection
                 }
                 /** @var Param $description */
                 $description = collect($route->actionDocBlock->getTagsByName('param'))
-                    ->first(static fn (Param $param) => Str::snake($param->getVariableName()) === Str::snake($parameter['name']));
+                    ->first(static fn (Param $param
+                    ) => Str::snake($param->getVariableName()) === Str::snake($parameter['name']));
 
                 return Parameter::path()->name($parameter['name'])
                     ->required()

src/Builders/Paths/Operation/RequestBodyBuilder.php

@@ -13,7 +13,8 @@ class RequestBodyBuilder
     public function build(RouteInformation $route): ?RequestBody
     {
         /** @var RequestBodyAttribute|null $requestBody */
-        $requestBody = $route->actionAttributes->first(static fn (object $attribute) => $attribute instanceof RequestBodyAttribute);
+        $requestBody = $route->actionAttributes->first(static fn (object $attribute
+        ) => $attribute instanceof RequestBodyAttribute);
 
         if ($requestBody) {
             /** @var RequestBodyFactory $requestBodyFactory */

src/Builders/Paths/OperationsBuilder.php

@@ -20,21 +20,25 @@
 class OperationsBuilder
 {
     protected CallbacksBuilder $callbacksBuilder;
+
     protected ParametersBuilder $parametersBuilder;
+
     protected RequestBodyBuilder $requestBodyBuilder;
+
     protected ResponsesBuilder $responsesBuilder;
+
     protected ExtensionsBuilder $extensionsBuilder;
+
     protected SecurityBuilder $securityBuilder;
 
     public function __construct(
-        CallbacksBuilder   $callbacksBuilder,
-        ParametersBuilder  $parametersBuilder,
+        CallbacksBuilder $callbacksBuilder,
+        ParametersBuilder $parametersBuilder,
         RequestBodyBuilder $requestBodyBuilder,
-        ResponsesBuilder   $responsesBuilder,
-        ExtensionsBuilder  $extensionsBuilder,
-        SecurityBuilder    $securityBuilder
-    )
-    {
+        ResponsesBuilder $responsesBuilder,
+        ExtensionsBuilder $extensionsBuilder,
+        SecurityBuilder $securityBuilder
+    ) {
         $this->callbacksBuilder = $callbacksBuilder;
         $this->parametersBuilder = $parametersBuilder;
         $this->requestBodyBuilder = $requestBodyBuilder;
@@ -44,8 +48,7 @@ public function __construct(
     }
 
     /**
-     * @param RouteInformation[]|Collection $routes
-     * @return array
+     * @param  RouteInformation[]|Collection  $routes
      *
      * @throws InvalidArgumentException
      */
@@ -57,13 +60,13 @@ public function build(array|Collection $routes): array
         foreach ($routes as $route) {
             /** @var OperationAttribute|null $operationAttribute */
             $operationAttribute = $route->actionAttributes
-                ->first(static fn(object $attribute) => $attribute instanceof OperationAttribute);
+                ->first(static fn (object $attribute) => $attribute instanceof OperationAttribute);
 
             $operationId = optional($operationAttribute)->id;
             $tags = $operationAttribute->tags ?? [];
             $servers = collect($operationAttribute->servers)
-                ->filter(fn($server) => app($server) instanceof ServerFactory)
-                ->map(static fn($server) => app($server)->build())
+                ->filter(fn ($server) => app($server) instanceof ServerFactory)
+                ->map(static fn ($server) => app($server)->build())
                 ->toArray();
 
             $parameters = $this->parametersBuilder->build($route);

src/Builders/PathsBuilder.php

@@ -24,9 +24,7 @@ public function __construct(
     }
 
     /**
-     * @param  string  $collection
      * @param  PathMiddleware[]  $middlewares
-     * @return array
      */
     public function build(
         string $collection,

src/Builders/ServersBuilder.php

@@ -9,7 +9,6 @@
 class ServersBuilder
 {
     /**
-     * @param  array  $config
      * @return Server[]
      */
     public function build(array $config): array

src/Builders/TagsBuilder.php

@@ -9,7 +9,6 @@
 class TagsBuilder
 {
     /**
-     * @param  array  $config
      * @return Tag[]
      */
     public function build(array $config): array

src/ClassMapGenerator.php

@@ -29,7 +29,7 @@ public static function createMap(Iterator|string $dir): array
 
             $path = $file->getRealPath() ?: $file->getPathname();
 
-            if ('php' !== pathinfo($path, PATHINFO_EXTENSION)) {
+            if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
                 continue;
             }
 
@@ -97,7 +97,7 @@ private static function findClasses(string $path): array
                             break;
                         }
 
-                        if (T_DOUBLE_COLON === $tokens[$j][0]) {
+                        if ($tokens[$j][0] === T_DOUBLE_COLON) {
                             $isClassConstant = true;
                             break;
                         }
@@ -114,9 +114,9 @@ private static function findClasses(string $path): array
                     // Find the classname
                     while (isset($tokens[++$i][1])) {
                         $t = $tokens[$i];
-                        if (T_STRING === $t[0]) {
+                        if ($t[0] === T_STRING) {
                             $class .= $t[1];
-                        } elseif ('' !== $class && T_WHITESPACE === $t[0]) {
+                        } elseif ($class !== '' && $t[0] === T_WHITESPACE) {
                             break;
                         }
                     }

src/Console/CallbackFactoryMakeCommand.php

@@ -8,7 +8,9 @@
 class CallbackFactoryMakeCommand extends GeneratorCommand
 {
     protected $name = 'openapi:make-callback';
+
     protected $description = 'Create a new callback factory class';
+
     protected $type = 'Extension';
 
     protected function getStub(): string

src/Console/ExtensionFactoryMakeCommand.php

@@ -8,13 +8,16 @@
 class ExtensionFactoryMakeCommand extends GeneratorCommand
 {
     protected $name = 'openapi:make-extension';
+
     protected $description = 'Create a new extension factory class';
+
     protected $type = 'Extension';
 
     protected function buildClass($name)
     {
         $output = parent::buildClass($name);
-        $output = str_replace('DummyExtension', Str::start(Str::snake(Str::replaceLast('DummyExtension', '', class_basename($name)), '-'), 'x-'), $output);
+        $output = str_replace('DummyExtension',
+            Str::start(Str::snake(Str::replaceLast('DummyExtension', '', class_basename($name)), '-'), 'x-'), $output);
 
         return $output;
     }

src/Console/GenerateCommand.php

@@ -10,6 +10,7 @@
 class GenerateCommand extends Command
 {
     protected $signature = 'openapi:generate {collection=default} {--output= : Output file}';
+
     protected $description = 'Generate OpenAPI specification';
 
     public function handle(Generator $generator): void
@@ -23,8 +24,9 @@ public function handle(Generator $generator): void
         }
 
         if ($this->option('output')) {
-            //create file if not exists, or overwrite if exists and put the generated JSON there
-            file_put_contents($this->option('output'), $generator->generate($this->argument('collection'))->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+            // create file if not exists, or overwrite if exists and put the generated JSON there
+            file_put_contents($this->option('output'),
+                $generator->generate($this->argument('collection'))->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
 
             $this->info('OpenAPI specification generated successfully.');
 

src/Console/ParametersFactoryMakeCommand.php

@@ -8,7 +8,9 @@
 class ParametersFactoryMakeCommand extends GeneratorCommand
 {
     protected $name = 'openapi:make-parameters';
+
     protected $description = 'Create a new Parameters factory class';
+
     protected $type = 'Parameters';
 
     protected function getStub(): string

src/Console/RequestBodyFactoryMakeCommand.php

@@ -8,7 +8,9 @@
 class RequestBodyFactoryMakeCommand extends GeneratorCommand
 {
     protected $name = 'openapi:make-requestbody';
+
     protected $description = 'Create a new RequestBody factory class';
+
     protected $type = 'RequestBody';
 
     protected function getStub(): string

src/Console/ResponseFactoryMakeCommand.php

@@ -8,7 +8,9 @@
 class ResponseFactoryMakeCommand extends GeneratorCommand
 {
     protected $name = 'openapi:make-response';
+
     protected $description = 'Create a new Response factory class';
+
     protected $type = 'Response';
 
     protected function getStub(): string

src/Console/RoutesCommand.php

@@ -9,6 +9,7 @@
 class RoutesCommand extends Command
 {
     protected $signature = 'openapi:routes';
+
     protected $description = 'List all registered route with additional information';
 
     public function handle(): void

src/Console/SchemaFactoryMakeCommand.php

@@ -18,7 +18,9 @@
 class SchemaFactoryMakeCommand extends GeneratorCommand
 {
     protected $name = 'openapi:make-schema';
+
     protected $description = 'Create a new Schema factory class';
+
     protected $type = 'Schema';
 
     protected function buildClass($name)
@@ -46,7 +48,8 @@ protected function buildModel($output, $model)
         /** @var Model $model */
         $model = app($model);
 
-        $columns = SchemaFacade::connection($model->getConnectionName())->getColumnListing(config('database.connections.'.config('database.default').'.prefix', '').$model->getTable());
+        $columns = SchemaFacade::connection($model->getConnectionName())->getColumnListing(config('database.connections.'.config('database.default').'.prefix',
+            '').$model->getTable());
         $connection = $model->getConnection();
 
         $definition = 'return Schema::object(\''.class_basename($model).'\')'.PHP_EOL;
@@ -55,7 +58,8 @@ protected function buildModel($output, $model)
         $properties = collect($columns)
             ->map(static function ($column) use ($model, $connection) {
                 /** @var Column $column */
-                $column = $connection->getDoctrineColumn(config('database.connections.'.config('database.default').'.prefix', '').$model->getTable(), $column);
+                $column = $connection->getDoctrineColumn(config('database.connections.'.config('database.default').'.prefix',
+                    '').$model->getTable(), $column);
                 $name = $column->getName();
                 $default = $column->getDefault();
                 $notNull = $column->getNotnull();