composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-30 14:08:46 +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

21
lib/symfony/twig-bundle/TemplateIterator.php
View File

@@ -25,25 +25,28 @@ use Symfony\Component\HttpKernel\KernelInterface;
*/
class TemplateIterator implements \IteratorAggregate
{
private $kernel;
private $templates;
private $paths;
private $defaultPath;
private KernelInterface $kernel;
private \Traversable $templates;
private array $paths;
private ?string $defaultPath;
private array $namePatterns;
/**
* @param array $paths Additional Twig paths to warm
* @param string|null $defaultPath The directory where global templates can be stored
* @param array $paths Additional Twig paths to warm
* @param string|null $defaultPath The directory where global templates can be stored
* @param string[] $namePatterns Pattern of file names
*/
public function __construct(KernelInterface $kernel, array $paths = [], string $defaultPath = null)
public function __construct(KernelInterface $kernel, array $paths = [], string $defaultPath = null, array $namePatterns = [])
{
$this->kernel = $kernel;
$this->paths = $paths;
$this->defaultPath = $defaultPath;
$this->namePatterns = $namePatterns;
}
public function getIterator(): \Traversable
{
if (null !== $this->templates) {
if (isset($this->templates)) {
return $this->templates;
}
@@ -82,7 +85,7 @@ class TemplateIterator implements \IteratorAggregate
}
$templates = [];
foreach (Finder::create()->files()->followLinks()->in($dir)->exclude($excludeDirs) as $file) {
foreach (Finder::create()->files()->followLinks()->in($dir)->exclude($excludeDirs)->name($this->namePatterns) as $file) {
$templates[] = (null !== $namespace ? '@'.$namespace.'/' : '').str_replace('\\', '/', $file->getRelativePathname());
}