Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zendframework/zend-cache
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release-2.8.3
Choose a base ref
...
head repository: zendframework/zend-cache
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-2.9.0
Choose a head ref

Commits on Apr 24, 2018

  1. 2.8.0 readiness

    weierophinney committed Apr 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    leohemsted Leo Hemsted
    Copy the full SHA
    c41bd4a View commit details
  2. Bumped version

    weierophinney committed Apr 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    csmarchbanks Chris Marchbanks
    Copy the full SHA
    147c65c View commit details

Commits on Apr 26, 2018

  1. Merge branch 'hotfix/167-memcached-return-when-no-entry-found' into d…

    …evelop
    
    Forward port #167
    Forward port #166
    weierophinney committed Apr 26, 2018
    Copy the full SHA
    aa20c3b View commit details
  2. 2.8.1 readiness

    Conflicts:
    	CHANGELOG.md
    weierophinney committed Apr 26, 2018
    Copy the full SHA
    f5455e8 View commit details
  3. Bumped version

    Conflicts:
    	CHANGELOG.md
    weierophinney committed Apr 26, 2018
    Copy the full SHA
    eb5d79d View commit details

Commits on May 1, 2018

  1. Merge branch 'hotfix/168' into develop

    Forward port #168
    
    Conflicts:
    	CHANGELOG.md
    weierophinney committed May 1, 2018
    Copy the full SHA
    25513b9 View commit details
  2. Bumped version

    Conflicts:
    	CHANGELOG.md
    weierophinney committed May 1, 2018
    Copy the full SHA
    1e9b57c View commit details

Commits on Mar 26, 2019

  1. Copy the full SHA
    2ab7fac View commit details

Commits on Aug 14, 2019

  1. Merge pull request #172 from samsonasik/count-op

    count optimization
    michalbundyra committed Aug 14, 2019
    Copy the full SHA
    f906fe6 View commit details
  2. Merge pull request #173 from samsonasik/substr-strpos

    change substr with strpos/stripos when possible
    michalbundyra committed Aug 14, 2019
    Copy the full SHA
    9e48734 View commit details
  3. Merge pull request #187 from webimpress/hotfix/docs-config into develop

    Forward port #187
    
    Updates configuration of MkDocs for documentation
    michalbundyra committed Aug 14, 2019
    Copy the full SHA
    4649ad7 View commit details

Commits on Aug 15, 2019

  1. Merge pull request #188 from froschdesign/hotfix/docs/headlines-index…

    …-versionnotes into develop
    
    Forward port #188
    
    Fixes and updates for documentation
    michalbundyra committed Aug 15, 2019
    Copy the full SHA
    9c0d3db View commit details
  2. Merge pull request #189 from webimpress/hotfix/travis-ci

    Forward port #189
    
    Update Travis CI config to fix memcache/memcached tests on PHP 5.6
    michalbundyra committed Aug 15, 2019
    Copy the full SHA
    5fad8e6 View commit details

Commits on Aug 28, 2019

  1. Merge branch 'hotfix/184' into develop

    Forward port #184
    michalbundyra committed Aug 28, 2019
    Copy the full SHA
    40f0b9c View commit details
  2. Merge branch 'hotfix/182' into develop

    Forward port #182
    michalbundyra committed Aug 28, 2019
    Copy the full SHA
    aa3d373 View commit details
  3. Copy the full SHA
    cd72867 View commit details
  4. Copy the full SHA
    222c8bd View commit details
  5. Bumped master version

    michalbundyra committed Aug 28, 2019
    Copy the full SHA
    69ff317 View commit details

Commits on Aug 29, 2019

  1. Copy the full SHA
    5b37fad View commit details
  2. Tests across different versions of PECL Redis

    PHP 5.6:
    - 2.2.3
    - 3.1.6
    - 4.3.0
    
    PHP 7.0-7.2:
    - 4.0.0
    - 5.0.0
    - 5.0.2
    michalbundyra committed Aug 29, 2019
    Copy the full SHA
    0777c32 View commit details
  3. Merge pull request #186 from ppaulis/master

    Issue #185 : replacing deprecated delete() calls with del()
    michalbundyra committed Aug 29, 2019
    Copy the full SHA
    1f45226 View commit details
  4. Copy the full SHA
    45d32ac View commit details
  5. Merge branch 'feature/186' into develop

    Close #186
    Fix #185
    michalbundyra committed Aug 29, 2019
    Copy the full SHA
    f6be010 View commit details
  6. Copy the full SHA
    6527c6f View commit details
  7. Copy the full SHA
    b24bc85 View commit details
  8. Copy the full SHA
    dbfc20c View commit details
  9. Copy the full SHA
    79d0cd4 View commit details
  10. Copy the full SHA
    0f0e9c2 View commit details
  11. Merge pull request #178 from webimpress/feature/php-7.3-support

    Added PHP 7.3 support - updated Travis CI configuration
    michalbundyra committed Aug 29, 2019
    Copy the full SHA
    906ae6a View commit details
  12. Copy the full SHA
    de6507d View commit details
  13. Merge branch 'develop'

    michalbundyra committed Aug 29, 2019
    Copy the full SHA
    f850204 View commit details
  14. Copy the full SHA
    29f8d1a View commit details
  15. release: 2.9.0 readiness

    - set release date in CHANGELOG
    - update branch-alias in composer.json
      - dev-master - 2.9.x-dev
      - dev-develop - 2.10.x-dev
    - remove stub for 2.8.4 release from CHANGELOG
    michalbundyra committed Aug 29, 2019
    Copy the full SHA
    41e001b View commit details
  16. Copy the full SHA
    cffd54a View commit details
