Add rector (#25)

.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']

composer.json

@@ -30,6 +30,7 @@
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
         "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"

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,
+    ]);
+};

src/AssignmentsStorage.php

@@ -14,19 +14,17 @@
 final class AssignmentsStorage implements AssignmentsStorageInterface
 {
     private DatabaseInterface $database;
-    /**
-     * @psalm-var non-empty-string
-     */
-    private string $tableName;
 
     /**
      * @param non-empty-string $tableName
-     * @param DatabaseProviderInterface $dbal
      */
-    public function __construct(string $tableName, DatabaseProviderInterface $dbal)
-    {
+    public function __construct(/**
+     * @psalm-var non-empty-string
+     */
+    private string $tableName,
+        DatabaseProviderInterface $dbal
+    ) {
         $this->database = $dbal->database();
-        $this->tableName = $tableName;
     }
 
     /**

src/Command/RbacCycleInit.php

@@ -16,16 +16,13 @@
 final class RbacCycleInit extends Command
 {
     protected static $defaultName = 'rbac/cycle/init';
-    private DatabaseProviderInterface $dbal;
-    /**
+
+    public function __construct(/**
      * @psalm-var array{itemsTable: non-empty-string, assignmentsTable: non-empty-string, itemsChildrenTable?: non-empty-string}
      */
-    private array $config;
-
-    public function __construct(array $config, DatabaseProviderInterface $dbal)
-    {
-        $this->dbal = $dbal;
-        $this->config = $config;
+    private array $config,
+        private DatabaseProviderInterface $dbal
+    ) {
         parent::__construct();
     }
 

src/ItemsStorage.php

@@ -17,24 +17,23 @@
 final class ItemsStorage implements ItemsStorageInterface
 {
     private DatabaseInterface $database;
-    /**
-     * @psalm-var non-empty-string
-     */
-    private string $tableName;
     /**
      * @psalm-var non-empty-string
      */
     private string $childrenTableName;
 
     /**
      * @param non-empty-string $tableName
-     * @param DatabaseProviderInterface $dbal
      * @param non-empty-string|null $childrenTableName
      */
-    public function __construct(string $tableName, DatabaseProviderInterface $dbal, ?string $childrenTableName = null)
-    {
+    public function __construct(/**
+     * @psalm-var non-empty-string
+     */
+    private string $tableName,
+        DatabaseProviderInterface $dbal,
+        ?string $childrenTableName = null
+    ) {
         $this->database = $dbal->database();
-        $this->tableName = $tableName;
         $this->childrenTableName = $childrenTableName ?? $tableName . '_child';
     }
 

tests/TestCase.php

@@ -22,7 +22,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     private ?DatabaseManager $databaseManager = null;
 
-    private $tables = [
+    private array $tables = [
         'itemsChildTable' => 'auth_item_child',
         'assignmentsTable' => 'auth_assignment',
         'itemsTable' => 'auth_item',