Merge branch '5.4' into 6.3

* 5.4:
  [WebProfilerBundle] Fix JS error when evaluating scripts
  don't fail when optional dependencies are not present
  fix syntax error on PHP 7.2

Author: xabbuh

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -2812,8 +2812,8 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
         if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
             $container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
                 ->replaceArgument('$registry', new Reference(HubRegistry::class))
-                ->replaceArgument('$client', new Reference('http_client'))
-                ->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
+                ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
         } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
             $container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
         }
@@ -2822,16 +2822,16 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
                 ->replaceArgument('$mailer', new Reference('mailer'))
                 ->replaceArgument('$logger', new Reference('logger'))
-                ->replaceArgument('$client', new Reference('http_client'))
-                ->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
+                ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
         }
 
         if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
             $container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
                 ->replaceArgument('$mailer', new Reference('mailer'))
                 ->replaceArgument('$logger', new Reference('logger'))
-                ->replaceArgument('$client', new Reference('http_client'))
-                ->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
+                ->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
+                ->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
         }
 
         if (isset($config['admin_recipients'])) {

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig

@@ -565,7 +565,9 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
                         /* Evaluate in global scope scripts embedded inside the toolbar */
                         var i, scripts = [].slice.call(el.querySelectorAll('script'));
                         for (i = 0; i < scripts.length; ++i) {
-                            eval.call({}, scripts[i].firstChild.nodeValue);
+                            if (scripts[i].firstChild) {
+                                eval.call({}, scripts[i].firstChild.nodeValue);
+                            }
                         }
 
                         el.style.display = -1 !== xhr.responseText.indexOf('sf-toolbarreset') ? 'block' : 'none';

src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php

@@ -450,7 +450,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex
                 sprintf('Failed to create object because the class "%s" is not instantiable.', $class),
                 $data,
                 ['unknown'],
-                $context['deserialization_path'] ?? null,
+                $context['deserialization_path'] ?? null
             );
         }