Skip to content

Commit 07b1a5f

Browse files
committed
Fix CI
1 parent e0061f5 commit 07b1a5f

3 files changed

Lines changed: 38 additions & 11 deletions

File tree

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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@
3232
"phpstan/phpstan-phpunit": "^2.0",
3333
"phpunit/phpunit": "^12.3 || ^13.0",
3434
"psr/log": "^3.0",
35+
"simplesamlphp/simplesamlphp": "^2.5@dev",
3536
"slevomat/coding-standard": "^8.25",
3637
"squizlabs/php_codesniffer": "^4.0",
3738
"symfony/phpunit-bridge": "^8.0"
39+
"twig/twig": "~3.23",
3840
},
3941
"require-dev": {
40-
"simplesamlphp/simplesamlphp": "^2.5@dev"
4142
},
4243
"support": {
4344
"issues": "https://github.com/simplesamlphp/simplesamlphp-test-framework/issues",
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
{
22
"symbol-whitelist": [
3-
"SimpleSAML\\Configuration",
4-
"SimpleSAML\\Error\\ConfigurationError",
5-
"SimpleSAML\\Logger\\LoggingHandlerInterface",
6-
"SimpleSAML\\Metadata\\MetaDataStorageHandler",
7-
"SimpleSAML\\Session",
8-
"SimpleSAML\\Store\\StoreFactory",
9-
"SimpleSAML\\Store\\StoreInterface",
10-
"SimpleSAML\\Utils\\ClearableState",
11-
"SimpleSAML\\Utils\\System"
12-
]
3+
],
134
}

0 commit comments

Comments
 (0)