diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 1e22c64..99d665c 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -20,7 +20,7 @@ jobs: matrix: php-version: ['8.3', '8.4', '8.5'] - uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.4 + uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.5 with: php-version: ${{ matrix.php-version }} @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false - uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.4 + uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.5 with: enable_eslinter: false enable_jsonlinter: true @@ -78,7 +78,7 @@ jobs: uses: actions/cache@v5 with: path: ${{ env.COMPOSER_CACHE }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ runner.os }}-composer- - name: Install Composer dependencies @@ -141,7 +141,7 @@ jobs: uses: actions/cache@v5 with: path: ${{ env.COMPOSER_CACHE }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ hashFiles('**\composer.json') }} restore-keys: ${{ runner.os }}-composer- - name: Install Composer dependencies @@ -178,7 +178,7 @@ jobs: uses: actions/cache@v5 with: path: ${{ env.COMPOSER_CACHE }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ runner.os }}-composer- - name: Validate composer.json and composer.lock @@ -188,13 +188,12 @@ jobs: run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Check code for hard dependencies missing in composer.json - run: composer-require-checker check composer.json + run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json - name: Check code for unused dependencies in composer.json run: | composer-unused \ --excludePackage=icanhazstring/composer-unused \ - --excludePackage=maglnet/composer-require-checker \ --excludePackage=phpstan/phpstan \ --excludePackage=phpstan/extension-installer \ --excludePackage=phpstan/phpstan-mockery \ @@ -242,7 +241,7 @@ jobs: uses: actions/cache@v5 with: path: ${{ env.COMPOSER_CACHE }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ runner.os }}-composer- - name: Install Composer dependencies @@ -270,7 +269,7 @@ jobs: path: ${{ github.workspace }}/build - name: Codecov - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v6 with: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true @@ -286,6 +285,6 @@ jobs: (needs.unit-tests-linux.result == 'success' && needs.coverage.result == 'skipped') steps: - - uses: geekyeggo/delete-artifact@v5 + - uses: geekyeggo/delete-artifact@v6 with: name: coverage-data diff --git a/composer.json b/composer.json index a65d742..9ef42b9 100644 --- a/composer.json +++ b/composer.json @@ -26,19 +26,20 @@ "ext-curl": "*", "icanhazstring/composer-unused": "^0.9", - "maglnet/composer-require-checker": "^4.19", "phpstan/extension-installer": "^1.4", "phpstan/phpstan": "^2.1", "phpstan/phpstan-mockery": "^2.0", "phpstan/phpstan-phpunit": "^2.0", "phpunit/phpunit": "^12.3 || ^13.0", "psr/log": "^3.0", - "simplesamlphp/simplesamlphp": "^2.5", "slevomat/coding-standard": "^8.25", "squizlabs/php_codesniffer": "^4.0", "symfony/phpunit-bridge": "^8.0", "twig/twig": "~3.23" }, + "require-dev": { + "simplesamlphp/simplesamlphp": "^2.5" + }, "support": { "issues": "https://github.com/simplesamlphp/simplesamlphp-test-framework/issues", "source": "https://github.com/simplesamlphp/simplesamlphp-test-framework" diff --git a/tools/composer-require-checker.json b/tools/composer-require-checker.json index eed71aa..3efcd31 100644 --- a/tools/composer-require-checker.json +++ b/tools/composer-require-checker.json @@ -1,4 +1,15 @@ { "symbol-whitelist": [ + "SimpleSAML\\Configuration", + "SimpleSAML\\Logger\\LoggingHandlerInterface", + "SimpleSAML\\Metadata\\MetaDataStorageHandler", + "SimpleSAML\\Module", + "SimpleSAML\\Session", + "SimpleSAML\\Store\\StoreFactory", + "SimpleSAML\\Store\\StoreInterface", + "SimpleSAML\\Utils", + "SimpleSAML\\Utils\\ClearableState", + "SimpleSAML\\Utils\\System", + "SimpleSAML\\XHTML\\Template" ] }