Merge branch '2.7' into 2.8

fabpot · fabpot · commit 18e5e70afec3 · 2017-08-10T09:04:10.000+02:00
* 2.7:
  [DebugBundle] Reword an outdated comment about var dumper wiring
  Ignore memcached missing key error on dession destroy
diff --git a/src/Symfony/Bundle/DebugBundle/DebugBundle.php b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
@@ -27,8 +27,10 @@ public function boot()
             $container = $this->container;
 
             // This code is here to lazy load the dump stack. This default
-            // configuration for CLI mode is overridden in HTTP mode on
-            // 'kernel.request' event
+            // configuration is overridden in CLI mode on 'console.command' event.
+            // The dump data collector is used by default, so dump output is sent to
+            // the WDT. In a CLI context, if dump is used too soon, the data collector
+            // will buffer it, and release it at the end of the script.
             VarDumper::setHandler(function ($var) use ($container) {
                 $dumper = $container->get('data_collector.dump');
                 $cloner = $container->get('var_dumper.cloner');
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -95,7 +95,9 @@ public function write($sessionId, $data)
      */
     public function destroy($sessionId)
     {
-        return $this->memcache->delete($this->prefix.$sessionId);
+        $this->memcache->delete($this->prefix.$sessionId);
+
+        return true;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -101,7 +101,9 @@ public function write($sessionId, $data)
      */
     public function destroy($sessionId)
     {
-        return $this->memcached->delete($this->prefix.$sessionId);
+        $result = $this->memcached->delete($this->prefix.$sessionId);
+
+        return $result || $this->memcached->getResultCode() == \Memcached::RES_NOTFOUND;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,9 @@ public function write($sessionId, $data)`
`95`	`95`	`*/`
`96`	`96`	`public function destroy($sessionId)`
`97`	`97`	`{`
`98`		`- return $this->memcache->delete($this->prefix.$sessionId);`
	`98`	`+ $this->memcache->delete($this->prefix.$sessionId);`
	`99`	`+`
	`100`	`+ return true;`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,9 @@ public function write($sessionId, $data)`
`101`	`101`	`*/`
`102`	`102`	`public function destroy($sessionId)`
`103`	`103`	`{`
`104`		`- return $this->memcached->delete($this->prefix.$sessionId);`
	`104`	`+ $result = $this->memcached->delete($this->prefix.$sessionId);`
	`105`	`+`
	`106`	`+ return $result \|\| $this->memcached->getResultCode() == \Memcached::RES_NOTFOUND;`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`/**`