Commitc28441f

committed

[DI] Prepare dropping "strict" handling in loaders

1 parent9f95654 commitc28441fCopy full SHA for c28441f

File tree

-11

lines changed

src/Symfony/Component/DependencyInjection/Loader
- XmlFileLoader.php
- YamlFileLoader.php

-11

lines changed

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -387,13 +387,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)`
`387`	`387`	`$invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;`
`388`	`388`	`}`
`389`	`389`
`390`		`-if ($strict =$arg->getAttribute('strict')) {`
`391`		`-$strict = XmlUtils::phpize($strict);`
`392`		`- }else {`
`393`		`-$strict =true;`
`394`		`- }`
`395`		`-`
`396`		`-$arguments[$key] =newReference($arg->getAttribute('id'),$invalidBehavior,$strict);`
	`390`	`+$arguments[$key] =newReference($arg->getAttribute('id'),$invalidBehavior);`
`397`	`391`	`break;`
`398`	`392`	`case'expression':`
`399`	`393`	`$arguments[$key] =newExpression($arg->nodeValue);`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -471,14 +471,12 @@ private function resolveServices($value)`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`if ('=' ===substr($value, -1)) {`
	`474`	`+ @trigger_error(sprintf('The "=" suffix that used to disable strict mode in Symfony 2.x is deprecated since 3.3 and will be unsupported in 4.0. Remove it in "%s".',$value),E_USER_DEPRECATED);`
`474`	`475`	`$value =substr($value,0, -1);`
`475`		`-$strict =false;`
`476`		`- }else {`
`477`		`-$strict =true;`
`478`	`476`	`}`
`479`	`477`
`480`	`478`	`if (null !==$invalidBehavior) {`
`481`		`-$value =newReference($value,$invalidBehavior,$strict);`
	`479`	`+$value =newReference($value,$invalidBehavior);`
`482`	`480`	`}`
`483`	`481`	`}`
`484`	`482`

Comments

(0)