Skip to content

Commit e8df963

Browse files
tvdijentvdijen
committed
Merge branch 'master' into simplesamlphp-2.6
2 parents 2d2877d + 4dd709e commit e8df963

17 files changed

Lines changed: 345 additions & 630 deletions

File tree

‎.github/workflows/build-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup problem matchers for PHP
3232
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
3333

34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v6
3535

3636
# Store the version, stripping any v-prefix
3737
- name: Write release version
@@ -88,7 +88,7 @@ jobs:
8888
rm -rf "simplesamlphp-$VERSION"
8989
9090
- name: Save tarball
91-
uses: actions/upload-artifact@v4
91+
uses: actions/upload-artifact@v7
9292
with:
9393
name: release-${{ matrix.version }}
9494
path: "/tmp/simplesamlphp-${{ env.VERSION }}-${{ matrix.version }}.tar.gz"

‎.github/workflows/documentation.yml‎

Lines changed: 1 addition & 1 deletion
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@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Lint markdown files
2525
uses: nosborn/github-action-markdown-cli@v3

‎.github/workflows/php.yml‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
php-version: ['8.3', '8.4', '8.5']
2222

23-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
23+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.5
2424
with:
2525
php-version: ${{ matrix.php-version }}
2626

@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131

32-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
32+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.5
3333
with:
3434
enable_eslinter: true
3535
enable_jsonlinter: true
@@ -54,8 +54,8 @@ jobs:
5454
php-version: ${{ matrix.php-versions }}
5555
extensions: intl, mbstring, mysql, pdo, pdo_sqlite, soap, sodium, xml
5656
tools: composer:v2
57-
ini-values: error_reporting=E_ALL
58-
coverage: xdebug
57+
ini-values: error_reporting=E_ALL, pcov.directory=${{ github.workspace }}
58+
coverage: pcov
5959

6060
- name: Setup problem matchers for PHP
6161
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -68,7 +68,7 @@ jobs:
6868
git config --global core.autocrlf false
6969
git config --global core.eol lf
7070
71-
- uses: actions/checkout@v4
71+
- uses: actions/checkout@v6
7272

7373
- name: Copy config.php.dist to config.php
7474
run: cp config/config.php.dist config/config.php
@@ -80,7 +80,7 @@ jobs:
8080
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
8181

8282
- name: Cache composer dependencies
83-
uses: actions/cache@v4
83+
uses: actions/cache@v5
8484
with:
8585
path: ${{ env.COMPOSER_CACHE }}
8686
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -91,15 +91,15 @@ jobs:
9191

9292
- name: Run unit tests with coverage
9393
if: ${{ matrix.php-versions == '8.5' }}
94-
run: ./vendor/bin/phpunit
94+
run: vendor/bin/phpunit
9595

9696
- name: Run unit tests (no coverage)
9797
if: ${{ matrix.php-versions != '8.5' }}
98-
run: ./vendor/bin/phpunit --no-coverage
98+
run: vendor/bin/phpunit --no-coverage
9999

100100
- name: Save coverage data
101101
if: ${{ matrix.php-versions == '8.5' }}
102-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@v7
103103
with:
104104
name: coverage-data
105105
path: ${{ github.workspace }}/build
@@ -120,7 +120,7 @@ jobs:
120120
uses: shivammathur/setup-php@v2
121121
with:
122122
php-version: ${{ matrix.php-versions }}
123-
extensions: intl, mbstring, mysql, pdo, pdo_sqlite, soap, sodium, xml
123+
extensions: fileinfo, intl, mbstring, mysql, pdo, pdo_sqlite, soap, sodium, xml
124124
tools: composer:v2
125125
ini-values: error_reporting=E_ALL
126126
coverage: none
@@ -136,13 +136,13 @@ jobs:
136136
git config --global core.autocrlf false
137137
git config --global core.eol lf
138138
139-
- uses: actions/checkout@v4
139+
- uses: actions/checkout@v6
140140

141141
- name: Get composer cache directory
142142
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
143143

144144
- name: Cache composer dependencies
145-
uses: actions/cache@v4
145+
uses: actions/cache@v5
146146
with:
147147
path: ${{ env.COMPOSER_CACHE }}
148148
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -166,14 +166,14 @@ jobs:
166166
uses: shivammathur/setup-php@v2
167167
with:
168168
php-version: '8.5'
169-
tools: composer
169+
tools: composer, composer-require-checker, composer-unused
170170
extensions: mbstring, soap, xml
171171
coverage: none
172172

