feature #20938 [DI] Prepare dropping "strict" handling in loaders (nicolas-grekas)

fabpot · fabpot · commit 5a0157f928bd · 2016-12-26T18:57:20.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Prepare dropping "strict" handling in loaders | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - "strict" has been deprecated in 2.8, removed from 3.0, but loaders still read them (note that the XSD still mentions it for BC at XML level, but it has no effect.) We could also deprecate the attribute in XML, but I don't see the need since it's already ignored. In YAML, we need people to remove this trailing `=`, which is why the PR is on master with a deprecation. Commits ------- 243d160 [DI] Prepare dropping "strict" handling in loaders
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 references 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 references 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`