Skip to content

Commit b971ea0

Browse files
committed
Fix dependency conflict
1 parent a1e47ef commit b971ea0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/php.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
with:
117117
php-version: ${{ matrix.php-versions }}
118118
extensions: ctype, dom, date, fileinfo, filter, hash, json, mbstring, mysql, openssl, pcre, \
119-
pdo, pdo_sqlite, posix, soap, spl, xdebug, xml, zip
119+
pdo, pdo_sqlite, posix, soap, sodium, spl, xdebug, xml, zip
120120
tools: composer
121121
ini-values: error_reporting=E_ALL
122122
coverage: none
@@ -164,7 +164,7 @@ jobs:
164164
# Should be the higest supported version, so we can use the newest tools
165165
php-version: '8.5'
166166
tools: composer, composer-require-checker, composer-unused
167-
extensions: ctype, date, dom, filter, hash, intl, mbstring, opcache, openssl, pcre, spl, xml
167+
extensions: ctype, date, dom, filter, hash, intl, mbstring, opcache, openssl, pcre, sodium, spl, xml
168168

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"symfony/phpunit-bridge": "^7.3 || ^8.0"
3838
},
3939
"require-dev": {
40-
"simplesamlphp/simplesamlphp": "^2.4"
40+
"simplesamlphp/simplesamlphp": "^2.5@dev"
4141
},
4242
"support": {
4343
"issues": "https://github.com/simplesamlphp/simplesamlphp-test-framework/issues",

0 commit comments

Comments
 (0)