Showing with 112 additions and 52 deletions.
  1. +0 −1 .ci/redis.ini
  2. +44 −10 .travis.yml
  3. +25 −0 CHANGELOG.md
  4. +3 −3 composer.json
  5. +37 −35 composer.lock
  6. +3 −3 src/Storage/Adapter/Redis.php
1 change: 0 additions & 1 deletion .ci/redis.ini

This file was deleted.

54 changes: 44 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
sudo: false

language: php

cache:
@@ -46,6 +44,7 @@ matrix:
- APCU_PECL_VERSION="apcu-4.0.8"
- MEMCACHE_PECL_VERSION="memcache-2.2.7"
- MEMCACHED_PECL_VERSION="memcached-2.2.0"
- REDIS_PECL_VERSION="redis-2.2.3"
- TESTS_ZEND_CACHE_EXTMONGODB_ENABLED=false
- TESTS_ZEND_CACHE_MEMCACHE_ENABLED=true
- TESTS_ZEND_CACHE_XCACHE_ENABLED=true
@@ -56,15 +55,17 @@ matrix:
- APCU_PECL_VERSION="apcu-4.0.10"
- MEMCACHE_PECL_VERSION="memcache-3.0.7"
- MEMCACHED_PECL_VERSION="memcached-2.2.0"
- REDIS_PECL_VERSION="redis-3.1.6"
- TESTS_ZEND_CACHE_EXTMONGODB_ENABLED=false
- TESTS_ZEND_CACHE_MEMCACHE_ENABLED=true
- TESTS_ZEND_CACHE_XCACHE_ENABLED=true
- php: 5.6
env:
- DEPS=latest
- APCU_PECL_VERSION="apcu-4.0.11"
- MEMCACHE_PECL_VERSION="memcache-3.0.8"
- MEMCACHED_PECL_VERSION="memcached-2.2.0"
- APCU_PECL_VERSION="apcu"
- MEMCACHE_PECL_VERSION="memcache"
- MEMCACHED_PECL_VERSION="memcached"
- REDIS_PECL_VERSION="redis-4.3.0"
- TESTS_ZEND_CACHE_EXTMONGODB_ENABLED=false
- TESTS_ZEND_CACHE_MEMCACHE_ENABLED=true
- TESTS_ZEND_CACHE_XCACHE_ENABLED=true
@@ -73,6 +74,7 @@ matrix:
- DEPS=lowest
- APCU_PECL_VERSION="apcu-5.1.2"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.0"
- REDIS_PECL_VERSION="redis-4.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- TESTS_ZEND_CACHE_EXTMONGODB_ENABLED=false
- php: 7
@@ -81,20 +83,23 @@ matrix:
- LEGACY_DEPS="phpbench/phpbench phpunit/phpunit"
- APCU_PECL_VERSION="apcu-5.1.8"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- REDIS_PECL_VERSION="redis-5.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- TESTS_ZEND_CACHE_EXTMONGODB_ENABLED=false
- php: 7
env:
- DEPS=latest
- APCU_PECL_VERSION="apcu"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.3"
- APCU_BC_PECL_VERSION="apcu_bc"
- REDIS_PECL_VERSION="redis"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- TESTS_ZEND_CACHE_EXTMONGODB_ENABLED=false
- php: 7.1
env:
- DEPS=lowest
- APCU_PECL_VERSION="apcu-5.1.7"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- REDIS_PECL_VERSION="redis-4.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.1
env:
@@ -104,30 +109,59 @@ matrix:
- TEST_COVERAGE=true
- APCU_PECL_VERSION="apcu-5.1.8"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- REDIS_PECL_VERSION="redis-5.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.1
env:
- DEPS=latest
- APCU_PECL_VERSION="apcu"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.3"
- APCU_BC_PECL_VERSION="apcu_bc"
- REDIS_PECL_VERSION="redis"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.2
env:
- DEPS=lowest
- APCU_PECL_VERSION="apcu-5.1.10"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- REDIS_PECL_VERSION="redis-4.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.2
env:
- DEPS=locked
- APCU_PECL_VERSION="apcu-5.1.10"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- REDIS_PECL_VERSION="redis-5.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.2
env:
- DEPS=latest
- APCU_PECL_VERSION="apcu"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.3"
- APCU_BC_PECL_VERSION="apcu_bc"
- REDIS_PECL_VERSION="redis"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.3
env:
- DEPS=lowest
- APCU_PECL_VERSION="apcu-5.1.10"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- MEMCACHED_PECL_VERSION="memcached-3.1.2"
- REDIS_PECL_VERSION="redis-4.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.3
env:
- DEPS=locked
- APCU_PECL_VERSION="apcu-5.1.10"
- APCU_BC_PECL_VERSION="apcu_bc-1.0.2"
- MEMCACHED_PECL_VERSION="memcached-3.1.2"
- REDIS_PECL_VERSION="redis-5.0.0"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true
- php: 7.3
env:
- DEPS=latest
- APCU_PECL_VERSION="apcu"
- APCU_BC_PECL_VERSION="apcu_bc"
- MEMCACHED_PECL_VERSION="memcached"
- REDIS_PECL_VERSION="redis"
- TESTS_ZEND_CACHE_MONGODB_USE_POLYFILL=true