173173
- name: Setup problem matchers for PHP
174174
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
175175

176-
- uses: actions/checkout@v4
176+
- uses: actions/checkout@v6
177177

178178
- name: Copy config.php.dist to config.php
179179
run: cp config/config.php.dist config/config.php
@@ -185,7 +185,7 @@ jobs:
185185
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
186186

187187
- name: Cache composer dependencies
188-
uses: actions/cache@v4
188+
uses: actions/cache@v5
189189
with:
190190
path: ${{ env.COMPOSER_CACHE }}
191191
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -195,22 +195,26 @@ jobs:
195195
run: composer validate
196196

197197
- name: Install Composer dependencies
198+
run: composer install --no-progress --prefer-dist --optimize-autoloader
199+
200+
- name: Check code for hard dependencies missing in composer.json
201+
run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
202+
203+
- name: Check code for unused dependencies in composer.json
198204
run: |
199-
composer install \
200-
--no-progress \
201-
--prefer-dist --optimize-autoloader \
202-
--ignore-platform-req=maglnet/composer-require-checker
205+
composer-unused \
206+
--excludePackage=simplesamlphp/simplesamlphp-assets-base \
207+
--excludePackage=symfony/expression-language \
208+
--excludePackage=symfony/polyfill-intl-icu
203209
204210
- name: PHP Code Sniffer
205211
run: vendor/bin/phpcs
206212

207213
- name: PHPStan
208-
run: |
209-
vendor/bin/phpstan analyze -c phpstan.neon
214+
run: vendor/bin/phpstan analyze -c phpstan.neon
210215

211216
- name: PHPStan (testsuite)
212-
run: |
213-
vendor/bin/phpstan analyze -c phpstan-dev.neon
217+
run: vendor/bin/phpstan analyze -c phpstan-dev.neon
214218

215219
- name: Check for unused translations
216220
continue-on-error: true
@@ -233,7 +237,7 @@ jobs:
233237
- name: Setup problem matchers for PHP
234238
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
235239

236-
- uses: actions/checkout@v4
240+
- uses: actions/checkout@v6
237241

238242
- name: Copy config.php.dist to config.php
239243
run: cp config/config.php.dist config/config.php
@@ -245,7 +249,7 @@ jobs:
245249
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
246250

247251
- name: Cache composer dependencies
248-
uses: actions/cache@v4
252+
uses: actions/cache@v5
249253
with:
250254
path: ${{ env.COMPOSER_CACHE }}
251255
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -268,13 +272,15 @@ jobs:
268272
runs-on: [ubuntu-latest]
269273
needs: [unit-tests-linux]
270274
steps:
271-
- uses: actions/download-artifact@v4
275+
- uses: actions/checkout@v6
276+
277+
- uses: actions/download-artifact@v8
272278
with:
273279
name: coverage-data
274280
path: ${{ github.workspace }}/build
275281

276282
- name: Codecov
277-
uses: codecov/codecov-action@v4
283+
uses: codecov/codecov-action@v5
278284
with:
279285
token: ${{ secrets.CODECOV_TOKEN }}
280286
fail_ci_if_error: true
@@ -290,6 +296,6 @@ jobs:
290296
(needs.unit-tests-linux.result == 'success' && needs.coverage.result == 'skipped')
291297
292298
steps:
293-
- uses: geekyeggo/delete-artifact@v5
299+
- uses: geekyeggo/delete-artifact@v6
294300
with:
295301
name: coverage-data

‎.github/workflows/translations.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
uses: shivammathur/setup-php@v2
2929
with:
3030
# Should be the higest supported version, so we can use the newest tools
31-
php-version: '8.2'
31+
php-version: '8.5'
3232
coverage: none
3333

34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v6
3535
with:
3636
# token: ${{ secrets.PAT_TOKEN }}
3737
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -68,7 +68,7 @@ jobs:
6868
if: steps.changes.outputs.files_changed == 'true' || steps.changes.outputs.packages_changed
6969
run: zip build.zip -r .
7070

71-
- uses: actions/upload-artifact@v4
71+
- uses: actions/upload-artifact@v7
7272
if: steps.changes.outputs.files_changed == 'true' || steps.changes.outputs.packages_changed
7373
with:
7474
name: build
@@ -82,7 +82,7 @@ jobs:
8282
runs-on: [ubuntu-latest]
8383

