8000 minor #12297 enforce memcached version to be 2.1.0 (xabbuh) · symfony/symfony@d009b2b · GitHub
[go: up one dir, main page]
Skip to content
10000

Commit d009b2b

Browse files
fabpotfabpot
committed
minor #12297 enforce memcached version to be 2.1.0 (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- enforce memcached version to be 2.1.0 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9797 | License | MIT | Doc PR | The signature of the `Memcached::get()` method changed with 2.2.0. Therefore, tests fail in Symfony when mocking `Memcached` in the `MemcachedSessionHandlerTest` of the HttpFoundation component (see also php-memcached-dev/php-memcached#126 and https://bugs.php.net/bug.php?id=66331). Commits ------- 2ac5c86 enforce memcached version to be 2.1.0
2 parents 91fde69 + 2ac5c86 commit d009b2b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ before_install:
2626
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
2727
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2828
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
29-
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
29+
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then pecl install -f memcached-2.1.0; fi;'
3030
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
3131
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
3232
# - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ protected function setUp()
3131
$this->markTestSkipped('Skipped tests Memcached class is not present');
3232
}
3333

34+
if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {
35+
$this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');
36+
}
37+
3438
$this->memcached = $this->getMock('Memcached');
3539
$this->storage = new MemcachedSessionHandler(
3640
$this->memcached,

0 commit comments

Comments
 (0)
0