8000 Merge branch '3.2' into 3.3 · symfony/symfony@a670b2b · GitHub
[go: up one dir, main page]
8000 Skip to content

Commit a670b2b

Browse files
fabpotfabpot
committed
Merge branch '3.2' into 3.3
* 3.2: [DebugBundle] Reword an outdated comment about var dumper wiring Ignore memcached missing key error on dession destroy bumped Symfony version to 3.2.14 updated VERSION for 3.2.13 updated CHANGELOG for 3.2.13
2 parents ac3ee2c + 3306986 commit a670b2b

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

‎CHANGELOG-3.2.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ in 3.2 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.2.0...v3.2.1
99

10+
* 3.2.13 (2017-08-01)
11+
12+
* bug #22244 [Console] Fix passing options with defaultCommand (Jakub Sacha)
13+
* bug #23684 [Debug] Missing escape in debug output (c960657)
14+
* bug #23654 [DI] Fix using private services in expressions (nicolas-grekas)
15+
* bug #23662 [VarDumper] Adapt to php 7.2 changes (nicolas-grekas)
16+
* bug #23649 [Form][TwigBridge] Don't render _method in form_rest() for a child form (fmarchalemisys)
17+
* bug #23023 [DoctrineBridge][PropertyInfo] Added support for Doctrine Embeddables (vudaltsov)
18+
* bug #23619 [Validator] Fix IbanValidator for ukrainian IBANs (paroe)
19+
* bug #23586 Fix case sensitive sameSite cookie (mikefrancis)
20+
* bug #23238 [Security] ensure the 'route' index is set before attempting to use it (gsdevme)
21+
* bug #23330 [WebProfilerBundle] Fix full sized dump hovering in toolbar (ogizanagi)
22+
* bug #23580 Fix login redirect when referer contains a query string (fabpot)
23+
* bug #23558 [FrameworkBundle] fix ValidatorCacheWarmer: use serializing ArrayAdapter (dmaicher)
24+
* bug #23574 [VarDumper] Move locale sniffing to dump() time (nicolas-grekas)
25+
1026
* 3.2.12 (2017-07-17)
1127

1228
* bug #23549 [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 (xabbuh)

‎src/Symfony/Bundle/DebugBundle/DebugBundle.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ public function boot()
2727
$container = $this->container;
2828

2929
// This code is here to lazy load the dump stack. This default
30-
// configuration for CLI mode is overridden in HTTP mode on
31-
// 'kernel.request' event
30+
// configuration is overridden in CLI mode on 'console.command' event.
31+
// The dump data collector is used by default, so dump output is sent to
32+
// the WDT. In a CLI context, if dump is used too soon, the data collector
33+
// will buffer it, and release it at the end of the script.
3234
VarDumper::setHandler(function ($var) use ($container) {
3335
$dumper = $container->get('data_collector.dump');
3436
$cloner = $container->get('var_dumper.cloner');

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ public function write($sessionId, $data)
9595
*/
9696
public function destroy($sessionId)
9797
{
98-
return $this->memcache->delete($this->prefix.$sessionId);
98+
$this->memcache->delete($this->prefix.$sessionId);
99+
100+
return true;
99101
}
100102

101103
/**

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ public function write($sessionId, $data)
101101
*/
102102
public function destroy($sessionId)
103103
{
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;
105107
}
106108

107109
/**

0 commit comments

Comments
 (0)
0