minor #18575 Fixed a redundant check in DefaultValueResolver (iltar)

fabpot · fabpot · commit 321fd382bdb7 · 2016-04-28T13:04:44.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- Fixed a redundant check in DefaultValueResolver | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ In #18308 I have introduced a `DefaultValueResolver`. When writing documentation, I was planning on adding the code as an example and I noticed it did a check in the request attributes. A default value value should always be injected, whether the request has it or not. In case the request _does_ have the value, it would've already been added and thus never reach the default resolver. Thus as this is never called in the default and configured flows and should not change the default value behavior, I'm removing this. Commits ------- e54c1a6 Fixed a redundant check in DefaultValueResolver
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php
@@ -27,7 +27,7 @@ final class DefaultValueResolver implements ArgumentValueResolverInterface
      */
     public function supports(Request $request, ArgumentMetadata $argument)
     {
-        return $argument->hasDefaultValue() && !$request->attributes->has($argument->getName());
+        return $argument->hasDefaultValue();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ final class DefaultValueResolver implements ArgumentValueResolverInterface`
`27`	`27`	`*/`
`28`	`28`	`public function supports(Request $request, ArgumentMetadata $argument)`
`29`	`29`	`{`
`30`		`- return $argument->hasDefaultValue() && !$request->attributes->has($argument->getName());`
	`30`	`+ return $argument->hasDefaultValue();`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`