Skip to content

Commit 8f8296b

Browse files
tvdijentvdijen
committed
Merge branch 'master' into release-1.2
2 parents ed2eadb + 9c2c424 commit 8f8296b

17 files changed

Lines changed: 142 additions & 100 deletions

‎.github/dependabot.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
3+
# To get started with Dependabot version updates, you'll need to specify which
4+
# package ecosystems to update and where the package manifests are located.
5+
# Please see the documentation for all configuration options:
6+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
7+
8+
version: 2
9+
updates:
10+
- package-ecosystem: "github-actions" # See documentation for possible values
11+
directory: "/" # Location of package manifests
12+
schedule:
13+
interval: "weekly"
14+
groups:
15+
all-actions:
16+
patterns: ["*"]
17+
18+
- package-ecosystem: "composer" # See documentation for possible values
19+
directory: "/" # Location of package manifests
20+
schedule:
21+
interval: "weekly"
22+
allow:
23+
# Allow both direct and indirect updates for all packages
24+
- dependency-type: "all"
25+
ignore:
26+
- dependency-name: "*"
27+
update-types: ["version-update:semver-major"]
28+
groups:
29+
production-dependencies:
30+
dependency-type: "production"
31+
exclude-patterns:
32+
- "symfony/*"
33+
development-dependencies:
34+
dependency-type: "development"
35+
symfony:
36+
patterns:
37+
- "symfony/*"

‎.github/workflows/autolock-conversations.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
action:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: dessant/lock-threads@v4
21+
- uses: dessant/lock-threads@v5
2222
with:
2323
issue-inactive-days: '90'
2424
pr-inactive-days: '90'

‎.github/workflows/documentation.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: [ubuntu-latest]
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323

2424
- name: Lint markdown files
2525
uses: nosborn/github-action-markdown-cli@v3
@@ -28,7 +28,7 @@ jobs:
2828
ignore_path: .markdownlintignore
2929

3030
- name: Perform spell check
31-
uses: codespell-project/actions-codespell@master
31+
uses: codespell-project/actions-codespell@v2
3232
with:
3333
path: '**/*.md'
3434
check_filenames: true
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- name: Run docs build
4444
if: github.event_name != 'pull_request'
45-
uses: actions/github-script@v6
45+
uses: actions/github-script@v7
4646
with:
4747
# Token has to be generated on a user account that controls the docs-repository.
4848
# The _only_ scope to select is "Access public repositories", nothing more.

‎.github/workflows/php.yml‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ jobs:
1919
runs-on: ['ubuntu-latest']
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525

2626
- name: Lint Code Base
27-
uses: github/super-linter/slim@v5
27+
uses: super-linter/super-linter/slim@v7
2828
env:
29+
SAVE_SUPER_LINTER_OUTPUT: false
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
LINTER_RULES_PATH: 'tools/linters'
2932
LOG_LEVEL: NOTICE
3033
VALIDATE_ALL_CODEBASE: true
31-
LINTER_RULES_PATH: 'tools/linters'
3234
VALIDATE_CSS: true
3335
VALIDATE_JAVASCRIPT_ES: true
3436
VALIDATE_JSON: true
@@ -48,21 +50,21 @@ jobs:
4850
uses: shivammathur/setup-php@v2
4951
with:
5052
# Should be the higest supported version, so we can use the newest tools
51-
php-version: '8.2'
53+
php-version: '8.3'
5254
tools: composer, composer-require-checker, composer-unused, phpcs, psalm
5355
# optional performance gain for psalm: opcache
5456
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl, pcre, spl, xml
5557

5658
- name: Setup problem matchers for PHP
5759
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
5860

59-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6062

6163
- name: Get composer cache directory
6264
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
6365

6466
- name: Cache composer dependencies
65-
uses: actions/cache@v3
67+
uses: actions/cache@v4
6668
with:
6769
path: $COMPOSER_CACHE
6870
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -114,21 +116,21 @@ jobs:
114116
uses: shivammathur/setup-php@v2
115117
with:
116118
# Should be the lowest supported version
117-
php-version: '8.0'
119+
php-version: '8.1'
118120
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, spl, xml
119121
tools: composer
120122
coverage: none
121123

