Skip to content

Merge release 3.14.0 into 4.0.x #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 8 commits into
base: 4.0.x
Choose a base branch
from
Open

Merge release 3.14.0 into 4.0.x #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a419e1c
allow PHP 8.4
driehle Jan 10, 2025
cd45082
set branch in CI for composer to detect root version
driehle Jan 20, 2025
e099a96
updated Psalm baseline
driehle Jan 10, 2025
8225b16
Merge pull request #357 from driehle/feat/php84
gsteel Jan 21, 2025
25d3137
Remove support for PHP 8.1, add support for PHP 8.5
KorvinSzanto Feb 4, 2026
a5ccaf5
Remove ignore_php_platform_requirements
KorvinSzanto Feb 5, 2026
8de0037
Add back ignore_php_platform_requirements
KorvinSzanto Feb 5, 2026
c4b556b
Merge pull request #380 from KorvinSzanto/feature/3.x-php8.5
gsteel Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .laminas-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
],
"backwardCompatibilityCheck": true,
"ignore_php_platform_requirements": {
"8.3": true
"8.4": true,
"8.5": true
}
}
15 changes: 4 additions & 11 deletions .laminas-ci/pre-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,10 @@

WORKING_DIRECTORY=$2
JOB=$3
PHP_VERSION=$(php -nr "echo PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION;")
PHP_VERSION=$(echo "${JOB}" | jq -r '.php')

if [ ! -z "$GITHUB_BASE_REF" ] && [[ "$GITHUB_BASE_REF" =~ ^[0-9]+\.[0-9] ]]; then
readarray -td. TARGET_BRANCH_VERSION_PARTS <<<"${GITHUB_BASE_REF}.";
unset 'TARGET_BRANCH_VERSION_PARTS[-1]';
declare -a TARGET_BRANCH_VERSION_PARTS
MAJOR_OF_TARGET_BRANCH=${TARGET_BRANCH_VERSION_PARTS[0]}
MINOR_OF_TARGET_BRANCH=${TARGET_BRANCH_VERSION_PARTS[1]}

export COMPOSER_ROOT_VERISON="${MAJOR_OF_TARGET_BRANCH}.${MINOR_OF_TARGET_BRANCH}.99"
echo "Exported COMPOSER_ROOT_VERISON as ${COMPOSER_ROOT_VERISON}"
fi
# Temporary workaround for cyclic dependencies - must be adjusted in next major branch!
echo "Branch as 3.99.x in Pre-Install"
git checkout -b 3.99.x

${WORKING_DIRECTORY}/.laminas-ci/install-apcu-extension-via-pecl.sh "${PHP_VERSION}" || exit 1
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"process-timeout": 600,
"sort-packages": true,
"platform": {
"php": "8.1.99"
"php": "8.2.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -34,7 +34,7 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"laminas/laminas-cache-storage-implementation": "1.0",
"laminas/laminas-eventmanager": "^3.4",
"laminas/laminas-servicemanager": "^3.21",
Expand Down
Loading
Loading