Skip to content

Commit 1c4f1a8

Browse files
authored
Merge pull request #163 from Jurj-Bogdan/update-php
Drop support for PHP 8.1 and add support for PHP 8.5, bump Psalm to 6.x and PHPUnit to 11.x
2 parents f0d1982 + ab4834f commit 1c4f1a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2236
-1023
lines changed

.laminas-ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"xdebug"
77
],
88
"ignore_php_platform_requirements": {
9-
"8.4": true
9+
"8.4": true,
10+
"8.5": true
1011
},
1112
"backwardCompatibilityCheck": true
1213
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
3+
PHP_VERSION="$1"
4+
5+
if ! [[ "${PHP_VERSION}" =~ 8\.3 ]] && ! [[ "${PHP_VERSION}" =~ 8\.5 ]]; then
6+
echo "mongodb and xdebug are only installed from pie for PHP 8.3 or 8.5, ${PHP_VERSION} detected."
7+
exit 0;
8+
fi
9+
10+
set +e
11+
12+
curl -fL --output /tmp/pie.phar https://github.com/php/pie/releases/latest/download/pie.phar \
13+
&& mv /tmp/pie.phar /usr/local/bin/pie \
14+
&& chmod +x /usr/local/bin/pie
15+
16+
pie install mongodb/mongodb-extension
17+
18+
if ! [[ "${PHP_VERSION}" =~ 8\.5 ]]; then
19+
pie install xdebug/xdebug
20+
exit 0;
21+
fi
22+
23+
pie install xdebug/xdebug:@alpha

.laminas-ci/install-mongodb-extension-via-pecl.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

.laminas-ci/pre-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ if [ ! -z "$GITHUB_BASE_REF" ] && [[ "$GITHUB_BASE_REF" =~ ^[0-9]+\.[0-9] ]]; th
1616
echo "Exported COMPOSER_ROOT_VERISON as ${COMPOSER_ROOT_VERISON}"
1717
fi
1818

19-
${WORKING_DIRECTORY}/.laminas-ci/install-mongodb-extension-via-pecl.sh "${PHP_VERSION}" || exit 1
19+
${WORKING_DIRECTORY}/.laminas-ci/install-mongodb-and-xdebug-extensions-via-pie.sh "${PHP_VERSION}" || exit 1

composer.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"config": {
1919
"sort-packages": true,
2020
"platform": {
21-
"php": "8.1.99"
21+
"php": "8.2.99"
2222
},
2323
"allow-plugins": {
2424
"dealerdirect/phpcodesniffer-composer-installer": true,
@@ -32,23 +32,25 @@
3232
}
3333
},
3434
"require": {
35-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
36-
"laminas/laminas-eventmanager": "^3.12",
37-
"laminas/laminas-servicemanager": "^3.22",
38-
"laminas/laminas-stdlib": "^3.18"
35+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
36+
"laminas/laminas-eventmanager": "^3.14.0",
37+
"laminas/laminas-servicemanager": "^3.23.1",
38+
"laminas/laminas-stdlib": "^3.20.0"
3939
},
4040
"require-dev": {
4141
"ext-xdebug": "*",
42-
"laminas/laminas-cache": "^3.12.2",
43-
"laminas/laminas-cache-storage-adapter-memory": "^2.3",
42+
"amphp/dns": "^2.4.0",
43+
"amphp/socket": "^2.3.1",
44+
"laminas/laminas-cache": "^3.13.0",
45+
"laminas/laminas-cache-storage-adapter-memory": "^2.4",
4446
"laminas/laminas-coding-standard": "~3.1.0",
4547
"laminas/laminas-db": "^2.20.0",
46-
"laminas/laminas-http": "^2.20",
47-
"laminas/laminas-validator": "^2.64.1",
48-
"mongodb/mongodb": "~2.1.0",
49-
"phpunit/phpunit": "^10.5.38",
50-
"psalm/plugin-phpunit": "^0.19.0",
51-
"vimeo/psalm": "^5.26.1"
48+
"laminas/laminas-http": "^2.22",
49+
"laminas/laminas-validator": "^2.64.4",
50+
"mongodb/mongodb": "~2.1.2",
51+
"phpunit/phpunit": "^11.5.42",
52+
"psalm/plugin-phpunit": "^0.19.5",
53+
"vimeo/psalm": "^6.13.1"
5254
},
5355
"suggest": {
5456
"laminas/laminas-cache": "Laminas\\Cache component",

0 commit comments

Comments
 (0)