composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 15:34:12 +01: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

31
lib/symfony/framework-bundle/HttpCache/HttpCache.php
View File

@@ -30,14 +30,14 @@ class HttpCache extends BaseHttpCache
protected $cacheDir;
protected $kernel;
private $store;
private $surrogate;
private $options;
private ?StoreInterface $store = null;
private ?SurrogateInterface $surrogate;
private array $options;
/**
* @param string|StoreInterface $cache The cache directory (default used if null) or the storage instance
* @param $cache The cache directory (default used if null) or the storage instance
*/
public function __construct(KernelInterface $kernel, $cache = null, SurrogateInterface $surrogate = null, array $options = null)
public function __construct(KernelInterface $kernel, string|StoreInterface $cache = null, SurrogateInterface $surrogate = null, array $options = null)
{
$this->kernel = $kernel;
$this->surrogate = $surrogate;
@@ -45,8 +45,6 @@ class HttpCache extends BaseHttpCache
if ($cache instanceof StoreInterface) {
$this->store = $cache;
} elseif (null !== $cache && !\is_string($cache)) {
throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be a string or a SurrogateInterface, "%s" given.', __METHOD__, get_debug_type($cache)));
} else {
$this->cacheDir = $cache;
}
@@ -62,10 +60,7 @@ class HttpCache extends BaseHttpCache
parent::__construct($kernel, $this->createStore(), $this->createSurrogate(), array_merge($this->options, $this->getOptions()));
}
/**
* {@inheritdoc}
*/
protected function forward(Request $request, bool $catch = false, Response $entry = null)
protected function forward(Request $request, bool $catch = false, Response $entry = null): Response
{
$this->getKernel()->boot();
$this->getKernel()->getContainer()->set('cache', $this);
@@ -75,26 +70,18 @@ class HttpCache extends BaseHttpCache
/**
* Returns an array of options to customize the Cache configuration.
*
* @return array
*/
protected function getOptions()
protected function getOptions(): array
{
return [];
}
/**
* @return SurrogateInterface
*/
protected function createSurrogate()
protected function createSurrogate(): SurrogateInterface
{
return $this->surrogate ?? new Esi();
}
/**
* @return StoreInterface
*/
protected function createStore()
protected function createStore(): StoreInterface
{
return $this->store ?? new Store($this->cacheDir ?: $this->kernel->getCacheDir().'/http_cache');
}