composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +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

16
lib/symfony/framework-bundle/CacheWarmer/ValidatorCacheWarmer.php
View File

@@ -28,7 +28,7 @@ use Symfony\Component\Validator\ValidatorBuilder;
*/
class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
{
private $validatorBuilder;
private ValidatorBuilder $validatorBuilder;
/**
* @param string $phpArrayFile The PHP file where metadata are cached
@@ -40,14 +40,10 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
}
/**
* {@inheritdoc}
* @param string|null $buildDir
*/
protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , string $buildDir = null */): bool
{
if (!method_exists($this->validatorBuilder, 'getLoaders')) {
return false;
}
$loaders = $this->validatorBuilder->getLoaders();
$metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);
@@ -57,7 +53,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
if ($metadataFactory->hasMetadataFor($mappedClass)) {
$metadataFactory->getMetadataFor($mappedClass);
}
} catch (AnnotationException $e) {
} catch (AnnotationException) {
// ignore failing annotations
} catch (\Exception $e) {
$this->ignoreAutoloadException($mappedClass, $e);
@@ -71,10 +67,10 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
/**
* @return string[] A list of classes to preload on PHP 7.4+
*/
protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values)
protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array
{
// make sure we don't cache null values
$values = array_filter($values, function ($val) { return null !== $val; });
$values = array_filter($values, fn ($val) => null !== $val);
return parent::warmUpPhpArrayAdapter($phpArrayAdapter, $values);
}