From 7eaa18d61966fd35c6569933af417d159cb32cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pysiak?= <mpysiak@gmail.com>
Date: Tue, 5 Nov 2024 11:42:17 +0100
Subject: [PATCH] Refactor CI

---
 .github/workflows/build.yml                   | 11 ++++++++---
 composer.json                                 |  6 ------
 src/Factory/InvoiceFactory.php                |  2 +-
 src/Factory/InvoiceShopBillingDataFactory.php |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2bd7be1f..5a944870 100644
--- 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
index 27f11fd5..7183fd59 100644
--- a/composer.json
+++ b/composer.json
@@ -65,12 +65,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/src/Factory/InvoiceFactory.php b/src/Factory/InvoiceFactory.php
index 32acfb60..95447687 100644
--- 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
index 72d4f30c..1baa19be 100644
--- 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