Use developer-tools from test-framework

tvdijen · tvdijen · commit 571b3dd65070 · 2023-03-11T00:01:53.000+01:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -70,28 +70,29 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: PHP Code Sniffer
-        run: php vendor/bin/phpcs
+        run: php vendor/simplesamlphp/simplesamlphp-test-framework/tools/phpcs
 
       - name: Psalm
         continue-on-error: true
         run: |
-          php vendor/bin/psalm \
+          php vendor/simplesamlphp/simplesamlphp-test-framework/tools/psalm \
           -c psalm.xml \
           --show-info=true \
           --shepherd \
           --php-version=${{ steps.setup-php.outputs.php-version }}
 
       - name: Psalm (testsuite)
         run: |
-          php vendor/bin/psalm \
+          php vendor/simplesamlphp/simplesamlphp-test-framework/tools/psalm \
           -c psalm-dev.xml \
           --show-info=true \
           --shepherd \
           --php-version=${{ steps.setup-php.outputs.php-version }}
 
       - name: Psalter
         run: |
-          php vendor/bin/psalter \
+          php vendor/simplesamlphp/simplesamlphp-test-framework/tools/psalm \
+          --alter \
           --issues=UnnecessaryVarAnnotation \
           --dry-run \
           --php-version=${{ steps.setup-php.outputs.php-version }}
@@ -185,11 +186,11 @@ jobs:
 
       - name: Run unit tests with coverage
         if: ${{ matrix.php-versions == '8.1' }}
-        run: ./vendor/bin/phpunit
+        run: vendor/simplesamlphp/simplesamlphp-test-framework/tools/phpunit
 
       - name: Run unit tests (no coverage)
         if: ${{ matrix.php-versions != '8.1' }}
-        run: ./vendor/bin/phpunit --no-coverage
+        run: vendor/simplesamlphp/simplesamlphp-test-framework/tools/phpunit --no-coverage
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '8.1' }}
@@ -246,7 +247,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Run unit tests
-        run: ./vendor/bin/phpunit --no-coverage
+        run: vendor/simplesamlphp/simplesamlphp-test-framework/tools/phpunit --no-coverage
 
   coverage:
     name: Code coverage
diff --git a/composer.json b/composer.json
@@ -87,7 +87,7 @@
 
         "mikey179/vfsstream": "~1.6",
         "simplesamlphp/simplesamlphp-module-adfs": "dev-master",
-        "simplesamlphp/simplesamlphp-test-framework": "^1.3.2",
+        "simplesamlphp/simplesamlphp-test-framework": "^1.4.0",
         "simplesamlphp/xml-security": "^1.5.0"
     },
     "suggest": {
diff --git a/composer.lock b/composer.lock