122124
- name: Setup problem matchers for PHP
123125
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
124126

125-
- uses: actions/checkout@v3
127+
- uses: actions/checkout@v4
126128

127129
- name: Get composer cache directory
128130
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
129131

130132
- name: Cache composer dependencies
131-
uses: actions/cache@v3
133+
uses: actions/cache@v4
132134
with:
133135
path: $COMPOSER_CACHE
134136
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -154,7 +156,7 @@ jobs:
154156
fail-fast: false
155157
matrix:
156158
operating-system: [ubuntu-latest]
157-
php-versions: ['8.0', '8.1', '8.2']
159+
php-versions: ['8.1', '8.2', '8.3']
158160

159161
steps:
160162
- name: Setup PHP, with composer and extensions
@@ -178,13 +180,13 @@ jobs:
178180
git config --global core.autocrlf false
179181
git config --global core.eol lf
180182
181-
- uses: actions/checkout@v3
183+
- uses: actions/checkout@v4
182184

183185
- name: Get composer cache directory
184186
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
185187

186188
- name: Cache composer dependencies
187-
uses: actions/cache@v3
189+
uses: actions/cache@v4
188190
with:
189191
path: $COMPOSER_CACHE
190192
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -194,16 +196,16 @@ jobs:
194196
run: composer install --no-progress --prefer-dist --optimize-autoloader
195197

196198
- name: Run unit tests with coverage
197-
if: ${{ matrix.php-versions == '8.2' }}
199+
if: ${{ matrix.php-versions == '8.3' }}
198200
run: vendor/bin/phpunit
199201

200202
- name: Run unit tests (no coverage)
201-
if: ${{ matrix.php-versions != '8.2' }}
203+
if: ${{ matrix.php-versions != '8.3' }}
202204
run: vendor/bin/phpunit --no-coverage
203205

204206
- name: Save coverage data
205-
if: ${{ matrix.php-versions == '8.2' }}
206-
uses: actions/upload-artifact@v3
207+
if: ${{ matrix.php-versions == '8.3' }}
208+
uses: actions/upload-artifact@v4
207209
with:
208210
name: coverage-data
209211
path: ${{ github.workspace }}/build
@@ -216,7 +218,7 @@ jobs:
216218
fail-fast: true
217219
matrix:
218220
operating-system: [windows-latest]
219-
php-versions: ['8.0', '8.1', '8.2']
221+
php-versions: ['8.1', '8.2', '8.3']
220222

221223
steps:
222224
- name: Setup PHP, with composer and extensions
@@ -240,13 +242,13 @@ jobs:
240242
git config --global core.autocrlf false
241243
git config --global core.eol lf
242244
243-
- uses: actions/checkout@v3
245+
- uses: actions/checkout@v4
244246

245247
- name: Get composer cache directory
246248
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
247249

248250
- name: Cache composer dependencies
249-
uses: actions/cache@v3
251+
uses: actions/cache@v4
250252
with:
251253
path: $COMPOSER_CACHE
252254
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -263,15 +265,15 @@ jobs:
263265
runs-on: [ubuntu-latest]
264266
needs: [unit-tests-linux]
265267
steps:
266-
- uses: actions/checkout@v3
268+
- uses: actions/checkout@v4
267269

268-
- uses: actions/download-artifact@v3
270+
- uses: actions/download-artifact@v4
269271
with:
270272
name: coverage-data
271273
path: ${{ github.workspace }}/build
272274

273275
- name: Codecov
274-
uses: codecov/codecov-action@v3
276+
uses: codecov/codecov-action@v5
275277
with:
276278
token: ${{ secrets.CODECOV_TOKEN }}
277279
fail_ci_if_error: true
@@ -284,9 +286,9 @@ jobs:
284286
if: |
285287
always() &&
286288
needs.coverage.result == 'success' ||
287-
(needs.unit-tests-linux == 'success' && needs.coverage == 'skipped')
289+
(needs.unit-tests-linux.result == 'success' && needs.coverage.result == 'skipped')
288290
289291
steps:
290-
- uses: geekyeggo/delete-artifact@v2
292+
- uses: geekyeggo/delete-artifact@v5
291293
with:
292294
name: coverage-data

