Skip to content

Commit f8edbc9

Browse files
Merge branch '5.4' into 6.0
* 5.4: [HttpClient] Remove deprecated usage of `GuzzleHttp\Promise\queue` [PropertyAccess] Fix handling of uninitialized property of anonymous class [FrameworkBundle] Allow default cache pools to be overwritten by user [DependencyInjection] fix test ResolveBindingsPass remove loading of class iterable [FrameworkBundle] Avoid calling rtrim(null, '/') in AssetsInstallCommand Optimization of resolveEnvPlaceholders Fix incorrect format [DependencyInjection] Fix nested env var with resolve processor Allow OutputFormatter::escape() to be used for escaping URLs used in <href> allow a zero time-limit Use correct tag for ExpoTransportFactory service [DependencyInjection] Ignore argument type check in CheckTypeDeclarationsPass if it's a Definition with a factory [Validators] Add translations for Slovak #43735
2 parents ef9fa59 + 2b25bce commit f8edbc9

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

Command/AssetsInstallCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
9494
{
9595
/** @var KernelInterface $kernel */
9696
$kernel = $this->getApplication()->getKernel();
97-
$targetArg = rtrim($input->getArgument('target'), '/');
98-
97+
$targetArg = rtrim($input->getArgument('target') ?? '', '/');
9998
if (!$targetArg) {
10099
$targetArg = $this->getPublicDirectory($kernel->getContainer());
101100
}

DependencyInjection/FrameworkExtension.php

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -330,34 +330,10 @@ public function load(array $configs, ContainerBuilder $container)
330330
}
331331
}
332332

333-
// register cache before session so both can share the connection services
334-
$this->registerCacheConfiguration($config['cache'], $container);
335-
336-
if ($this->isConfigEnabled($container, $config['session'])) {
337-
if (!\extension_loaded('session')) {
338-
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://php.net/session.installation for instructions.');
339-
}
340-
341-
$this->sessionConfigEnabled = true;
342-
$this->registerSessionConfiguration($config['session'], $container, $loader);
343-
if (!empty($config['test'])) {
344-
// test listener will replace the existing session listener
345-
// as we are aliasing to avoid duplicated registered events
346-
$container->setAlias('session_listener', 'test.session.listener');
347-
}
348-
} elseif (!empty($config['test'])) {
349-
$container->removeDefinition('test.session.listener');
350-
}
351-
352333
if ($this->isConfigEnabled($container, $config['request'])) {
353334
$this->registerRequestConfiguration($config['request'], $container, $loader);
354335
}
355336

356-
if (null === $config['csrf_protection']['enabled']) {
357-
$config['csrf_protection']['enabled'] = $this->sessionConfigEnabled && !class_exists(FullStack::class) && ContainerBuilder::willBeAvailable('symfony/security-csrf', CsrfTokenManagerInterface::class, ['symfony/framework-bundle']);
358-
}
359-
$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
360-
361337
if ($this->isConfigEnabled($container, $config['form'])) {
362338
if (!class_exists(Form::class)) {
363339
throw new LogicException('Form support cannot be enabled as the Form component is not installed. Try running "composer require symfony/form".');
@@ -488,6 +464,31 @@ public function load(array $configs, ContainerBuilder $container)
488464
$this->registerUidConfiguration($config['uid'], $container, $loader);
489465
}
490466

467+
// register cache before session so both can share the connection services
468+
$this->registerCacheConfiguration($config['cache'], $container);
469+
470+
if ($this->isConfigEnabled($container, $config['session'])) {
471+
if (!\extension_loaded('session')) {
472+
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://php.net/session.installation for instructions.');
473+
}
474+
475+
$this->sessionConfigEnabled = true;
476+
$this->registerSessionConfiguration($config['session'], $container, $loader);
477+
if (!empty($config['test'])) {
478+
// test listener will replace the existing session listener
479+
// as we are aliasing to avoid duplicated registered events
480+
$container->setAlias('session_listener', 'test.session.listener');
481+
}
482+
} elseif (!empty($config['test'])) {
483+
$container->removeDefinition('test.session.listener');
484+
}
485+
486+
// csrf depends on session being registered
487+
if (null === $config['csrf_protection']['enabled']) {
488+
$config['csrf_protection']['enabled'] = $this->sessionConfigEnabled && !class_exists(FullStack::class) && ContainerBuilder::willBeAvailable('symfony/security-csrf', CsrfTokenManagerInterface::class, ['symfony/framework-bundle']);
489+
}
490+
$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
491+
491492
$this->addAnnotatedClassesToCompile([
492493
'**\\Controller\\',
493494
'**\\Entity\\',

Resources/config/notifier_transports.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,6 @@
240240

241241
->set('notifier.transport_factory.expo', ExpoTransportFactory::class)
242242
->parent('notifier.transport_factory.abstract')
243-
->tag('chatter.transport_factory')
243+
->tag('texter.transport_factory')
244244
;
245245
};

0 commit comments

Comments
 (0)