refactor: [5.x] constructor property promotion

nelmio · Nov 15, 2024 · b98617f · b98617f
1 parent 8c47289
commit b98617f
Show file tree

Hide file tree

Showing 29 changed files with 115 additions and 307 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -10,11 +10,6 @@ parameters:
 			count: 2
 			path: src/Render/Html/HtmlOpenApiRenderer.php
 
-		-
-			message: "#^Class Twig_Environment not found\\.$#"
-			count: 1
-			path: src/Render/Html/HtmlOpenApiRenderer.php
-
 		-
 			message: "#^Parameter \\$twig of method Nelmio\\\\ApiDocBundle\\\\Render\\\\Html\\\\HtmlOpenApiRenderer\\:\\:__construct\\(\\) has invalid type Twig_Environment\\.$#"
 			count: 1

diff --git a/src/ApiDocGenerator.php b/src/ApiDocGenerator.php
@@ -30,14 +30,6 @@ final class ApiDocGenerator
     /** @var OpenApi */
     private $openApi;
 
-    /** @var iterable|DescriberInterface[] */
-    private $describers;
-
-    /** @var iterable|ModelDescriberInterface[] */
-    private $modelDescribers;
-
-    private ?CacheItemPoolInterface $cacheItemPool;
-
     private string $cacheItemId;
 
     /** @var string[] */
@@ -53,14 +45,16 @@ final class ApiDocGenerator
     private Generator $generator;
 
     /**
-     * @param DescriberInterface[]|iterable      $describers
-     * @param ModelDescriberInterface[]|iterable $modelDescribers
+     * @param iterable<DescriberInterface>      $describers
+     * @param iterable<ModelDescriberInterface> $modelDescribers
      */
-    public function __construct($describers, $modelDescribers, ?CacheItemPoolInterface $cacheItemPool = null, ?string $cacheItemId = null, ?Generator $generator = null)
-    {
-        $this->describers = $describers;
-        $this->modelDescribers = $modelDescribers;
-        $this->cacheItemPool = $cacheItemPool;
+    public function __construct(
+        private iterable $describers,
+        private iterable $modelDescribers,
+        private ?CacheItemPoolInterface $cacheItemPool = null,
+        ?string $cacheItemId = null,
+        ?Generator $generator = null,
+    ) {
         $this->cacheItemId = $cacheItemId ?? 'openapi_doc';
         $this->generator = $generator ?? new Generator($this->logger);
     }

diff --git a/src/Attribute/Model.php b/src/Attribute/Model.php
@@ -30,23 +30,6 @@ final class Model extends Attachable
         Parameter::class,
     ];
 
