Skip to content

Commit

Permalink
Merge pull request #136 from laminas/2.10.x-merge-up-into-3.0.x_Zq7P8ctA
Browse files Browse the repository at this point in the history
Merge release 2.10.0 into 3.0.x
  • Loading branch information
gsteel authored Jan 23, 2025
2 parents 327f59c + b799da9 commit 2767ed8
Show file tree
Hide file tree
Showing 4 changed files with 358 additions and 336 deletions.
3 changes: 3 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
"redis.clusters.timeout = 'cluster=5'",
"redis.clusters.read_timeout = 'cluster=10'"
],
"ignore_php_platform_requirements": {
"8.4": true
},
"backwardCompatibilityCheck": true
}
7 changes: 7 additions & 0 deletions .laminas-ci/pre-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@ COMMAND=$(echo "${JOB}" | jq -r '.command // ""')
PHP=$(echo "${JOB}" | jq -r '.php // ""')
REDIS_VERSION=${BASH_REMATCH[1]}

echo "SETUP: Installing ext-redis $REDIS_VERSION with PHP $PHP..."
pecl install -f --configureoptions 'enable-redis-igbinary="yes" enable-redis-lzf="yes"' igbinary redis-${REDIS_VERSION}

if [ $? -ne 0 ]; then
echo "ERROR: Installation of ext-redis $REDIS_VERSION with PHP $PHP failed."
exit 1
fi

echo "extension=redis.so" > /etc/php/${PHP}/mods-available/redis.ini
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"license": "BSD-3-Clause",
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-redis": "^6.0",
"laminas/laminas-cache": "^4.0"
},
Expand Down
Loading

0 comments on commit 2767ed8

Please sign in to comment.