mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-27 20:48:46 +02:00
N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)
* 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:
@@ -26,13 +26,13 @@ class ServicesConfigurator extends AbstractConfigurator
|
||||
{
|
||||
public const FACTORY = 'services';
|
||||
|
||||
private $defaults;
|
||||
private $container;
|
||||
private $loader;
|
||||
private $instanceof;
|
||||
private $path;
|
||||
private $anonymousHash;
|
||||
private $anonymousCount;
|
||||
private Definition $defaults;
|
||||
private ContainerBuilder $container;
|
||||
private PhpFileLoader $loader;
|
||||
private array $instanceof;
|
||||
private ?string $path;
|
||||
private string $anonymousHash;
|
||||
private int $anonymousCount;
|
||||
|
||||
public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path = null, int &$anonymousCount = 0)
|
||||
{
|
||||
@@ -101,7 +101,7 @@ class ServicesConfigurator extends AbstractConfigurator
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
final public function remove(string $id): self
|
||||
final public function remove(string $id): static
|
||||
{
|
||||
$this->container->removeDefinition($id);
|
||||
$this->container->removeAlias($id);
|
||||
@@ -129,7 +129,7 @@ class ServicesConfigurator extends AbstractConfigurator
|
||||
*/
|
||||
final public function load(string $namespace, string $resource): PrototypeConfigurator
|
||||
{
|
||||
return new PrototypeConfigurator($this, $this->loader, $this->defaults, $namespace, $resource, true);
|
||||
return new PrototypeConfigurator($this, $this->loader, $this->defaults, $namespace, $resource, true, $this->path);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user