Commitb088978

committed

[HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer

Update UPGRADE-3.1 tooUse non-scalar values as deperecated typeUpdate UPGRADE-4.0 too

1 parent95c60c8 commitb088978Copy full SHA for b088978

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ FrameworkBundle`
`95`	`95`	`HttpKernel`
`96`	`96`	`----------`
`97`	`97`
`98`		`-* Passingobjects as URI attributes to the ESI and SSI renderers has been`
	`98`	`+* Passingnon-scalar values as URI attributes to the ESI and SSI renderers has been`
`99`	`99`	`deprecated and will be removed in Symfony 4.0. The inline fragment`
`100`		`- renderer should be used withobject attributes.`
	`100`	`+ renderer should be used withnon-scalar attributes.`
`101`	`101`
`102`	`102`	* The`ControllerResolver::getArguments()` method has been deprecated and will
`103`	`103`	be removed in 4.0. If you have your own`ControllerResolverInterface`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ FrameworkBundle`
`84`	`84`	`HttpKernel`
`85`	`85`	`----------`
`86`	`86`
`87`		`-* Possibility to passobjectsas URI attributes to the ESI and SSI renderers`
`88`		`- has been removed. The inline fragment renderer should be used with object`
`89`		`- attributes.`
	`87`	`+* Possibility to passnon-scalar valuesas URI attributes to the ESI and SSI`
	`88`	`+renderershas been removed. The inline fragment renderer should be used with`
	`89`	`+non-scalarattributes.`
`90`	`90`
`91`	`91`	* The`ControllerResolver::getArguments()` method has been removed. If you
`92`	`92`	have your own`ControllerResolverInterface` implementation, you should

Lines changed: 1 addition & 1 deletion

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 ($uriinstanceof ControllerReference &&$this->containsNonScalars($uri->attributes)) {`
`68`		`- @trigger_error('Passingobjects 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('Passingnon-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);`

Comments

(0)