Skip to content

Commit 8225b16

Browse files
authored
Merge pull request #357 from driehle/feat/php84
Allow PHP 8.4 in laminas-cache 3.x
2 parents 7486d19 + e099a96 commit 8225b16

File tree

5 files changed

+1380
-1320
lines changed

5 files changed

+1380
-1320
lines changed

.laminas-ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
],
99
"backwardCompatibilityCheck": true,
1010
"ignore_php_platform_requirements": {
11-
"8.3": true
11+
"8.4": true
1212
}
1313
}

.laminas-ci/pre-install.sh

+4-11
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

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

7-
if [ ! -z "$GITHUB_BASE_REF" ] && [[ "$GITHUB_BASE_REF" =~ ^[0-9]+\.[0-9] ]]; then
8-
readarray -td. TARGET_BRANCH_VERSION_PARTS <<<"${GITHUB_BASE_REF}.";
9-
unset 'TARGET_BRANCH_VERSION_PARTS[-1]';
10-
declare -a TARGET_BRANCH_VERSION_PARTS
11-
MAJOR_OF_TARGET_BRANCH=${TARGET_BRANCH_VERSION_PARTS[0]}
12-
MINOR_OF_TARGET_BRANCH=${TARGET_BRANCH_VERSION_PARTS[1]}
13-
14-
export COMPOSER_ROOT_VERISON="${MAJOR_OF_TARGET_BRANCH}.${MINOR_OF_TARGET_BRANCH}.99"
15-
echo "Exported COMPOSER_ROOT_VERISON as ${COMPOSER_ROOT_VERISON}"
16-
fi
7+
# Temporary workaround for cyclic dependencies - must be adjusted in next major branch!
8+
echo "Branch as 3.99.x in Pre-Install"
9+
git checkout -b 3.99.x
1710

1811
${WORKING_DIRECTORY}/.laminas-ci/install-apcu-extension-via-pecl.sh "${PHP_VERSION}" || exit 1

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
"require": {
37-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
37+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
3838
"laminas/laminas-cache-storage-implementation": "1.0",
3939
"laminas/laminas-eventmanager": "^3.4",
4040
"laminas/laminas-servicemanager": "^3.21",

0 commit comments

Comments
 (0)