composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)

Browse Source 
* Update Symfony lib to version ~6.4.0
* Update code missing return type
* Add an iTop general configuration entry to store application secret (Symfony mandatory parameter)
* Use dependency injection in ExceptionListener & UserProvider classes
This commit is contained in:
bdalsass
2023-12-05 13:56:56 +01:00
committed by GitHub
parent 863ab4560c
commit 27ce51ab07
1392 changed files with 44869 additions and 27799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/symfony/framework-bundle/CacheWarmer/ConfigBuilderCacheWarmer.php
View File

@@ -28,8 +28,8 @@ use Symfony\Component\HttpKernel\KernelInterface;
*/
class ConfigBuilderCacheWarmer implements CacheWarmerInterface
{
private $kernel;
private $logger;
private KernelInterface $kernel;
private ?LoggerInterface $logger;
public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)
{
@@ -38,13 +38,17 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
}
/**
* {@inheritdoc}
*
* @return string[]
* @param string|null $buildDir
*/
public function warmUp(string $cacheDir)
public function warmUp(string $cacheDir /* , string $buildDir = null */): array
{
$generator = new ConfigBuilderGenerator($cacheDir);
$buildDir = 1 < \func_num_args() ? func_get_arg(1) : null;
if (!$buildDir) {
return [];
}
$generator = new ConfigBuilderGenerator($buildDir);
foreach ($this->kernel->getBundles() as $bundle) {
$extension = $bundle->getContainerExtension();
@@ -55,9 +59,7 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
try {
$this->dumpExtension($extension, $generator);
} catch (\Exception $e) {
if ($this->logger) {
$this->logger->warning('Failed to generate ConfigBuilder for extension {extensionClass}.', ['exception' => $e, 'extensionClass' => \get_class($extension)]);
}
$this->logger?->warning('Failed to generate ConfigBuilder for extension {extensionClass}: '.$e->getMessage(), ['exception' => $e, 'extensionClass' => $extension::class]);
}
}
@@ -81,10 +83,7 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
$generator->build($configuration);
}
/**
* {@inheritdoc}
*/
public function isOptional()
public function isOptional(): bool
{
return true;
}