before_install:
@@ -162,14 +196,14 @@ install:
fi ;

- if [[ $TESTS_ZEND_CACHE_REDIS_ENABLED == 'true' ]]; then
phpenv config-add .ci/redis.ini ;
echo "no" | pecl install -f $REDIS_PECL_VERSION ;
fi ;

- if [[ $TESTS_ZEND_CACHE_MEMCACHE_ENABLED == 'true' ]]; then
yes|CFLAGS="-fgnu89-inline" pecl install -f $MEMCACHE_PECL_VERSION ;
fi ;

- if [[ $TESTS_ZEND_CACHE_MEMCACHED_ENABLED == 'true' && $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then
- if [[ $TESTS_ZEND_CACHE_MEMCACHED_ENABLED == 'true' && $MEMCACHED_PECL_VERSION != '' ]]; then
echo "no" | pecl install -f $MEMCACHED_PECL_VERSION ;
elif [[ $TESTS_ZEND_CACHE_MEMCACHED_ENABLED == 'true' ]]; then
phpenv config-add .ci/memcached.ini ;
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,31 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 2.9.0 - 2019-08-29

### Added

- [#178](https://github.com/zendframework/zend-cache/pull/178) adds support for PHP 7.3.

### Changed

- [#186](https://github.com/zendframework/zend-cache/pull/186) replaces
deprecated `delete()` calls with `del()` in Redis adapter. `delete()`
function is deprecated since version 5.0.0 and `del()` is available
since version 2.1.0.

### Deprecated

- Nothing.

### Removed

- [#178](https://github.com/zendframework/zend-cache/pull/178) removes support for zend-stdlib v2 releases.

### Fixed

- Nothing.

## 2.8.3 - 2019-08-28

### Added
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
"psr/simple-cache": "^1.0",
"zendframework/zend-eventmanager": "^2.6.3 || ^3.2",
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
"zendframework/zend-stdlib": "^2.7.7 || ^3.1"
"zendframework/zend-stdlib": "^3.2.1"
},
"require-dev": {
"cache/integration-tests": "^0.16",
@@ -76,8 +76,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.8.x-dev",
"dev-develop": "2.9.x-dev"
"dev-master": "2.9.x-dev",
"dev-develop": "2.10.x-dev"
},
"zf": {
"component": "Zend\\Cache",
72 changes: 37 additions & 35 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Storage/Adapter/Redis.php
Original file line number Diff line number Diff line change
@@ -356,7 +356,7 @@ protected function internalRemoveItem(& $normalizedKey)
{
$redis = $this->getRedisResource();
try {
return (bool) $redis->delete($this->namespacePrefix . $normalizedKey);
return (bool) $redis->del($this->namespacePrefix . $normalizedKey);
} catch (RedisResourceException $e) {
throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
}
@@ -434,7 +434,7 @@ public function clearByNamespace($namespace)
$options = $this->getOptions();
$prefix = $namespace . $options->getNamespaceSeparator();

$redis->delete($redis->keys($prefix . '*'));
$redis->del($redis->keys($prefix . '*'));

return true;
}
@@ -460,7 +460,7 @@ public function clearByPrefix($prefix)
$namespace = $options->getNamespace();
$prefix = ($namespace === '') ? '' : $namespace . $options->getNamespaceSeparator() . $prefix;

$redis->delete($redis->keys($prefix.'*'));
$redis->del($redis->keys($prefix.'*'));

return true;
}