bug #29783 [HttpFoundation] MemcachedSessionHandler::close() must close connection (grachevko)

nicolas-grekas · nicolas-grekas · commit a1a3ffc1b98a · 2019-01-25T11:55:39.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpFoundation] MemcachedSessionHandler::close() must close connection | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | License | MIT Intoduced here #3333 Commits ------- 38a9d8b [Bugfix] MemcachedSessionHandler::close() must close connection
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -62,7 +62,7 @@ public function __construct(\Memcached $memcached, array $options = [])
      */
     public function close()
     {
-        return true;
+        return $this->memcached->quit();
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -63,6 +63,12 @@ public function testOpenSession()
 
     public function testCloseSession()
     {
+        $this->memcached
+            ->expects($this->once())
+            ->method('quit')
+            ->will($this->returnValue(true))
+        ;
+
         $this->assertTrue($this->storage->close());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function __construct(\Memcached $memcached, array $options = [])`
`62`	`62`	`*/`
`63`	`63`	`public function close()`
`64`	`64`	`{`
`65`		`- return true;`
	`65`	`+ return $this->memcached->quit();`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ public function testOpenSession()`
`63`	`63`
`64`	`64`	`public function testCloseSession()`
`65`	`65`	`{`
	`66`	`+ $this->memcached`
	`67`	`+ ->expects($this->once())`
	`68`	`+ ->method('quit')`
	`69`	`+ ->will($this->returnValue(true))`
	`70`	`+ ;`
	`71`	`+`
`66`	`72`	`$this->assertTrue($this->storage->close());`
`67`	`73`	`}`
`68`	`74`