Skip to content

Commit 6ef18ca

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: chore: fix CS [Console] Fix division by 0 error [ErrorHandler] Fix error message with PHP 8.5 Update SendgridSmtpTransport.php add test covering associated entities referenced by their primary key Add an experimental CI job for PHP 8.5 Fix change log to mentioned thrown exception [FrameworkBundle] Make uri_signer lazy and improve error when kernel.secret is empty [HttpClient] Always set CURLOPT_CUSTOMREQUEST to the correct HTTP method in CurlHttpClient evaluate access flags for properties with asymmetric visibility [Mime] Fix wrong PHPDoc in `FormDataPart` constructor
2 parents e56da79 + 18cb4e0 commit 6ef18ca

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Command/AboutCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8686
['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
8787
['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
8888
['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
89-
['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && $xdebugMode !== 'off' ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
89+
['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
9090
];
9191

9292
$io->table([], $rows);

DependencyInjection/FrameworkExtension.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,17 @@ public function load(array $configs, ContainerBuilder $container): void
311311
}
312312
}
313313

314+
$emptySecretHint = '"framework.secret" option';
314315
if (isset($config['secret'])) {
315316
$container->setParameter('kernel.secret', $config['secret']);
317+
$usedEnvs = [];
318+
$container->resolveEnvPlaceholders($config['secret'], null, $usedEnvs);
319+
320+
if ($usedEnvs) {
321+
$emptySecretHint = \sprintf('"%s" env var%s', implode('", "', $usedEnvs), 1 === \count($usedEnvs) ? '' : 's');
322+
}
316323
}
317-
$container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the "framework.secret" option?');
324+
$container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the '.$emptySecretHint.'?');
318325

319326
$container->setParameter('kernel.http_method_override', $config['http_method_override']);
320327
$container->setParameter('kernel.trust_x_sendfile_type_header', $config['trust_x_sendfile_type_header']);

Resources/config/services.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
157157
->args([
158158
new Parameter('kernel.secret'),
159159
])
160+
->lazy()
160161
->alias(UriSigner::class, 'uri_signer')
161162

162163
->set('config_cache_factory', ResourceCheckerConfigCacheFactory::class)

0 commit comments

Comments
 (0)