Refactor CI

Sylius · Nov 5, 2024 · 661274c · 661274c
1 parent 000877e
commit 661274c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -165,14 +165,19 @@ jobs:
                 name: Load fixtures in test application
                 run: (cd tests/Application && bin/console sylius:fixtures:load -n)
 
+            -
+                name: Validate composer.json
+                run: composer validate --ansi --strict --no-check-all
+#               Restore before InvoicingPlugin 1.0 release
+#               run: composer validate --ansi --strict --no-check-publish
+
             -
                 name: Run security check
                 run: symfony security:check
 
             -
-                name: Run analysis
-                run: composer analyse
-                if: matrix.sylius != '~1.12.0'
+                name: Run PHPStan
+                run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/
 
             -
                 name: Run PHPSpec

diff --git a/composer.json b/composer.json
@@ -43,7 +43,6 @@
         "phpstan/phpstan-webmozart-assert": "^1.2",
         "phpunit/phpunit": "^9.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "rector/rector": "^1.2",
         "sylius-labs/coding-standard": "~4.0.0",
         "symfony/browser-kit": "^5.4.21 || ^6.4",
         "symfony/debug-bundle": "^5.4.21 || ^6.4",
@@ -65,12 +64,6 @@
         }
     },
     "scripts": {
-        "analyse": [
-            "vendor/bin/phpstan analyse -c phpstan.neon -l max"
-        ],
-        "fix": [
-            "vendor/bin/ecs check --fix src/ spec/"
-        ],
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"

diff --git a/rector.php b/rector.php
diff --git a/src/Factory/InvoiceFactory.php b/src/Factory/InvoiceFactory.php
@@ -25,7 +25,7 @@
 final class InvoiceFactory implements InvoiceFactoryInterface
 {
     /**
-     * @psalm-param class-string $className
+     * @param class-string $className
      */
     public function __construct(
         private readonly string $className,

diff --git a/src/Factory/InvoiceShopBillingDataFactory.php b/src/Factory/InvoiceShopBillingDataFactory.php
@@ -21,7 +21,7 @@
 final class InvoiceShopBillingDataFactory implements InvoiceShopBillingDataFactoryInterface
 {
     /**
-     * @psalm-param class-string $className
+     * @param class-string $className
      */
     public function __construct(
         private readonly string $className