Fix deps issues

typhoon-php · Sep 2, 2024 · a2fc01b · a2fc01b
1 parent ec2cd2c
commit a2fc01b
Show file tree

Hide file tree

Showing 5 changed files with 5,769 additions and 8 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dependency-versions: [lowest, highest]
+        dependency-versions: [locked, lowest, highest]
     steps:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
@@ -53,28 +53,28 @@ jobs:
         with:
           composer-options: --optimize-autoloader
           dependency-versions: ${{ matrix.dependency-versions }}
-      - run: composer psalm -- --stats --output-format=github ${{ matrix.dependency-versions == 'lowest' && '--shepherd' || '' }}
+      - run: composer psalm -- --stats --output-format=github ${{ matrix.dependency-versions == 'locked' && '--shepherd' || '' }}
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php: [8.1, 8.2, 8.3]
-        dependency-versions: [lowest, highest]
+        dependency-versions: [locked, lowest, highest]
     steps:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           ini-file: development
           tools: composer:v2
-          coverage: ${{ matrix.php == '8.1' && matrix.dependency-versions == 'lowest' && 'pcov' || '' }}
+          coverage: ${{ matrix.php == '8.1' && matrix.dependency-versions == 'locked' && 'pcov' || '' }}
       - uses: ramsey/composer-install@v3
         with:
           composer-options: --optimize-autoloader
           dependency-versions: ${{ matrix.dependency-versions }}
       - run: composer test -- --colors=always --coverage-clover coverage.xml
-      - if: ${{ matrix.php == '8.1' && matrix.dependency-versions == 'lowest' }}
+      - if: ${{ matrix.php == '8.1' && matrix.dependency-versions == 'locked' }}
         uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

diff --git a/composer.json b/composer.json
@@ -45,7 +45,6 @@
             "ergebnis/composer-normalize": true,
             "infection/extension-installer": true
         },
-        "lock": false,
         "platform": {
             "php": "8.1"
         },
@@ -54,14 +53,20 @@
     "extra": {
         "bamarni-bin": {
             "bin-links": false,
-            "forward-command": true,
+            "forward-command": false,
             "target-directory": "tools"
         }
     },
     "scripts": {
+        "post-install-cmd": "@install-tools",
+        "post-update-cmd": "@install-tools",
         "check-require": "tools/composer-require-checker/vendor/bin/composer-require-checker",
         "fixcs": "php-cs-fixer fix --diff",
         "infection": "infection --show-mutations",
+        "install-tools": [
+            "@composer bin psalm install",
+            "@composer bin composer-require-checker install"
+        ],
         "pre-command-run": "mkdir -p var",
         "psalm": "tools/psalm/vendor/bin/psalm --show-info --no-diff --no-cache",
         "test": "phpunit"