[DI] Prepare dropping "strict" handling in loaders

nicolas-grekas · nicolas-grekas · commit c28441f99e2a · 2016-12-15T16:56:18.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -387,13 +387,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
                         $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
                     }
 
-                    if ($strict = $arg->getAttribute('strict')) {
-                        $strict = XmlUtils::phpize($strict);
-                    } else {
-                        $strict = true;
-                    }
-
-                    $arguments[$key] = new Reference($arg->getAttribute('id'), $invalidBehavior, $strict);
+                    $arguments[$key] = new Reference($arg->getAttribute('id'), $invalidBehavior);
                     break;
                 case 'expression':
                     $arguments[$key] = new Expression($arg->nodeValue);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -471,14 +471,12 @@ private function resolveServices($value)
             }
 
             if ('=' === substr($value, -1)) {
+                @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);
                 $value = substr($value, 0, -1);
-                $strict = false;
-            } else {
-                $strict = true;
             }
 
             if (null !== $invalidBehavior) {
-                $value = new Reference($value, $invalidBehavior, $strict);
+                $value = new Reference($value, $invalidBehavior);
             }
         }
 

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 = new Reference($value, $invalidBehavior, $strict);`
	`479`	`+ $value = new Reference($value, $invalidBehavior);`
`482`	`480`	`}`
`483`	`481`	`}`
`484`	`482`