Skip to content

Commit d5825b4

Browse files
committed
Merge branch '5.0'
* 5.0: [Phpunit] Fix running skipped tests expecting only deprecations Fix merge [Config] dont catch instances of Error [HttpClient] fix HttpClientDataCollector when handling canceled responses [FrameworkBundle] remove mention of the old Controller class [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 71bc3ea + 241bb88 commit d5825b4

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Controller/TemplateController.php

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

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

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

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@ public function load(array $configs, ContainerBuilder $container)
410410
->addTag('controller.argument_value_resolver');
411411
$container->registerForAutoconfiguration(AbstractController::class)
412412
->addTag('controller.service_arguments');
413-
$container->registerForAutoconfiguration('Symfony\Bundle\FrameworkBundle\Controller\Controller')
414-
->addTag('controller.service_arguments');
415413
$container->registerForAutoconfiguration(DataCollectorInterface::class)
416414
->addTag('data_collector');
417415
$container->registerForAutoconfiguration(FormTypeInterface::class)

0 commit comments

Comments
 (0)