Apply php-cs-fixer/rector rules

.github/workflows/ci.yml

@@ -73,9 +73,3 @@ jobs:
                 if: ${{ always() && steps.install.conclusion == 'success' }}
                 run: |
                     composer ci:test:php:rector
-
-            -   id: tests_unit
-                name: Unit Tests
-                if: ${{ always() && steps.install.conclusion == 'success' }}
-                run: |
-                    composer ci:test:php:unit

composer.json

@@ -59,7 +59,7 @@
             "@composer require magicsunday/webtrees-module-base:^1.0",
             "### Copy base module to vendor directory",
             "mkdir -p webtrees-fan-chart/vendor/magicsunday",
-            "cp -r vendor/magicsunday/webtrees-module-base webtrees-fan-chart/vendor/magicsunday/webtrees-module-base",
+            "cp -r .build/vendor/magicsunday/webtrees-module-base webtrees-fan-chart/vendor/magicsunday/webtrees-module-base",
             "### Remove all not required files from archive",
             "rm -rf webtrees-fan-chart/.github",
             "rm -rf webtrees-fan-chart/resources/js/modules",
@@ -94,7 +94,7 @@
         "ci:test": [
             "@ci:test:php:lint",
             "@ci:test:php:phpstan",
-            "@ci:test:php:rector",
+            "@ci:test:php:rector"
         ],
         "module:check": [
             "@ci:test"

phpstan-baseline.neon

@@ -0,0 +1,2 @@
+parameters:
+	ignoreErrors: []

phpstan.neon

@@ -1,7 +1,7 @@
 includes:
     - %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-strict-rules/rules.neon
     - %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-deprecation-rules/rules.neon
-#    - %currentWorkingDirectory%/phpstan-baseline.neon
+    - %currentWorkingDirectory%/phpstan-baseline.neon
 
 parameters:
     # You can currently choose from 10 levels (0 is the loosest and 9 is the strictest).

src/Facade/DataFacade.php

@@ -18,9 +18,9 @@
 use MagicSunday\Webtrees\FanChart\Configuration;
 use MagicSunday\Webtrees\FanChart\Model\Node;
 use MagicSunday\Webtrees\FanChart\Model\NodeData;
-use MagicSunday\Webtrees\FanChart\Processor\DateProcessor;
-use MagicSunday\Webtrees\FanChart\Processor\ImageProcessor;
-use MagicSunday\Webtrees\FanChart\Processor\NameProcessor;
+use MagicSunday\Webtrees\ModuleBase\Processor\DateProcessor;
+use MagicSunday\Webtrees\ModuleBase\Processor\ImageProcessor;
+use MagicSunday\Webtrees\ModuleBase\Processor\NameProcessor;
 
 /**
  * Facade class to hide complex logic to generate the structure required to display the tree.

src/Module.php

@@ -31,9 +31,6 @@
 use MagicSunday\Webtrees\FanChart\Facade\DataFacade;
 use MagicSunday\Webtrees\FanChart\Traits\ModuleChartTrait;
 use MagicSunday\Webtrees\FanChart\Traits\ModuleCustomTrait;
-use MagicSunday\Webtrees\ModuleBase\Processor\DateProcessor;
-use MagicSunday\Webtrees\ModuleBase\Processor\ImageProcessor;
-use MagicSunday\Webtrees\ModuleBase\Processor\NameProcessor;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;