Skip to content

Commit 92a71ae

Browse files
committed
Fix CI
1 parent e0061f5 commit 92a71ae

File tree

6 files changed

+60
-26
lines changed

6 files changed

+60
-26
lines changed

.github/workflows/php.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,10 @@ 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 check composer.json
192192

193193
- name: Check code for unused dependencies in composer.json
194-
run: |
195-
composer-unused \
196-
--excludePackage=icanhazstring/composer-unused \
197-
--excludePackage=maglnet/composer-require-checker \
198-
--excludePackage=phpstan/phpstan \
199-
--excludePackage=phpstan/extension-installer \
200-
--excludePackage=phpstan/phpstan-mockery \
201-
--excludePackage=phpstan/phpstan-phpunit \
202-
--excludePackage=slevomat/coding-standard \
203-
--excludePackage=squizlabs/php_codesniffer \
204-
--excludePackage=symfony/phpunit-bridge
194+
run: composer-unused
205195

206196
- name: PHP Code Sniffer
207197
run: vendor/bin/phpcs

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: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
],
1313
"autoload": {
1414
"psr-4": {
15-
"SimpleSAML\\TestUtils\\": "src/"
15+
"SimpleSAML\\TestUtils\\": "lib/"
1616
}
1717
},
1818
"autoload-dev": {
1919
"psr-4": {
20+
"SimpleSAML\\TestUtils\\": "src/",
2021
"SimpleSAML\\Test\\TestUtils\\": "tests/src/"
2122
}
2223
},
2324
"require": {
25+
"php": "^8.3"
26+
},
27+
"require-dev": {
2428
"php": "^8.3",
2529
"ext-curl": "*",
2630

@@ -32,12 +36,11 @@
3236
"phpstan/phpstan-phpunit": "^2.0",
3337
"phpunit/phpunit": "^12.3 || ^13.0",
3438
"psr/log": "^3.0",
39+
"simplesamlphp/simplesamlphp": "^2.5@dev",
3540
"slevomat/coding-standard": "^8.25",
3641
"squizlabs/php_codesniffer": "^4.0",
37-
"symfony/phpunit-bridge": "^8.0"
38-
},
39-
"require-dev": {
40-
"simplesamlphp/simplesamlphp": "^2.5@dev"
42+
"symfony/phpunit-bridge": "^8.0",
43+
"twig/twig": "~3.23"
4144
},
4245
"support": {
4346
"issues": "https://github.com/simplesamlphp/simplesamlphp-test-framework/issues",

lib/Bogus.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace SimpleSAML\TestUtils;
6+
7+
use Serializable;
8+
9+
/**
10+
* Bogus class. Used for fooling composer-require-checker.
11+
*/
12+
class Bogus implements Serializable
13+
{
14+
}

lib/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Do not place any files in this directory. Just use the src-dir
Lines changed: 0 additions & 9 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"
123
]
134
}

0 commit comments

Comments
 (0)