From 4155d1d9df8f7757304b502a2f0adfbd8fc2ccf3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 4 Dec 2024 11:03:46 +0100
Subject: [PATCH 1/4] [FrameworkBundle] Make uri_signer lazy and improve error
 when kernel.secret is empty

---
 DependencyInjection/FrameworkExtension.php | 9 ++++++++-
 Resources/config/services.php              | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
index 26cae1f30..8e19697f7 100644
--- a/DependencyInjection/FrameworkExtension.php
+++ b/DependencyInjection/FrameworkExtension.php
@@ -310,10 +310,17 @@ public function load(array $configs, ContainerBuilder $container): void
             }
         }
 
+        $emptySecretHint = '"framework.secret" option';
         if (isset($config['secret'])) {
             $container->setParameter('kernel.secret', $config['secret']);
+            $usedEnvs = [];
+            $container->resolveEnvPlaceholders($config['secret'], null, $usedEnvs);
+
+            if ($usedEnvs) {
+                $emptySecretHint = \sprintf('"%s" env var%s', implode('", "', $usedEnvs), 1 === \count($usedEnvs) ? '' : 's');
+            }
         }
-        $container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the "framework.secret" option?');
+        $container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the '.$emptySecretHint.'?');
 
         $container->setParameter('kernel.http_method_override', $config['http_method_override']);
         $container->setParameter('kernel.trust_x_sendfile_type_header', $config['trust_x_sendfile_type_header']);
diff --git a/Resources/config/services.php b/Resources/config/services.php
index 53856f356..6abe1b6d8 100644
--- a/Resources/config/services.php
+++ b/Resources/config/services.php
@@ -157,6 +157,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
             ->args([
                 new Parameter('kernel.secret'),
             ])
+            ->lazy()
         ->alias(UriSigner::class, 'uri_signer')
 
         ->set('config_cache_factory', ResourceCheckerConfigCacheFactory::class)

From bda64b23c5a42f5054ae6b619e9bce4a08ca9057 Mon Sep 17 00:00:00 2001
From: Dariusz Ruminski <dariusz.ruminski@gmail.com>
Date: Thu, 5 Dec 2024 00:17:16 +0100
Subject: [PATCH 2/4] chore: fix CS

---
 Command/AboutCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Command/AboutCommand.php b/Command/AboutCommand.php
index f4281cd21..4dc86130a 100644
--- a/Command/AboutCommand.php
+++ b/Command/AboutCommand.php
@@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
             ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
             ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
-            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && $xdebugMode !== 'off' ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
+            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
         ];
 
         $io->table([], $rows);

From b7716f1973bd0da6ae4c6cae694ee1e318ddda0f Mon Sep 17 00:00:00 2001
From: raphael-geffroy <raphael@geffroy.dev>
Date: Sat, 7 Dec 2024 12:28:46 +0100
Subject: [PATCH 3/4] fix: notifier push channel bus abstract arg

---
 DependencyInjection/FrameworkExtension.php | 2 +-
 Resources/config/notifier.php              | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
index 83518061f..36984e739 100644
--- a/DependencyInjection/FrameworkExtension.php
+++ b/DependencyInjection/FrameworkExtension.php
@@ -2765,7 +2765,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.channel.email');
         }
 
-        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {
             if (!$container->hasDefinition($serviceId)) {
                 continue;
             }
diff --git a/Resources/config/notifier.php b/Resources/config/notifier.php
index 6ce674148..bcc124820 100644
--- a/Resources/config/notifier.php
+++ b/Resources/config/notifier.php
@@ -73,7 +73,10 @@
             ->tag('notifier.channel', ['channel' => 'email'])
 
         ->set('notifier.channel.push', PushChannel::class)
-            ->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('texter.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'push'])
 
         ->set('notifier.monolog_handler', NotifierHandler::class)

From 1c630f4697c9bd87b342e8090cc9022071af4d77 Mon Sep 17 00:00:00 2001
From: raphael-geffroy <raphael@geffroy.dev>
Date: Sat, 7 Dec 2024 12:21:53 +0100
Subject: [PATCH 4/4] fix: notifier channel bus abstract arg

---
 DependencyInjection/FrameworkExtension.php | 2 +-
 Resources/config/notifier.php              | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
index 9ddf89ac1..a6d595603 100644
--- a/DependencyInjection/FrameworkExtension.php
+++ b/DependencyInjection/FrameworkExtension.php
@@ -2784,7 +2784,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.channel.email');
         }
 
-        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push', 'notifier.channel.desktop'] as $serviceId) {
             if (!$container->hasDefinition($serviceId)) {
                 continue;
             }
diff --git a/Resources/config/notifier.php b/Resources/config/notifier.php
index 71a3cd1fd..28900ad10 100644
--- a/Resources/config/notifier.php
+++ b/Resources/config/notifier.php
@@ -82,7 +82,10 @@
             ->tag('notifier.channel', ['channel' => 'push'])
 
         ->set('notifier.channel.desktop', DesktopChannel::class)
-            ->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('texter.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'desktop'])
 
         ->set('notifier.monolog_handler', NotifierHandler::class)

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/symfony/framework-bundle/compare/symfony:a8d0da4...symfony:1c630f4.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/symfony/framework-bundle/compare/symfony:a8d0da4...symfony:1c630f4.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/symfony/framework-bundle/compare/symfony:a8d0da4...symfony:1c630f4.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/symfony/framework-bundle/compare/symfony:a8d0da4...symfony:1c630f4.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>