fixed CS

fabpot · fabpot · commit aee033699bd3 · 2012-12-06T09:58:41.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -24,29 +24,32 @@ class TemplateController extends ContainerAware
     /**
      * Renders a template.
      *
-     * @param string $template The template name
-     * @param int|null $maxAge Max age for client caching
-     * @param int|null $sharedAge Max age for shared (proxy) caching
-     * @param Boolean|null $private Whether or not caching should apply for client caches only
+     * @param string       $template  The template name
+     * @param int|null     $maxAge    Max age for client caching
+     * @param int|null     $sharedAge Max age for shared (proxy) caching
+     * @param Boolean|null $private   Whether or not caching should apply for client caches only
      *
      * @return Response A Response instance
      */
     public function templateAction($template, $maxAge = null, $sharedAge = null, $private = null)
     {
         /** @var $response \Symfony\Component\HttpFoundation\Response */
         $response = $this->container->get('templating')->renderResponse($template);
+
         if ($maxAge) {
             $response->setMaxAge($maxAge);
         }
+
         if ($sharedAge) {
             $response->setSharedMaxAge($sharedAge);
         }
 
         if ($private) {
             $response->setPrivate();
-        } else if ($private === false  || (is_null($private) && ($maxAge || $sharedAge))) {
+        } elseif ($private === false || (null === $private && ($maxAge || $sharedAge))) {
             $response->setPublic($private);
         }
+
         return $response;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,29 +24,32 @@ class TemplateController extends ContainerAware`
`24`	`24`	`/**`
`25`	`25`	`* Renders a template.`
`26`	`26`	`*`
`27`		`- * @param string $template The template name`
`28`		`- * @param int\|null $maxAge Max age for client caching`
`29`		`- * @param int\|null $sharedAge Max age for shared (proxy) caching`
`30`		`- * @param Boolean\|null $private Whether or not caching should apply for client caches only`
	`27`	`+ * @param string $template The template name`
	`28`	`+ * @param int\|null $maxAge Max age for client caching`
	`29`	`+ * @param int\|null $sharedAge Max age for shared (proxy) caching`
	`30`	`+ * @param Boolean\|null $private Whether or not caching should apply for client caches only`
`31`	`31`	`*`
`32`	`32`	`* @return Response A Response instance`
`33`	`33`	`*/`
`34`	`34`	`public function templateAction($template, $maxAge = null, $sharedAge = null, $private = null)`
`35`	`35`	`{`
`36`	`36`	`/** @var $response \Symfony\Component\HttpFoundation\Response */`
`37`	`37`	`$response = $this->container->get('templating')->renderResponse($template);`
	`38`	`+`
`38`	`39`	`if ($maxAge) {`
`39`	`40`	`$response->setMaxAge($maxAge);`
`40`	`41`	`}`
	`42`	`+`
`41`	`43`	`if ($sharedAge) {`
`42`	`44`	`$response->setSharedMaxAge($sharedAge);`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`if ($private) {`
`46`	`48`	`$response->setPrivate();`
`47`		`- } else if ($private === false \|\| (is_null($private) && ($maxAge \|\| $sharedAge))) {`
	`49`	`+ } elseif ($private === false \|\| (null === $private && ($maxAge \|\| $sharedAge))) {`
`48`	`50`	`$response->setPublic($private);`
`49`	`51`	`}`
	`52`	`+`
`50`	`53`	`return $response;`
`51`	`54`	`}`
`52`	`55`	`}`