Skip to content

Commit aa616ec

Browse files
committed
Fix CI
1 parent e0061f5 commit aa616ec

4 files changed

Lines changed: 41 additions & 24 deletions

File tree

.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
run: composer install --no-progress --prefer-dist --optimize-autoloader
189189

190190
- name: Check code for hard dependencies missing in composer.json
191-
run: composer-require-checker check --config-file tools/composer-require-checker.json composer.json
191+
run: composer-require-checker composer.json
192192

193193
- name: Check code for unused dependencies in composer.json
194194
run: |

1

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
pick a6e6d49 Add support for PHPunit 13
2+
pick e0061f5 Move contents of lib-dir to src-dir
3+
pick 61fddec Fix CI
4+
s 08712a5 Fix CI
5+
6+
# Rebase 720ccf7..08712a5 onto 720ccf7 (4 commands)
7+
#
8+
# Commands:
9+
# p, pick <commit> = use commit
10+
# r, reword <commit> = use commit, but edit the commit message
11+
# e, edit <commit> = use commit, but stop for amending
12+
# s, squash <commit> = use commit, but meld into previous commit
13+
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
14+
# commit's log message, unless -C is used, in which case
15+
# keep only this commit's message; -c is same as -C but
16+
# opens the editor
17+
# x, exec <command> = run command (the rest of the line) using shell
18+
# b, break = stop here (continue rebase later with 'git rebase --continue')
19+
# d, drop <commit> = remove commit
20+
# l, label <label> = label current HEAD with a name
21+
# t, reset <label> = reset HEAD to a label
22+
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
23+
# create a merge commit using the original merge commit's
24+
# message (or the oneline, if no original merge commit was
25+
# specified); use -c <commit> to reword the commit message
26+
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
27+
# to this position in the new commits. The <ref> is
28+
# updated at the end of the rebase
29+
#
30+
# These lines can be re-ordered; they are executed from top to bottom.
31+
#
32+
# If you remove a line here THAT COMMIT WILL BE LOST.
33+
#
34+
# However, if you remove everything, the rebase will be aborted.
35+
#

composer.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@
1010
"email": "tvdijen@gmail.com"
1111
}
1212
],
13-
"autoload": {
14-
"psr-4": {
15-
"SimpleSAML\\TestUtils\\": "src/"
16-
}
17-
},
1813
"autoload-dev": {
1914
"psr-4": {
15+
"SimpleSAML\\TestUtils\\": "src/",
2016
"SimpleSAML\\Test\\TestUtils\\": "tests/src/"
2117
}
2218
},
23-
"require": {
19+
"require-dev": {
2420
"php": "^8.3",
2521
"ext-curl": "*",
2622

@@ -32,12 +28,11 @@
3228
"phpstan/phpstan-phpunit": "^2.0",
3329
"phpunit/phpunit": "^12.3 || ^13.0",
3430
"psr/log": "^3.0",
31+
"simplesamlphp/simplesamlphp": "^2.5@dev",
3532
"slevomat/coding-standard": "^8.25",
3633
"squizlabs/php_codesniffer": "^4.0",
37-
"symfony/phpunit-bridge": "^8.0"
38-
},
39-
"require-dev": {
40-
"simplesamlphp/simplesamlphp": "^2.5@dev"
34+
"symfony/phpunit-bridge": "^8.0",
35+
"twig/twig": "~3.23"
4136
},
4237
"support": {
4338
"issues": "https://github.com/simplesamlphp/simplesamlphp-test-framework/issues",

tools/composer-require-checker.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)