Skip to content

Commit 9de1ead

Browse files
committed
Bump minimum PHP-version and dependencies
1 parent 44a79b9 commit 9de1ead

File tree

2 files changed

+22
-25
lines changed

2 files changed

+22
-25
lines changed

.github/workflows/php.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php-version: ['8.2', '8.3', '8.4', '8.5']
22+
php-version: ['8.3', '8.4', '8.5']
2323

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

@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232

33-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.6
33+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
3434
with:
3535
enable_eslinter: false
3636
enable_jsonlinter: true
@@ -45,15 +45,15 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.2', '8.3', '8.4', '8.5']
48+
php-versions: ['8.3', '8.4', '8.5']
4949

5050
steps:
5151
- name: Setup PHP, with composer and extensions
5252
# https://github.com/shivammathur/setup-php
5353
uses: shivammathur/setup-php@v2
5454
with:
5555
php-version: ${{ matrix.php-versions }}
56-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, spl, xml
56+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, sodium, spl, xml
5757
tools: composer
5858
ini-values: error_reporting=E_ALL
5959
coverage: pcov
@@ -107,15 +107,16 @@ jobs:
107107
fail-fast: true
108108
matrix:
109109
operating-system: [windows-latest]
110-
php-versions: ['8.2', '8.3', '8.4', '8.5']
110+
php-versions: ['8.3', '8.4', '8.5']
111111

112112
steps:
113113
- name: Setup PHP, with composer and extensions
114114
# https://github.com/shivammathur/setup-php
115115
uses: shivammathur/setup-php@v2
116116
with:
117117
php-version: ${{ matrix.php-versions }}
118-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, spl, xml, zip
118+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre,\
119+
sodium, spl, xml, zip
119120
tools: composer
120121
ini-values: error_reporting=E_ALL
121122
coverage: none
@@ -163,7 +164,7 @@ jobs:
163164
# Should be the higest supported version, so we can use the newest tools
164165
php-version: '8.5'
165166
tools: composer, composer-require-checker, composer-unused, phpcs
166-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, spl, xml
167+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, sodium, spl, xml
167168

168169
- name: Setup problem matchers for PHP
169170
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -214,8 +215,8 @@ jobs:
214215
uses: shivammathur/setup-php@v2
215216
with:
216217
# Should be the lowest supported version
217-
php-version: '8.2'
218-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, spl, xml
218+
php-version: '8.3'
219+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, sodium, spl, xml
219220
tools: composer
220221
coverage: none
221222

composer.json

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,24 @@
3434
}
3535
},
3636
"require": {
37-
"php": "^8.2",
37+
"php": "^8.3",
38+
3839
"ext-pcre": "*",
3940
"ext-dom": "*",
4041

4142
"simplesamlphp/assert": "^1.9",
42-
"simplesamlphp/composer-module-installer": "^1.4",
43-
"simplesamlphp/simplesamlphp": "dev-simplesamlphp-2.5 as v2.5.x-dev",
44-
"simplesamlphp/simplesamlphp-module-ldap": "~1.2",
45-
"simplesamlphp/xml-cas-module-slate": "~1.1.0",
46-
"simplesamlphp/xml-cas": "^v2.2.0",
47-
"simplesamlphp/xml-common": "~2.4",
48-
"symfony/http-foundation": "~7.4",
49-
"symfony/http-client": "~7.4",
43+
"simplesamlphp/composer-module-installer": "^1.5",
44+
"simplesamlphp/simplesamlphp": "^2.5@dev",
45+
"simplesamlphp/simplesamlphp-module-ldap": "^1.2",
46+
"simplesamlphp/xml-cas-module-slate": "^1.2",
47+
"simplesamlphp/xml-cas": "^2.3",
48+
"simplesamlphp/xml-common": "^2.5",
49+
"symfony/http-foundation": "^7.4",
50+
"symfony/http-client": "^7.4",
5051
"symfony/http-client-contracts": "^3.5"
5152
},
5253
"require-dev": {
53-
"simplesamlphp/simplesamlphp-test-framework": "^1.10",
54-
"phpunit/phpunit": "^11",
55-
"icanhazstring/composer-unused": "^0.9.5",
56-
"squizlabs/php_codesniffer": "^4.0.0",
57-
"phpstan/phpstan": "^2.1.33",
58-
"maglnet/composer-require-checker": "^4"
54+
"simplesamlphp/simplesamlphp-test-framework": "^1.11"
5955
},
6056
"support": {
6157
"issues": "https://github.com/simplesamlphp/simplesamlphp-module-cas/issues",

0 commit comments

Comments
 (0)