Skip to content

Commit 241bb88

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: [Phpunit] Fix running skipped tests expecting only deprecations Fix merge [Config] dont catch instances of Error [HttpClient] fix HttpClientDataCollector when handling canceled responses [DependencyInjection] #35505 Fix typo in test name [Yaml][Inline] Fail properly on empty object tag and empty const tag Check non-null type for numeric type Check value isset to avoid PHP notice bug symfony#28179 [DomCrawler] Skip disabled fields processing in Form
2 parents 242be84 + 3dedffa commit 241bb88

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Controller/TemplateController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public function templateAction(string $template, int $maxAge = null, int $shared
5050
$response->setMaxAge($maxAge);
5151
}
5252

53-
if ($sharedAge) {
53+
if (null !== $sharedAge) {
5454
$response->setSharedMaxAge($sharedAge);
5555
}
5656

5757
if ($private) {
5858
$response->setPrivate();
59-
} elseif (false === $private || (null === $private && ($maxAge || $sharedAge))) {
59+
} elseif (false === $private || (null === $private && (null !== $maxAge || null !== $sharedAge))) {
6060
$response->setPublic();
6161
}
6262

0 commit comments

Comments
 (0)