Skip to content

Commit 4fa66de

Browse files
authored
Merge pull request #16 from simplesamlphp/dependabot/github_actions/all-actions-75929dacf9
Bump simplesamlphp/simplesamlphp-test-framework from 1.9.3 to 1.10.0 in the all-actions group
2 parents d55445e + 84f8d55 commit 4fa66de

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/php.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php-version: ['8.1', '8.2', '8.3', '8.4']
22+
php-version: ['8.2', '8.3', '8.4']
2323

24-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.9.3
24+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.0
2525
with:
2626
php-version: ${{ matrix.php-version }}
2727

@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232

33-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.9.3
33+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.0
3434
with:
3535
enable_eslinter: false
3636
enable_jsonlinter: true
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.1', '8.2', '8.3', '8.4']
48+
php-versions: ['8.2', '8.3', '8.4']
4949

5050
steps:
5151
- name: Setup PHP, with composer and extensions
@@ -107,15 +107,15 @@ jobs:
107107
fail-fast: true
108108
matrix:
109109
operating-system: [windows-latest]
110-
php-versions: ['8.1', '8.2', '8.3', '8.4']
110+
php-versions: ['8.2', '8.3', '8.4']
111111

112112
steps:
113113
- name: Setup PHP, with composer and extensions
114114
# https://github.com/shivammathur/setup-php
115115
uses: shivammathur/setup-php@v2
116116
with:
117117
php-version: ${{ matrix.php-versions }}
118-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
118+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml, zip
119119
tools: composer
120120
ini-values: error_reporting=E_ALL
121121
coverage: none
@@ -190,7 +190,9 @@ jobs:
190190
run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
191191

192192
- name: Check code for unused dependencies in composer.json
193-
run: composer-unused
193+
run: |
194+
composer-unused \
195+
--excludePackage=simplesamlphp/simplesamlphp-assets-jquery
194196
195197
- name: PHP Code Sniffer
196198
run: phpcs
@@ -226,7 +228,7 @@ jobs:
226228
uses: shivammathur/setup-php@v2
227229
with:
228230
# Should be the lowest supported version
229-
php-version: '8.1'
231+
php-version: '8.2'
230232
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
231233
tools: composer
232234
coverage: none

src/Controller/MetaEditor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
namespace SimpleSAML\Module\metaedit\Controller;
66

77
use Exception;
8-
use SimpleSAML\SAML2\Constants as C;
98
use SimpleSAML\Auth;
109
use SimpleSAML\Configuration;
1110
use SimpleSAML\Error;
1211
use SimpleSAML\Metadata;
1312
use SimpleSAML\Module\metaedit\MetaEditor as Editor;
13+
use SimpleSAML\SAML2\Constants as C;
1414
use SimpleSAML\Session;
1515
use SimpleSAML\Utils;
1616
use SimpleSAML\XHTML\Template;

0 commit comments

Comments
 (0)