Merge pull request #357 from driehle/feat/php84

Allow PHP 8.4 in laminas-cache 3.x

.laminas-ci.json

@@ -8,6 +8,6 @@
     ],
     "backwardCompatibilityCheck": true,
     "ignore_php_platform_requirements": {
-        "8.3": true
+        "8.4": true
     }
 }

.laminas-ci/pre-install.sh

@@ -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

composer.json

@@ -34,7 +34,7 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "laminas/laminas-cache-storage-implementation": "1.0",
         "laminas/laminas-eventmanager": "^3.4",
         "laminas/laminas-servicemanager": "^3.21",