-    public string $type;
-
-    /**
-     * @var string[]|null
-     */
-    public ?array $groups;
-
-    /**
-     * @var mixed[]
-     */
-    public array $options;
-
-    /**
-     * @var array<string, mixed>
-     */
-    public array $serializationContext;
-
     /**
      * @param mixed[]              $properties
      * @param string[]             $groups
@@ -55,10 +38,10 @@ final class Model extends Attachable
      */
     public function __construct(
         array $properties = [],
-        string $type = Generator::UNDEFINED,
-        ?array $groups = null,
-        array $options = [],
-        array $serializationContext = [],
+        public string $type = Generator::UNDEFINED,
+        public ?array $groups = null,
+        public array $options = [],
+        public array $serializationContext = [],
     ) {
         parent::__construct($properties + [
             'type' => $type,

diff --git a/src/Attribute/Security.php b/src/Attribute/Security.php
@@ -23,21 +23,14 @@ class Security extends AbstractAnnotation
 
     public static $_required = ['name'];
 
-    public ?string $name;
-
-    /**
-     * @var string[]
-     */
-    public array $scopes = [];
-
     /**
      * @param array<string, mixed> $properties
      * @param string[]             $scopes
      */
     public function __construct(
         array $properties = [],
-        ?string $name = null,
-        array $scopes = [],
+        public ?string $name = null,
+        public array $scopes = [],
     ) {
         parent::__construct($properties + [
             'name' => $name,

diff --git a/src/Command/DumpCommand.php b/src/Command/DumpCommand.php
@@ -20,21 +20,18 @@
 
 final class DumpCommand extends Command
 {
-    private RenderOpenApi $renderOpenApi;
-
     /**
      * @var mixed[]
      */
-    private $defaultHtmlConfig = [
+    private array $defaultHtmlConfig = [
         'assets_mode' => AssetsMode::CDN,
         'swagger_ui_config' => [],
         'redocly_config' => [],
     ];
 
-    public function __construct(RenderOpenApi $renderOpenApi)
-    {
-        $this->renderOpenApi = $renderOpenApi;
-
+    public function __construct(
+        private RenderOpenApi $renderOpenApi,
+    ) {
         parent::__construct();
     }
 

diff --git a/src/Controller/DocumentationController.php b/src/Controller/DocumentationController.php
@@ -19,11 +19,9 @@
 
 final class DocumentationController
 {
-    private RenderOpenApi $renderOpenApi;
-
-    public function __construct(RenderOpenApi $renderOpenApi)
-    {
-        $this->renderOpenApi = $renderOpenApi;
+    public function __construct(
+        private RenderOpenApi $renderOpenApi,
+    ) {
     }
 
     public function __invoke(Request $request, string $area = 'default'): JsonResponse

diff --git a/src/Controller/SwaggerUiController.php b/src/Controller/SwaggerUiController.php
@@ -19,14 +19,10 @@
 
 final class SwaggerUiController
 {
-    private RenderOpenApi $renderOpenApi;
-
-    private string $uiRenderer;
-
-    public function __construct(RenderOpenApi $renderOpenApi, string $uiRenderer)
-    {
-        $this->renderOpenApi = $renderOpenApi;
-        $this->uiRenderer = $uiRenderer;
+    public function __construct(
+        private RenderOpenApi $renderOpenApi,
+        private string $uiRenderer,
+    ) {
     }
 
     public function __invoke(Request $request, string $area = 'default'): Response

diff --git a/src/Controller/YamlDocumentationController.php b/src/Controller/YamlDocumentationController.php
@@ -18,11 +18,9 @@
 
 final class YamlDocumentationController
 {
-    private RenderOpenApi $renderOpenApi;
-
-    public function __construct(RenderOpenApi $renderOpenApi)
-    {
-        $this->renderOpenApi = $renderOpenApi;
+    public function __construct(
+        private RenderOpenApi $renderOpenApi,
+    ) {
     }
 
     public function __invoke(Request $request, string $area = 'default'): Response

diff --git a/src/Describer/ExternalDocDescriber.php b/src/Describer/ExternalDocDescriber.php
@@ -16,20 +16,13 @@
 
 class ExternalDocDescriber implements DescriberInterface
 {
-    /**
-     * @var array<string, mixed>|callable
-     */
-    private $externalDoc;
-
-    private bool $overwrite;
-
     /**
      * @param array<string, mixed>|callable $externalDoc
      */
-    public function __construct($externalDoc, bool $overwrite = false)
-    {
-        $this->externalDoc = $externalDoc;
-        $this->overwrite = $overwrite;
+    public function __construct(
+        private $externalDoc,
+        private bool $overwrite = false,
+    ) {
     }
 
     public function describe(OA\OpenApi $api): void

diff --git a/src/Describer/OpenApiPhpDescriber.php b/src/Describer/OpenApiPhpDescriber.php
@@ -30,15 +30,11 @@ final class OpenApiPhpDescriber
 {
     use SetsContextTrait;
 
-    private RouteCollection $routeCollection;
-    private ControllerReflector $controllerReflector;
-    private LoggerInterface $logger;
-
-    public function __construct(RouteCollection $routeCollection, ControllerReflector $controllerReflector, LoggerInterface $logger)
-    {
-        $this->routeCollection = $routeCollection;
-        $this->controllerReflector = $controllerReflector;
-        $this->logger = $logger;
+    public function __construct(
+        private RouteCollection $routeCollection,
+        private ControllerReflector $controllerReflector,
+        private LoggerInterface $logger,
+    ) {
     }
 
     public function describe(OA\OpenApi $api): void

diff --git a/src/Describer/RouteDescriber.php b/src/Describer/RouteDescriber.php
@@ -20,23 +20,14 @@ final class RouteDescriber implements DescriberInterface, ModelRegistryAwareInte
 {
     use ModelRegistryAwareTrait;
 
-    private RouteCollection $routeCollection;
-
-    private ControllerReflector $controllerReflector;
-
-    /**
-     * @var iterable<RouteDescriberInterface>
-     */
-    private iterable $routeDescribers;
-
     /**
-     * @param RouteDescriberInterface[]|iterable $routeDescribers
+     * @param iterable<RouteDescriberInterface> $routeDescribers
      */
-    public function __construct(RouteCollection $routeCollection, ControllerReflector $controllerReflector, $routeDescribers)
-    {
-        $this->routeCollection = $routeCollection;
-        $this->controllerReflector = $controllerReflector;
-        $this->routeDescribers = $routeDescribers;
+    public function __construct(
+        private RouteCollection $routeCollection,
+        private ControllerReflector $controllerReflector,
+        private iterable $routeDescribers,
+    ) {
     }
 
     public function describe(OA\OpenApi $api): void

diff --git a/src/Model/Model.php b/src/Model/Model.php
@@ -15,28 +15,17 @@
 
 final class Model
 {
-    private Type $type;
-
-    /**
-     * @var mixed[]
-     */
-    private array $options;
-
-    /**
-     * @var mixed[]
-     */
-    private array $serializationContext;
-
     /**
      * @param string[]|null $groups
      * @param mixed[]       $options
      * @param mixed[]       $serializationContext
      */
-    public function __construct(Type $type, ?array $groups = null, array $options = [], array $serializationContext = [])
+    public function __construct(
+        private Type $type,
+        ?array $groups = null,
+        private array $options = [],
+        private array $serializationContext = [])
     {
-        $this->type = $type;
-        $this->options = $options;
-        $this->serializationContext = $serializationContext;
         if (null !== $groups) {
             $this->serializationContext['groups'] = $groups;
         }

diff --git a/src/Model/ModelRegistry.php b/src/Model/ModelRegistry.php
@@ -49,22 +49,16 @@ final class ModelRegistry
     private array $names = [];
 
     /**
-     * @var iterable<ModelDescriberInterface>
-     */
-    private iterable $modelDescribers;
-
-    private OA\OpenApi $api;
-
-    /**
-     * @param ModelDescriberInterface[]|iterable $modelDescribers
-     * @param array<string, mixed>               $alternativeNames
+     * @param iterable<ModelDescriberInterface> $modelDescribers
+     * @param array<string, mixed>              $alternativeNames
      *
      * @internal
      */
-    public function __construct($modelDescribers, OA\OpenApi $api, array $alternativeNames = [])
+    public function __construct(
+        private iterable $modelDescribers,
+        private OA\OpenApi $api,
+        array $alternativeNames = [])
     {
-        $this->modelDescribers = $modelDescribers;
-        $this->api = $api;
         $this->logger = new NullLogger();
         foreach (array_reverse($alternativeNames) as $alternativeName => $criteria) {
             $this->alternativeNames[] = $model = new Model(

diff --git a/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php b/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php
@@ -26,16 +26,11 @@ class SymfonyConstraintAnnotationReader
 {
     use SetsContextTrait;
 
-    /**
-     * @var OA\Schema
-     */
-    private $schema;
+    private OA\Schema $schema;
 
-    private bool $useValidationGroups;
-
-    public function __construct(bool $useValidationGroups = false)
-    {
-        $this->useValidationGroups = $useValidationGroups;
+    public function __construct(
+        private bool $useValidationGroups = false,
+    ) {
     }
 
     /**
@@ -68,11 +63,6 @@ private function processPropertyAttributes($reflection, OA\Property $property, a
                     return;
                 }
 
-                // The field is required
-                if (null === $this->schema) {
-                    return;
-                }
-
                 $propertyName = Util::getSchemaPropertyName($this->schema, $property);
                 if (null === $propertyName) {
                     return;

diff --git a/src/ModelDescriber/BazingaHateoasModelDescriber.php b/src/ModelDescriber/BazingaHateoasModelDescriber.php
@@ -26,13 +26,10 @@ class BazingaHateoasModelDescriber implements ModelDescriberInterface, ModelRegi
 {
     use ModelRegistryAwareTrait;
 
-    private MetadataFactoryInterface $factory;
-    private JMSModelDescriber $JMSModelDescriber;
-
-    public function __construct(MetadataFactoryInterface $factory, JMSModelDescriber $JMSModelDescriber)
-    {
-        $this->factory = $factory;
-        $this->JMSModelDescriber = $JMSModelDescriber;
+    public function __construct(
+        private MetadataFactoryInterface $factory,
+        private JMSModelDescriber $JMSModelDescriber,
+    ) {
     }
 
     public function setModelRegistry(ModelRegistry $modelRegistry): void