diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 78c6ea1..46e6ba2 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -19,9 +19,9 @@ jobs: strategy: fail-fast: false matrix: - php-version: ['8.1', '8.2', '8.3', '8.4'] + php-version: ['8.2', '8.3', '8.4', '8.5'] - uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.9.2 + uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.3 with: php-version: ${{ matrix.php-version }} @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false - uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.9.2 + uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.3 with: enable_eslinter: false enable_jsonlinter: true @@ -45,7 +45,7 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-latest] - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.3', '8.4', '8.5'] steps: - name: Setup PHP, with composer and extensions @@ -107,7 +107,7 @@ jobs: fail-fast: true matrix: operating-system: [windows-latest] - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.3', '8.4', '8.5'] steps: - name: Setup PHP, with composer and extensions @@ -115,7 +115,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, spl, xml + extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, spl, xml, zip tools: composer ini-values: error_reporting=E_ALL coverage: none @@ -161,7 +161,7 @@ jobs: uses: shivammathur/setup-php@v2 with: # Should be the higest supported version, so we can use the newest tools - php-version: '8.4' + php-version: '8.5' tools: composer, composer-require-checker, composer-unused, phpcs, psalm # optional performance gain for psalm: opcache extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, opcache, openssl, pcre, spl, xml @@ -194,7 +194,7 @@ jobs: run: composer-unused - name: PHP Code Sniffer - run: phpcs + run: vendor/bin/phpcs - name: Psalm continue-on-error: true @@ -228,7 +228,7 @@ jobs: uses: shivammathur/setup-php@v2 with: # Should be the lowest supported version - php-version: '8.1' + php-version: '8.2' extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, spl, xml tools: composer coverage: none diff --git a/composer.json b/composer.json index 9b66e60..66fb248 100644 --- a/composer.json +++ b/composer.json @@ -28,14 +28,14 @@ } }, "require": { - "php": "^8.1", + "php": "^8.2", - "simplesamlphp/simplesamlphp": "~2.4.1", - "simplesamlphp/saml2-legacy": "~4.18.1" + "simplesamlphp/simplesamlphp": "~2.5.0-rc1", + "simplesamlphp/saml2-legacy": "~4.19.0" }, "require-dev": { - "simplesamlphp/composer-module-installer": "~1.4.0", - "simplesamlphp/simplesamlphp-test-framework": "^1.9.2" + "simplesamlphp/composer-module-installer": "~1.5.0", + "simplesamlphp/simplesamlphp-test-framework": "^1.10.3" }, "support": { "issues": "https://github.com/simplesamlphp/simplesamlphp-module-stepupsfo/issues", diff --git a/phpcs.xml b/phpcs.xml index ba294a9..f0b4f26 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -15,5 +15,6 @@ +