8000 Merge branch '3.1' · symfony/symfony@cbd1915 · GitHub
[go: up one dir, main page]
Skip to content

Commit cbd1915

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.1'
* 3.1: [VarDumper] Fix dumping jsons casted as arrays PassConfig::getMergePass is not an array Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)" [Serializer] Include the format in the cache key Fix the retrieval of the last username when using forwarding [Yaml] Fix PHPDoc of the Yaml class [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods Update getAbsoluteUri() for query string uris Conflicts: src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
2 parents 031b850 + 17de127 commit cbd1915

File tree

15 files changed

+220
-49
lines changed

15 files changed

+220
-49
lines changed

‎src/Symfony/Component/BrowserKit/Client.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ protected function getAbsoluteUri($uri)
542542
return parse_url($currentUri, PHP_URL_SCHEME).':'.$uri;
543543
}
544544

545-
// anchor?
546-
if (!$uri || '#' == $uri[0]) {
547-
return preg_replace('/#.*?$/', '', $currentUri).$uri;
545+
// anchor or query string parameters?
546+
if (!$uri || '#' == $uri[0] || '?' == $uri[0]) {
547+
return preg_replace('/[#?].*?$/', '', $currentUri).$uri;
548548
}
549549

550550
if ('/' !== $uri[0]) {

‎src/Symfony/Component/BrowserKit/Tests/ClientTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,15 @@ public function testRequestURIConversion()
212212
$client->request('GET', 'http://www.example.com/');
213213
$client->request('GET', 'http');
214214
$this->assertEquals('http://www.example.com/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
215+
216+
$client = new TestClient();
217+
$client->request('GET', 'http://www.example.com/foo');
218+
$client->request('GET', '?');
219+
$this->assertEquals('http://www.example.com/foo?', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
220+
$client->request('GET', '?');
221+
$this->assertEquals('http://www.example.com/foo?', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
222+
$client->request('GET', '?foo=bar');
223+
$this->assertEquals('http://www.example.com/foo?foo=bar', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
215224
}
216225

217226
public function testRequestReferer()

‎src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function getRemovingPasses()
166166
}
167167

168168
/**
169-
* Gets all passes for the Merge pass.
169+
* Gets the Merge pass.
170170
*
171171
* @return CompilerPassInterface
172172
*/

‎src/Symfony/Component/HttpFoundation/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ public function isMethod($method)
14791479
*/
14801480
public function isMethodSafe()
14811481
{
1482-
return in_array($this->getMethod(), array('GET', 'HEAD'));
1482+
return in_array($this->getMethod(), array('GET', 'HEAD', 'OPTIONS', 'TRACE'));
14831483
}
14841484

14851485
/**

‎src/Symfony/Component/HttpFoundation/Response.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,12 @@ public function send()
377377
$this->sendHeaders();
378378
$this->sendContent();
379379

380+
if (function_exists('fastcgi_finish_request')) {
381+
fastcgi_finish_request();
382+
} elseif ('cli' !== PHP_SAPI) {
383+
static::closeOutputBuffers(0, true);
384+
}
385+
380386
return $this;
381387
}
382388

‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,32 @@ public function methodIdempotentProvider()
19771977
array('CONNECT', false),
19781978
);
19791979
}
1980+
1981+
/**
1982+
* @dataProvider methodSafeProvider
1983+
*/
1984+
public function testMethodSafe($method, $safe)
1985+
{
1986+
$request = new Request();
1987+
$request->setMethod($method);
1988+
$this->assertEquals($safe, $request->isMethodSafe());
1989+
}
1990+
1991+
public function methodSafeProvider()
1992+
{
1993+
return array(
1994+
array('HEAD', true),
1995+
array('GET', true),
1996+
array('POST', false),
1997+
array('PUT', false),
1998+
array('PATCH', false),
1999+
array('DELETE', false),
2000+
array('PURGE', false),
2001+
array('OPTIONS', true),
2002+
array('TRACE', true),
2003+
array('CONNECT', false),
2004+
);
2005+
}
19802006
}
19812007

19822008
class RequestContentProxy extends Request

‎src/Symfony/Component/HttpKernel/Kernel.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,6 @@ public function terminate(Request $request, Response $response)
134134
}
135135

136136
if ($this->getHttpKernel() instanceof TerminableInterface) {
137-
if (!$this->debug) {
138-
if (function_exists('fastcgi_finish_request')) {
139-
fastcgi_finish_request();
140-
} elseif ('cli' !== PHP_SAPI) {
141-
Response::closeOutputBuffers(0, true);
142-
}
143-
}
144-
145137
$this->getHttpKernel()->terminate($request, $response);
146138
}
147139
}

‎src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ public function getLastAuthenticationError($clearSession = true)
6565
*/
6666
public function getLastUsername()
6767
{
68-
$session = $this->getRequest()->getSession();
68+
$request = $this->getRequest();
69+
70+
if ($request->attributes->has(Security::LAST_USERNAME)) {
71+
return $request->attributes->get(Security::LAST_USERNAME);
72+
}
73+
74+
$session = $request->getSession();
6975

7076
return null === $session ? '' : $session->get(Security::LAST_USERNAME);
7177
}

‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function supportsNormalization($data, $format = null)
5656
public function normalize($object, $format = null, array $context = array())
5757
{
5858
if (!isset($context['cache_key'])) {
59-
$context['cache_key'] = $this->getCacheKey($context);
59+
$context['cache_key'] = $this->getCacheKey($format, $context);
6060
}
6161

6262
if ($this->isCircularReference($object, $context)) {
@@ -169,7 +169,7 @@ public function supportsDenormalization($data, $type, $format = null)
169169
public function denormalize($data, $class, $format = null, array $context = array())
170170
{
171171
if (!isset($context['cache_key'])) {
172-
$context['cache_key'] = $this->getCacheKey($context);
172+
$context['cache_key'] = $this->getCacheKey($format, $context);
173173
}
174174
$allowedAttributes = $this->getAllowedAttributes($class, $context, true);
175175
$normalizedData = $this->prepareForDenormalization($data);
@@ -336,14 +336,15 @@ private function isMaxDepthReached($class, $attribute, array &$context)
336336
/**
337337
* Gets the cache key to use.
338338
*
339-
* @param array $context
339+
* @param string|null $format
340+
* @param array $context
340341
*
341342
* @return bool|string
342343
*/
343-
private function getCacheKey(array $context)
344+
private function getCacheKey($format, array $context)
344345
{
345346
try {
346-
return md5(serialize($context));
347+
return md5($format.serialize($context));
347348
} catch (\Exception $exception) {
348349
// The context cannot be serialized, skip the cache
349350
return false;

‎src/Symfony/Component/VarDumper/Caster/Caster.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@ public static function castObject($obj, \ReflectionClass $reflector)
4545
{
4646
if ($reflector->hasMethod('__debugInfo')) {
4747
$a = $obj->__debugInfo();
48+
} elseif ($obj instanceof \Closure) {
49+
$a = array();
4850
} else {
4951
$a = (array) $obj;
5052
}
5153

5254
if ($a) {
5355
$p = array_keys($a);
5456
foreach ($p as $i => $k) {
55-
if (!isset($k[0]) || ("\0" !== $k[0] && !$reflector->hasProperty($k))) {
57+
if (isset($k[0]) && "\0" !== $k[0] && !$reflector->hasProperty($k)) {
5658
$p[$i] = self::PREFIX_DYNAMIC.$k;
5759
} elseif (isset($k[16]) && "\0" === $k[16] && 0 === strpos($k, "\0class@anonymous\0")) {
5860
$p[$i] = "\0".$reflector->getParentClass().'@anonymous'.strrchr($k, "\0");

‎src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested)
5858
}
5959

6060
$prefix = Caster::PREFIX_DYNAMIC;
61-
unset($a['name'], $a[$prefix.'0'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
61+
unset($a['name'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
6262

6363
return $a;
6464
}

‎src/Symfony/Component/VarDumper/Cloner/VarCloner.php

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected function doClone($var)
2828
$i = 0; // Current iteration position in $queue
2929
$len = 1; // Length of $queue
3030
$pos = 0; // Number of cloned items past the first level
31-
$refs = 0; // Hard references counter
31+
$refsCounter = 0; // Hard references counter
3232
$queue = array(array($var)); // This breadth-first queue is the return value
3333
$arrayRefs = array(); // Map of queue indexes to stub array objects
3434
$hardRefs = array(); // Map of original zval hashes to stub objects
@@ -60,27 +60,32 @@ protected function doClone($var)
6060
for ($i = 0; $i < $len; ++$i) {
6161
$indexed = true; // Whether the currently iterated array is numerically indexed or not
6262
$j = -1; // Position in the currently iterated array
63-
$step = $queue[$i]; // Copy of the currently iterated array used for hard references detection
64-
foreach ($step as $k => $v) {
63+
$fromObjCast = array_keys($queue[$i]);
64+
$fromObjCast = array_keys(array_flip($fromObjCast)) !== $fromObjCast;
65+
$refs = $vals = $fromObjCast ? array_values($queue[$i]) : $queue[$i];
66+
foreach ($queue[$i] as $k => $v) {
6567
// $k is the original key
6668
// $v is the original value or a stub object in case of hard references
67-
if ($indexed && $k !== ++$j) {
69+
if ($k !== ++$j) {
6870
$indexed = false;
6971
}
72+
if ($fromObjCast) {
73+
$k = $j;
74+
}
7075
if ($useExt) {
71-
$zval = symfony_zval_info($k, $step);
76+
$zval = symfony_zval_info($k, $refs);
7277
} else {
73-
$step[$k] = $cookie;
74-
if ($zval['zval_isref'] = $queue[$i][$k] === $cookie) {
78+
$refs[$k] = $cookie;
79+
if ($zval['zval_isref'] = $vals[$k] === $cookie) {
7580
$zval['zval_hash'] = $v instanceof Stub ? spl_object_hash($v) : null;
7681
}
7782
$zval['type'] = gettype($v);
7883
}
7984
if ($zval['zval_isref']) {
80-
$queue[$i][$k] = &$stub; // Break hard references to make $queue completely
85+
$vals[$k] = &$stub; // Break hard references to make $queue completely
8186
unset($stub); // independent from the original structure
8287
if (isset($hardRefs[$zval['zval_hash']])) {
83-
$queue[$i][$k] = $useExt ? ($v = $hardRefs[$zval['zval_hash']]) : ($step[$k] = $v);
88+
$vals[$k] = $useExt ? ($v = $hardRefs[$zval['zval_hash']]) : ($refs[$k] = $v) 10000 ;
8489
if ($v->value instanceof Stub && (Stub::TYPE_OBJECT === $v->value->type || Stub::TYPE_RESOURCE === $v->value->type)) {
8590
++$v->value->refCount;
8691
}
@@ -204,18 +209,18 @@ protected function doClone($var)
204209
if (isset($stub)) {
205210
if ($zval['zval_isref']) {
206211
if ($useExt) {
207-
$queue[$i][$k] = $hardRefs[$zval['zval_hash']] = $v = new Stub();
212+
$vals[$k] = $hardRefs[$zval['zval_hash']] = $v = new Stub();
208213
$v->value = $stub;
209214
} else {
210-
$step[$k] = new Stub();
211-
$step[$k]->value = $stub;
212-
$h = spl_object_hash($step[$k]);
213-
$queue[$i][$k] = $hardRefs[$h] = &$step[$k];
215+
$refs[$k] = new Stub();
216+
$refs[$k]->value = $stub;
217+
$h = spl_object_hash($refs[$k]);
218+
$vals[$k] = $hardRefs[$h] = &$refs[$k];
214219
$values[$h] = $v;
215220
}
216-
$queue[$i][$k]->handle = ++$refs;
221+
$vals[$k]->handle = ++$refsCounter;
217222
} else {
218-
$queue[$i][$k] = $stub;
223+
$vals[$k] = $stub;
219224
}
220225

221226
if ($a) {
@@ -243,19 +248,38 @@ protected function doClone($var)
243248
$stub = $a = null;
244249
} elseif ($zval['zval_isref']) {
245250
if ($useExt) {
246-
$queue[$i][$k] = $hardRefs[$zval['zval_hash']] = new Stub();
247-
$queue[$i][$k]->value = $v;
251+
$vals[$k] = $hardRefs[$zval['zval_hash']] = new Stub();
252+
$vals[$k]->value = $v;
248253
} else {
249-
$step[$k] = $queue[$i][$k] = new Stub();
250-
$step[$k]->value = $v;
251-
$h = spl_object_hash($step[$k]);
252-
$hardRefs[$h] = &$step[$k];
254+
$refs[$k] = $vals[$k] = new Stub();
255+
$refs[$k]->value = $v;
256+
$h = spl_object_hash($refs[$k]);
257+
$hardRefs[$h] = &$refs[$k];
253258
$values[$h] = $v;
254259
}
255-
$queue[$i][$k]->handle = ++$refs;
260+
$vals[$k]->handle = ++$refsCounter;
261+
}
262+
}
263+
264+
if ($fromObjCast) {
265+
$refs = $vals;
266+
$vals = array();
267+
$j = -1;
268+
foreach ($queue[$i] as $k => $v) {
269+
foreach (array($k => $v) as $a => $v) {
270+
}
271+
if ($a !== $k) {
272+
$vals = (object) $vals;
273+
$vals->{$k} = $refs[++$j];
274+
$vals = (array) $vals;
275+
} else {
276+
$vals[$k] = $refs[++$j];
277+
}
256278
}
257279
}
258280

281+
$queue[$i] = $vals;
282+
259283
if (isset($arrayRefs[$i])) {
260284
if ($indexed) {
261285
$arrayRefs[$i]->class = Stub::ARRAY_INDEXED;

‎src/Symfony/Component/VarDumper/Tests/CliDumperTest.php

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,45 @@ public function testXmlResource()
128128
);
129129
}
130130

131+
public function testJsonCast()
132+
{
133+
$var = (array) json_decode('{"0":{},"1":null}');
134+
foreach ($var as &$v) {
135+
}
136+
$var[] = &$v;
137+
$var[''] = 2;
138+
139+
$this->assertDumpMatchesFormat(
140+
<<<EOTXT
141+
array:4 [
142+
"0" => {}
143+
"1" => &1 null
144+
0 => &1 null
145+
"" => 2
146+
]
147+
EOTXT
148+
,
149+
$var
150+
);
151+
}
152+
153+
public function testObjectCast()
154+
{
155+
$var = (object) array(1 => 1);
156+
$var->{1} = 2;
157+
158+
$this->assertDumpMatchesFormat(
159+
<<<EOTXT
160+
{
161+
+1: 1
162+
+"1": 2
163+
}
164+
EOTXT
165+
,
166+
$var
167+
);
168+
}
169+
131170
public function testClosedResource()
132171
{
133172
if (defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {

0 commit comments

Comments
 (0)
0