resolved few conflicts

.github/workflows/main.yml

@@ -9,6 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - 7.4
           - 8.0
           - 8.1
 
@@ -39,13 +40,14 @@ jobs:
       - name: Run PHPStan
         run: composer phpstan
 
+
   phpcs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         php-version:
-          - 8.0
+          - 7.4
 
     steps:
       - name: Checkout
@@ -81,6 +83,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - 7.4
           - 8.0
           - 8.1
         composer-arg:
@@ -115,12 +118,6 @@ jobs:
       - name: Run PHPUnit
         run: composer phpunit
 
-      - name: Generate Code Coverage and Test Report
-        run: composer test-cc
-
-      - name: Merge Code Coverage
-        run: composer merge-code-coverage-reports
-
   phpunit-with-sonar-qube:
     uses: BrandEmbassy/github-actions/.github/workflows/php-phpunit-with-sonar-qube.yml@master
     secrets:

composer.json

@@ -28,8 +28,10 @@
         "phpunit": "./vendor/bin/phpunit src --no-coverage",
         "phpunit-cc": "./vendor/bin/phpunit src",
         "test": "./vendor/bin/phpunit src",
-        "test-cc": "XDEBUG_MODE=coverage ./vendor/bin/phpunit -c phpunit.xml --coverage-php=temp/coverage/unit-tests.cov --log-junit=test-report.xml",
-        "merge-code-coverage-reports": "php -dmemory_limit=8192M vendor/bin/phpcov merge --clover coverage.xml temp/coverage"
+        "post-autoload-dump": [
+            "XDEBUG_MODE=coverage ./vendor/bin/phpunit -c phpunit.xml --coverage-php=temp/coverage/unit-tests.cov --log-junit=test-report.xml",
+            "php -dmemory_limit=8192M vendor/bin/phpcov merge --clover coverage.xml temp/coverage"
+        ]
     },
     "minimum-stability": "dev",
     "prefer-stable": true,