8484
steps:
85-
- uses: actions/download-artifact@v4
85+
- uses: actions/download-artifact@v8
8686
with:
8787
name: build
8888

@@ -135,7 +135,7 @@ jobs:
135135
(needs.build.result == 'success' && needs.commit.result == 'skipped')
136136
137137
steps:
138-
- uses: geekyeggo/delete-artifact@v4
138+
- uses: geekyeggo/delete-artifact@v6
139139
with:
140140
name: |
141141
build

‎composer.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"SimpleSAML\\Module\\admin\\": "modules/admin/src",
2626
"SimpleSAML\\Module\\core\\": "modules/core/src",
2727
"SimpleSAML\\Module\\cron\\": "modules/cron/src",
28+
"SimpleSAML\\Module\\debugsp\\": "modules/debugsp/src",
2829
"SimpleSAML\\Module\\exampleauth\\": "modules/exampleauth/src",
2930
"SimpleSAML\\Module\\multiauth\\": "modules/multiauth/src",
3031
"SimpleSAML\\Module\\saml\\": "modules/saml/src"
@@ -37,6 +38,7 @@
3738
"SimpleSAML\\Test\\Module\\admin\\": ["tests//modules/admin/src"],
3839
"SimpleSAML\\Test\\Module\\core\\": ["tests/modules/core/src"],
3940
"SimpleSAML\\Test\\Module\\cron\\": ["tests/modules/cron/src"],
41+
"SimpleSAML\\Test\\Module\\debugsp\\": ["tests/modules/debugsp/src"],
4042
"SimpleSAML\\Test\\Module\\exampleauth\\": ["tests/modules/exampleauth/src"],
4143
"SimpleSAML\\Test\\Module\\multiauth\\": ["tests/modules/multiauth/src"],
4244
"SimpleSAML\\Test\\Module\\saml\\": ["tests/modules/saml/src"]
@@ -47,8 +49,11 @@
4749
"php": "^8.3",
4850
"ext-date": "*",
4951
"ext-dom": "*",
52+
"ext-fileinfo": "*",
53+
"ext-filter": "*",
5054
"ext-hash": "*",
5155
"ext-json": "*",
56+
"ext-libxml": "*",
5257
"ext-mbstring": "*",
5358
"ext-openssl": "*",
5459
"ext-pcre": "*",
@@ -57,13 +62,15 @@
5762
"ext-SPL": "*",
5863
"ext-zlib": "*",
5964

65+
"composer-runtime-api": "^2.2",
6066
"gettext/gettext": "~5.7",
67+
"gettext/php-scanner": "^2.0",
6168
"gettext/translator": "~1.2",
6269
"phpmailer/phpmailer": "~6.10",
6370
"psr/event-dispatcher": "~1.0",
6471
"psr/log": "~3.0",
72+
"robrichards/xmlseclibs": "^3.1.5",
6573
"simplesamlphp/assert": "~2.0",
66-
"simplesamlphp/composer-module-installer": "~1.7",
6774
"simplesamlphp/saml2": "~6.1",
6875
"simplesamlphp/saml2-legacy": "~4.20",
6976
"simplesamlphp/simplesamlphp-assets-base": "~2.5.0",
@@ -86,10 +93,10 @@
8693
"symfony/password-hasher": "~7.4",
8794
"symfony/polyfill-intl-icu": "~1.33",
8895
"symfony/routing": "~7.4",
96+
"symfony/translation": "~7.4",
8997
"symfony/translation-contracts": "~3.6",
9098
"symfony/twig-bridge": "~7.4",
9199
"symfony/var-exporter": "~7.4",
92-
"symfony/yaml": "~7.4",
93100
"twig/intl-extra": "~3.21",
94101
"twig/twig": "~3.21"
95102
},
@@ -100,7 +107,7 @@
100107
"gettext/php-scanner": "~2.0",
101108
"mikey179/vfsstream": "~1.6",
102109
"predis/predis": "~3.3",
103-
"simplesamlphp/simplesamlphp-test-framework": "~1.11 || dev-master",
110+
"simplesamlphp/simplesamlphp-test-framework": "~1.11.5 || dev-master",
104111
"symfony/translation": "~7.4"
105112
},
106113
"suggest": {

0 commit comments

Comments
 (0)