Add rector [batch] (#61)

* Add rector files yiisoft/yii-dev-tool#232 * Add rector/rector dependecy * [rector] Apply fixes * Use predefined rector action * Update src/Middleware/SwaggerJson.php * Apply fixes from StyleCI * Update src/Middleware/SwaggerUi.php * Apply fixes from StyleCI Co-authored-by: rector-bot <rector@yiiframework.com> Co-authored-by: Alexey Rogachev <arogachev90@gmail.com> Co-authored-by: StyleCI Bot <bot@styleci.io>
yiisoft · Sep 29, 2022 · ed94cbc · ed94cbc
1 parent 8124c91
commit ed94cbc
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 36 deletions.
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -0,0 +1,21 @@
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'psalm.xml'
+
+name: rector
+
+jobs:
+  rector:
+    uses: yiisoft/actions/.github/workflows/rector.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/composer.json b/composer.json
@@ -40,6 +40,7 @@
     "require-dev": {
         "httpsoft/http-message": "^1.0",
         "phpunit/phpunit": "^9.5",
+        "rector/rector": "^0.14.3",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.18",

diff --git a/rector.php b/rector.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_80,
+    ]);
+};
diff --git a/src/Middleware/SwaggerJson.php b/src/Middleware/SwaggerJson.php
@@ -18,19 +18,13 @@ final class SwaggerJson implements MiddlewareInterface
 {
     private array $annotationPaths = [];
     private bool $enableCache = false;
-    private CacheInterface $cache;
-    private DataResponseFactoryInterface $responseFactory;
-    private SwaggerService $swaggerService;
     private DateInterval|int|null $cacheTTL = null;
 
     public function __construct(
-        CacheInterface $cache,
-        DataResponseFactoryInterface $responseFactory,
-        SwaggerService $swaggerService
+        private CacheInterface $cache,
+        private DataResponseFactoryInterface $responseFactory,
+        private SwaggerService $swaggerService
     ) {
-        $this->cache = $cache;
-        $this->responseFactory = $responseFactory;
-        $this->swaggerService = $swaggerService;
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
@@ -45,11 +39,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         return $this->responseFactory->createResponse($openApi);
     }
 
-    /**
-     * @param string ...$annotationPaths
-     *
-     * @return self
-     */
     public function withAnnotationPaths(string ...$annotationPaths): self
     {
         $new = clone $this;
@@ -59,8 +48,6 @@ public function withAnnotationPaths(string ...$annotationPaths): self
 
     /**
      * @param DateInterval|int|null $cacheTTL
-     *
-     * @return self
      */
     public function withCache(DateInterval|int $cacheTTL = null): self
     {

diff --git a/src/Middleware/SwaggerUi.php b/src/Middleware/SwaggerUi.php
@@ -28,21 +28,13 @@ final class SwaggerUi implements MiddlewareInterface
         'layout' => 'StandaloneLayout',
     ];
     private string $jsonUrl = '/';
-    private SwaggerService $swaggerService;
-    private ViewRenderer $viewRenderer;
-    private AssetManager $assetManager;
-    private array $params;
 
     public function __construct(
-        ViewRenderer $viewRenderer,
-        SwaggerService $swaggerService,
-        AssetManager $assetManager,
-        array $params
+        private ViewRenderer $viewRenderer,
+        private SwaggerService $swaggerService,
+        private AssetManager $assetManager,
+        private array $params
     ) {
-        $this->swaggerService = $swaggerService;
-        $this->viewRenderer = $viewRenderer;
-        $this->assetManager = $assetManager;
-        $this->params = $params;
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

diff --git a/src/Service/SwaggerService.php b/src/Service/SwaggerService.php
@@ -18,17 +18,13 @@
 
 final class SwaggerService
 {
-    private Aliases $aliases;
-
     private string $viewPath;
-    private string $viewName;
+    private string $viewName = 'swagger-ui';
     private array $options = [];
 
-    public function __construct(Aliases $aliases)
+    public function __construct(private Aliases $aliases)
     {
-        $this->aliases = $aliases;
         $this->viewPath = dirname(__DIR__, 2) . '/views';
-        $this->viewName = 'swagger-ui';
     }
 
     public function getViewPath(): string
@@ -45,8 +41,6 @@ public function getViewName(): string
      * Returns a new instance with the specified options for {@see OpenApi} generation.
      *
      * @param array $options For {@see Generator::scan()}.
-     *
-     * @return self
      */
     public function withOptions(array $options): self
     {