minor #20002 [HttpFoundation] Enable memcached tests with the latest memcached extension (jakzal)

fabpot · fabpot · commit f7fc01d4945c · 2016-09-21T08:16:51.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpFoundation] Enable memcached tests with the latest memcached extension | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The check was introduced because of #9797. The issue is now fixed in the memcached extension, but only for the upcoming 3.0 release (for PHP7). I've tested it with the latest memcached extension built from source and PHP 7.0.8. Commits ------- b482fb7 [HttpFoundation] Enable memcached tests with the latest memcached extension
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -37,8 +37,8 @@ protected function setUp()
 
         parent::setUp();
 
-        if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {
-            $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');
+        if (version_compare(phpversion('memcached'), '2.2.0', '>=') && version_compare(phpversion('memcached'), '3.0.0b1', '<')) {
+            $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');
         }
 
         $this->memcached = $this->getMock('Memcached');

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ protected function setUp()`
`37`	`37`
`38`	`38`	`parent::setUp();`
`39`	`39`
`40`		`- if (version_compare(phpversion('memcached'), '2.2.0', '>=')) {`
`41`		`- $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower');`
	`40`	`+ if (version_compare(phpversion('memcached'), '2.2.0', '>=') && version_compare(phpversion('memcached'), '3.0.0b1', '<')) {`
	`41`	`+ $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`$this->memcached = $this->getMock('Memcached');`