Merge pull request #648 from entering/param-fetcher-listener-change-operator-and

stof · stof · commit e45dcbaecd50 · 2013-12-30T04:30:30.000-08:00
At Param fetch listener replace the and operator use with &amp;&amp;
diff --git a/EventListener/ParamFetcherListener.php b/EventListener/ParamFetcherListener.php
@@ -59,7 +59,7 @@ public function onKernelController(FilterControllerEvent $event)
         if ($this->setParamsAsAttributes) {
             $params = $paramFetcher->all();
             foreach ($params as $name => $param) {
-                if ($request->attributes->has($name) and null !== $request->attributes->get($name)) {
+                if ($request->attributes->has($name) && null !== $request->attributes->get($name)) {
                     $msg = sprintf("ParamFetcher parameter conflicts with a path parameter '$name' for route '%s'", $request->attributes->get('_route'));
                     throw new \InvalidArgumentException($msg);
                 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function onKernelController(FilterControllerEvent $event)`
`59`	`59`	`if ($this->setParamsAsAttributes) {`
`60`	`60`	`$params = $paramFetcher->all();`
`61`	`61`	`foreach ($params as $name => $param) {`
`62`		`- if ($request->attributes->has($name) and null !== $request->attributes->get($name)) {`
	`62`	`+ if ($request->attributes->has($name) && null !== $request->attributes->get($name)) {`
`63`	`63`	`$msg = sprintf("ParamFetcher parameter conflicts with a path parameter '$name' for route '%s'", $request->attributes->get('_route'));`
`64`	`64`	`throw new \InvalidArgumentException($msg);`
`65`	`65`	`}`