Skip to content

Commit 26fb4c7

Browse files
bug symfony#25200 [HttpKernel] Arrays with scalar values passed to ESI fragment renderer throw deprecation notice (Simperfit)
This PR was merged into the 3.3 branch. Discussion ---------- [HttpKernel] Arrays with scalar values passed to ESI fragment renderer throw deprecation notice | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no | Deprecations? | no <!-- don't forget to update UPGRADE-*.md files --> | Tests pass? | yes | Fixed tickets | symfony#25191 | License | MIT | Doc PR | none Coding in the train to Paris ! ![img_2832](https://user-images.githubusercontent.com/3451634/33361971-8aa17a70-d4da-11e7-90a0-b2f08a60d0e6.JPG) Commits ------- d84b47f [HttpKernel] Arrays with scalar values passed to ESI fragment renderer throw deprecation notice
2 parents 8950aad + d84b47f commit 26fb4c7

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ private function generateSignedFragmentUri($uri, Request $request)
9898
private function containsNonScalars(array $values)
9999
{
100100
foreach ($values as $value) {
101-
if (is_array($value) && $this->containsNonScalars($value)) {
102-
return true;
101+
if (is_array($value)) {
102+
return $this->containsNonScalars($value);
103103
} elseif (!is_scalar($value) && null !== $value) {
104104
return true;
105105
}

src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,15 @@ public function testRenderFallbackWithObjectAttributesIsDeprecated()
3434
{
3535
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
3636
$request = Request::create('/');
37-
$reference = new ControllerReference('main_controller', array('foo' => array('a' => array(), 'b' => new \stdClass())), array());
37+
$reference = new ControllerReference('main_controller', array('foo' => new \stdClass()), array());
38+
$strategy->render($reference, $request);
39+
}
40+
41+
public function testRenderFallbackWithScalarIsNotDeprecated()
42+
{
43+
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
44+
$request = Request::create('/');
45+
$reference = new ControllerReference('main_controller', array('foo' => array(true)), array());
3846
$strategy->render($reference, $request);
3947
}
4048

0 commit comments

Comments
 (0)