‎.gitignore‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
### php-cs-fixer ###
2+
.phpunit.cache/
3+
.phpunit.result.cache
24
.php_cs.cache
5+
bin/*
6+
build/*
37
composer.lock
48
cs_fixer_tmp*
5-
bin/*
9+
phpunit.xml.bak
10+
/super-linter-output/
611
vendor/*
712
build/*
8-
.phpunit.cache
9-
.phpunit.result.cache

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SimpleSAMLphp Module Metarefresh
22

3-
![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-metarefresh/workflows/CI/badge.svg?branch=master)
3+
![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-metarefresh/actions/workflows/php.yml/badge.svg)
44
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-metarefresh/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-metarefresh/?branch=master)
55
[![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-metarefresh/branch/master/graph/badge.svg)](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-metarefresh)
66
[![Type Coverage](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-metarefresh/coverage.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-metarefresh)

‎composer.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
},
1818
"allow-plugins": {
1919
"composer/package-versions-deprecated": true,
20-
"simplesamlphp/composer-module-installer": true
20+
"simplesamlphp/composer-module-installer": true,
21+
"dealerdirect/phpcodesniffer-composer-installer": true,
22+
"phpstan/extension-installer": true,
23+
"simplesamlphp/composer-xmlprovider-installer": true
2124
}
2225
},
2326
"autoload": {
@@ -31,16 +34,16 @@
3134
}
3235
},
3336
"require": {
34-
"php": "^8.0",
35-
36-
"simplesamlphp/assert": "^1.0.0",
37+
"php": "^8.1",
38+
"simplesamlphp/assert": "^1.1.0",
3739
"simplesamlphp/composer-module-installer": "^1.3.4",
38-
"simplesamlphp/simplesamlphp": "^2.0",
39-
"simplesamlphp/xml-common": "^1.12",
40-
"symfony/http-foundation": "^6.0"
40+
"simplesamlphp/simplesamlphp": "^2.2.0",
41+
"simplesamlphp/xml-common": "^1.24.0",
42+
"symfony/http-foundation": "^6.4.0",
43+
"symfony/var-exporter": "^6.4.0"
4144
},
4245
"require-dev": {
43-
"simplesamlphp/simplesamlphp-test-framework": "^1.5.5"
46+
"simplesamlphp/simplesamlphp-test-framework": "^1.8.2"
4447
},
4548
"support": {
4649
"issues": "https://github.com/simplesamlphp/simplesamlphp-module-metarefresh/issues",

‎config-templates/module_metarefresh.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
'current.crt',
4444
'rollover.crt',
4545
],
46-
'validateFingerprint' => '59:1D:4B:46:70:46:3E:ED:A9:1F:CC:81:6D:C0:AF:2A:09:2A:A8:01',
47-
#'validateFingerprintAlgorithm' => RobRichards\XMLSecLibs\XMLSecurityDSig::SHA1,
4846
'template' => [
4947
'tags' => ['kalmar'],
5048
'authproc' => [

‎docs/simplesamlphp-automated_metadata.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ Each metadata source has the following options:
195195
possible to use a self signed certificate that has expired. Add more than one
196196
certificate to be able to handle key rollover.
197197

198+
Note: certificates files must be formatted in PEM format.
199+
198200
`template`
199201
: This is an array which will be combined with the metadata fetched to
200202
generate the final metadata array.

‎phpcs.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<rule ref="Generic.PHP.RequireStrictTypes">
2525
<exclude-pattern>config-templates/*</exclude-pattern>
2626
</rule>
27-
</ruleset>
28-
2927

28+
<!-- Ignore files with side effects that we cannot fix -->
29+
<rule ref="PSR1.Files.SideEffects">
30+
<exclude-pattern>bin/*</exclude-pattern>
31+
</rule>
32+
</ruleset>

0 commit comments

Comments
 (0)