minor #19281 [HttpKernel] Clarify deprecation of non-scalar values in surrogate fragment renderer (chalasr)

fabpot · fabpot · commit ab8c2c7e4588 · 2016-07-04T13:52:49.000+02:00
This PR was merged into the 3.1 branch. Discussion ---------- [HttpKernel] Clarify deprecation of non-scalar values in surrogate fragment renderer | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19262 | License | MIT | Doc PR | ~ Commits ------- b088978 [HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer
diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
@@ -95,9 +95,9 @@ FrameworkBundle
 HttpKernel
 ----------
 
- * Passing objects as URI attributes to the ESI and SSI renderers has been
+ * Passing non-scalar values as URI attributes to the ESI and SSI renderers has been
    deprecated and will be removed in Symfony 4.0. The inline fragment
-   renderer should be used with object attributes.
+   renderer should be used with non-scalar attributes.
 
  * The `ControllerResolver::getArguments()` method has been deprecated and will
    be removed in 4.0. If you have your own `ControllerResolverInterface`
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -84,9 +84,9 @@ FrameworkBundle
 HttpKernel
 ----------
 
- * Possibility to pass objects as URI attributes to the ESI and SSI renderers
-   has been removed. The inline fragment renderer should be used with object
-   attributes.
+ * Possibility to pass non-scalar values as URI attributes to the ESI and SSI
+   renderers has been removed. The inline fragment renderer should be used with
+   non-scalar attributes.
 
  * The `ControllerResolver::getArguments()` method has been removed. If you
    have your own `ControllerResolverInterface` implementation, you should
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -65,7 +65,7 @@ public function render($uri, Request $request, array $options = array())
     {
         if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
             if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) {
-                @trigger_error('Passing objects as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);
+                @trigger_error('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);
             }
 
             return $this->inlineStrategy->render($uri, $request, $options);

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function render($uri, Request $request, array $options = array())`
`65`	`65`	`{`
`66`	`66`	`if (!$this->surrogate \|\| !$this->surrogate->hasSurrogateCapability($request)) {`
`67`	`67`	`if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) {`
`68`		`- @trigger_error('Passing objects as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);`
	`68`	`+ @trigger_error('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated since version 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`return $this->inlineStrategy->render($uri, $request, $options);`