viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref cs

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-02-22 12:13:47 +02:00
parent 7d4ab54505
commit 0db2ee0a8d
2 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Espo/Core/Container.php
View File

@@ -299,14 +299,14 @@ class Container implements ContainerInterface
*/
private function load(string $id): void
{
if ($id === 'container') {
$this->setForced('container', $this->loadContainer());
if ($id === self::ID_CONTAINER) {
$this->setForced(self::ID_CONTAINER, $this->loadContainer());
return;
}
if ($id === 'injectableFactory') {
$this->setForced('injectableFactory', $this->loadInjectableFactory());
if ($id === self::ID_INJECTABLE_FACTORY) {
$this->setForced(self::ID_INJECTABLE_FACTORY, $this->loadInjectableFactory());
return;
}

48
application/Espo/Core/Container/ContainerBuilder.php
View File

@@ -52,46 +52,22 @@ use Espo\Core\Loaders\Metadata as MetadataLoader;
*/
class ContainerBuilder
{
/**
* @var class-string<\Espo\Core\Container\Container>
*/
/** @var class-string<ContainerInterface> */
private string $containerClassName = Container::class;
/**
* @var class-string<\Espo\Core\Container\Configuration>
*/
/** @var class-string<Configuration> */
private string $containerConfigurationClassName = ContainerConfiguration::class;
/**
* @var class-string
*/
/** @var class-string */
private string $configClassName = Config::class;
/**
* @var class-string
*/
/** @var class-string */
private string $fileManagerClassName = FileManager::class;
/**
* @var class-string
*/
/** @var class-string */
private string $dataCacheClassName = DataCache::class;
/**
* @var class-string<Module>
*/
/** @var class-string<Module> */
private string $moduleClassName = Module::class;
private ?BindingLoader $bindingLoader = null;
/**
* @var array<string,object>
*/
/** @var array<string, object> */
private $services = [];
/**
* @var array<string,class-string<\Espo\Core\Container\Loader>>
*/
/** @var array<string, class-string<Loader>> */
protected $loaderClassNames = [
'log' => LogLoader::class,
'dataManager' => DataManagerLoader::class,
@@ -106,7 +82,7 @@ class ContainerBuilder
}
/**
* @param array<string,object> $services
* @param array<string, object> $services
*/
public function withServices(array $services): self
{
@@ -118,7 +94,7 @@ class ContainerBuilder
}
/**
* @param array<string,class-string<\Espo\Core\Container\Loader>> $classNames
* @param array<string, class-string<Loader>> $classNames
*/
public function withLoaderClassNames(array $classNames): self
{
@@ -130,7 +106,7 @@ class ContainerBuilder
}
/**
* @param class-string<\Espo\Core\Container\Container> $containerClassName
* @param class-string<ContainerInterface> $containerClassName
*/
public function withContainerClassName(string $containerClassName): self
{
@@ -140,7 +116,7 @@ class ContainerBuilder
}
/**
* @param class-string<\Espo\Core\Container\Configuration> $containerConfigurationClassName
* @param class-string<Configuration> $containerConfigurationClassName
*/
public function withContainerConfigurationClassName(string $containerConfigurationClassName): self
{