Apply php-cs-fixer/rector rules

magicsunday · Mar 18, 2024 · bf0afaf · bf0afaf
1 parent ef4cdb6
commit bf0afaf
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 78 deletions.
diff --git a/.github/workflows/ci.yml b/.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
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
             "@composer require magicsunday/webtrees-module-base:^1.0",
             "### Copy base module to vendor directory",
             "mkdir -p webtrees-descendants-chart/vendor/magicsunday",
-            "cp -r vendor/magicsunday/webtrees-module-base webtrees-descendants-chart/vendor/magicsunday/webtrees-module-base",
+            "cp -r .build/vendor/magicsunday/webtrees-module-base webtrees-descendants-chart/vendor/magicsunday/webtrees-module-base",
             "### Remove all not required files from archive",
             "rm -rf webtrees-descendants-chart/.github",
             "rm -rf webtrees-descendants-chart/resources/js/modules",
@@ -94,8 +94,7 @@
         "ci:test": [
             "@ci:test:php:lint",
             "@ci:test:php:phpstan",
-            "@ci:test:php:rector",
-            "@ci:test:php:unit"
+            "@ci:test:php:rector"
         ],
         "module:check": [
             "@ci:test"

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,6 +1,2 @@
 parameters:
-	ignoreErrors:
-		-
-			message: "#^Call to an undefined method Fisharebest\\\\Webtrees\\\\Module\\\\ModuleCustomInterface\\:\\:assetUrl\\(\\)\\.$#"
-			count: 1
-			path: src/Processor/ImageProcessor.php
+	ignoreErrors: []
diff --git a/src/Facade/DataFacade.php b/src/Facade/DataFacade.php
@@ -159,12 +159,13 @@ private function sortChildrenByBirthdate(RecursiveIteratorIterator $recursiveIte
                         && $nodeData->getData()->getIndividual()->getBirthDate()->isOK()
                 )
             ) {
-                $item->setChildren(
-                    $childrenCollection
-                        ->sort($this->birthDateComparator())
-                        ->values()
-                        ->toArray()
-                );
+                /** @var Node[] $children */
+                $children = $childrenCollection
+                    ->sort($this->birthDateComparator())
+                    ->values()
+                    ->toArray();
+
+                $item->setChildren($children);
             }
         }
     }

diff --git a/src/Traits/ModuleCustomTrait.php b/src/Traits/ModuleCustomTrait.php
@@ -40,10 +40,10 @@ public function customModuleLatestVersionUrl(): string
         return self::CUSTOM_LATEST_VERSION;
     }
 
-//    protected function extractVersion(string $content): string
-//    {
-//        return json_decode($content, true)['tag_name'] ?? '';
-//    }
+    //    protected function extractVersion(string $content): string
+    //    {
+    //        return json_decode($content, true)['tag_name'] ?? '';
+    //    }
 
     public function customModuleLatestVersion(): string
     {