Skip to content

Commit a63de0c

Browse files
committed
Bump minimum PHP-version
1 parent c97c2ff commit a63de0c

3 files changed

Lines changed: 15 additions & 12 deletions

File tree

.github/workflows/php.yml

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

2424
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.9.2
2525
with:
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.1', '8.2', '8.3', '8.4']
48+
php-versions: ['8.2', '8.3', '8.4']
4949

5050
steps:
5151
- name: Setup PHP, with composer and extensions
@@ -107,7 +107,7 @@ jobs:
107107
fail-fast: true
108108
matrix:
109109
operating-system: [windows-latest]
110-
php-versions: ['8.1', '8.2', '8.3', '8.4']
110+
php-versions: ['8.2', '8.3', '8.4']
111111

112112
steps:
113113
- name: Setup PHP, with composer and extensions
@@ -194,7 +194,7 @@ jobs:
194194
run: composer-unused
195195

196196
- name: PHP Code Sniffer
197-
run: phpcs
197+
run: vendor/bin/phpcs
198198

199199
- name: PHPStan
200200
run: |
@@ -213,7 +213,7 @@ jobs:
213213
uses: shivammathur/setup-php@v2
214214
with:
215215
# Should be the lowest supported version
216-
php-version: '8.1'
216+
php-version: '8.2'
217217
extensions: ctype, date, dom, filter, hash, mbstring, openssl, pcre, soap, spl, xml
218218
tools: composer
219219
coverage: none

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"class": "SimpleSAML\\Composer\\ModuleInstallerPlugin"
1313
},
1414
"require": {
15-
"php": "^8.1",
15+
"php": "^8.2",
1616
"ext-mbstring": "*",
1717

18-
"composer/composer": "~2.8.9",
18+
"composer/composer": "~2.8.12",
1919
"composer-plugin-api": "~2.6.0",
20-
"simplesamlphp/assert": "~1.8.1"
20+
"simplesamlphp/assert": "~1.9.1"
2121
},
2222
"require-dev": {
23-
"simplesamlphp/simplesamlphp-test-framework": "~1.9.2"
23+
"simplesamlphp/simplesamlphp-test-framework": "~1.10.2"
2424
},
2525
"config": {
2626
"allow-plugins": {

src/ModuleInstaller.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ protected function getPackageBasePath(PackageInterface $package)
4646
$name = $package->getPrettyName();
4747
if (!preg_match('@^.*/simplesamlphp-(module|assets)-(.+)$@', $name, $matches)) {
4848
throw new InvalidArgumentException(sprintf(
49-
'Unable to install module %s, package name must be on the form "VENDOR/simplesamlphp-(module|assets)-MODULENAME".',
49+
'Unable to install module %s,'
50+
. ' package name must be in the form "VENDOR/simplesamlphp-(module|assets)-MODULENAME".',
5051
$name,
5152
));
5253
}
@@ -59,7 +60,8 @@ protected function getPackageBasePath(PackageInterface $package)
5960
$moduleDir,
6061
'@^[a-z0-9_.-]*$@',
6162
sprintf(
62-
'Unable to install module %s, module name must only contain characters from a-z, 0-9, "_", "." and "-".',
63+
'Unable to install module %s,'
64+
. ' module name must only contain characters from a-z, 0-9, "_", "." and "-".',
6365
$name
6466
),
6567
InvalidArgumentException::class
@@ -91,7 +93,8 @@ protected function getPackageBasePath(PackageInterface $package)
9193
mb_strtolower($mixedCaseModuleName, 'utf-8'),
9294
$moduleDir,
9395
sprintf(
94-
'Unable to install module %s, "%s" must match the package name except that it can contain uppercase letters.',
96+
'Unable to install module %s,'
97+
. ' "%s" must match the package name except that it can contain uppercase letters.',
9598
$name,
9699
self::MIXED_CASE
97100
),

0 commit comments

Comments
 (0)