bug #35161 [FrameworkBundle] Check non-null type for numeric type (Arman-Hosseini)

fabpot · fabpot · commit 51444877d169 · 2020-02-03T11:04:11.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Check non-null type for numeric type $maxAge and $sharedAge can both be zero | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no  | Deprecations? | no  | License | MIT Commits ------- 2797867 Check non-null type for numeric type
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -75,17 +75,17 @@ public function templateAction($template, $maxAge = null, $sharedAge = null, $pr
             throw new \LogicException('You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.');
         }
 
-        if ($maxAge) {
+        if (null !== $maxAge) {
             $response->setMaxAge($maxAge);
         }
 
-        if ($sharedAge) {
+        if (null !== $sharedAge) {
             $response->setSharedMaxAge($sharedAge);
         }
 
         if ($private) {
             $response->setPrivate();
-        } elseif (false === $private || (null === $private && ($maxAge || $sharedAge))) {
+        } elseif (false === $private || (null === $private && (null !== $maxAge || null !== $sharedAge))) {
             $response->setPublic();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -75,17 +75,17 @@ public function templateAction($template, $maxAge = null, $sharedAge = null, $pr`
`75`	`75`	`throw new \LogicException('You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.');`
`76`	`76`	`}`
`77`	`77`
`78`		`- if ($maxAge) {`
	`78`	`+ if (null !== $maxAge) {`
`79`	`79`	`$response->setMaxAge($maxAge);`
`80`	`80`	`}`
`81`	`81`
`82`		`- if ($sharedAge) {`
	`82`	`+ if (null !== $sharedAge) {`
`83`	`83`	`$response->setSharedMaxAge($sharedAge);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if ($private) {`
`87`	`87`	`$response->setPrivate();`
`88`		`- } elseif (false === $private \|\| (null === $private && ($maxAge \|\| $sharedAge))) {`
	`88`	`+ } elseif (false === $private \|\| (null === $private && (null !== $maxAge \|\| null !== $sharedAge))) {`
`89`	`89`	`$response->setPublic();`
`90`	`90`	`}`
`91`	`91`