🎨 N°8772 - Moved DI under Service

This commit is contained in:
Eric Espie
2025-11-19 15:27:18 +01:00
parent bd44f971e4
commit 3e471edefd
8 changed files with 14 additions and 14 deletions

View File

@@ -435,8 +435,6 @@ return array(
'Combodo\\iTop\\Dependencies\\AbstractFolderAnalyzer' => $baseDir . '/sources/Dependencies/AbstractFolderAnalyzer.php',
'Combodo\\iTop\\Dependencies\\Composer\\iTopComposer' => $baseDir . '/sources/Dependencies/Composer/iTopComposer.php',
'Combodo\\iTop\\Dependencies\\NPM\\iTopNPM' => $baseDir . '/sources/Dependencies/NPM/iTopNPM.php',
'Combodo\\iTop\\DependencyInjection\\DIException' => $baseDir . '/sources/DependencyInjection/DIException.php',
'Combodo\\iTop\\DependencyInjection\\DIService' => $baseDir . '/sources/DependencyInjection/DIService.php',
'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php',
'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php',
'Combodo\\iTop\\Form\\Field\\AbstractSimpleField' => $baseDir . '/sources/Form/Field/AbstractSimpleField.php',
@@ -556,6 +554,8 @@ return array(
'Combodo\\iTop\\Service\\Base\\ObjectRepository' => $baseDir . '/sources/Service/Base/ObjectRepository.php',
'Combodo\\iTop\\Service\\Base\\iDataPostProcessor' => $baseDir . '/sources/Service/Base/iDataPostProcessor.php',
'Combodo\\iTop\\Service\\Cache\\DataModelDependantCache' => $baseDir . '/sources/Service/Cache/DataModelDependantCache.php',
'Combodo\\iTop\\Service\\DependencyInjection\\DIException' => $baseDir . '/sources/Service/DependencyInjection/DIException.php',
'Combodo\\iTop\\Service\\DependencyInjection\\DIService' => $baseDir . '/sources/Service/DependencyInjection/DIService.php',
'Combodo\\iTop\\Service\\Events\\Description\\EventDataDescription' => $baseDir . '/sources/Service/Events/Description/EventDataDescription.php',
'Combodo\\iTop\\Service\\Events\\Description\\EventDescription' => $baseDir . '/sources/Service/Events/Description/EventDescription.php',
'Combodo\\iTop\\Service\\Events\\EventData' => $baseDir . '/sources/Service/Events/EventData.php',

View File

@@ -816,8 +816,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'Combodo\\iTop\\Dependencies\\AbstractFolderAnalyzer' => __DIR__ . '/../..' . '/sources/Dependencies/AbstractFolderAnalyzer.php',
'Combodo\\iTop\\Dependencies\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Dependencies/Composer/iTopComposer.php',
'Combodo\\iTop\\Dependencies\\NPM\\iTopNPM' => __DIR__ . '/../..' . '/sources/Dependencies/NPM/iTopNPM.php',
'Combodo\\iTop\\DependencyInjection\\DIException' => __DIR__ . '/../..' . '/sources/DependencyInjection/DIException.php',
'Combodo\\iTop\\DependencyInjection\\DIService' => __DIR__ . '/../..' . '/sources/DependencyInjection/DIService.php',
'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
'Combodo\\iTop\\Form\\Field\\AbstractSimpleField' => __DIR__ . '/../..' . '/sources/Form/Field/AbstractSimpleField.php',
@@ -937,6 +935,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
'Combodo\\iTop\\Service\\Base\\ObjectRepository' => __DIR__ . '/../..' . '/sources/Service/Base/ObjectRepository.php',
'Combodo\\iTop\\Service\\Base\\iDataPostProcessor' => __DIR__ . '/../..' . '/sources/Service/Base/iDataPostProcessor.php',
'Combodo\\iTop\\Service\\Cache\\DataModelDependantCache' => __DIR__ . '/../..' . '/sources/Service/Cache/DataModelDependantCache.php',
'Combodo\\iTop\\Service\\DependencyInjection\\DIException' => __DIR__ . '/../..' . '/sources/Service/DependencyInjection/DIException.php',
'Combodo\\iTop\\Service\\DependencyInjection\\DIService' => __DIR__ . '/../..' . '/sources/Service/DependencyInjection/DIService.php',
'Combodo\\iTop\\Service\\Events\\Description\\EventDataDescription' => __DIR__ . '/../..' . '/sources/Service/Events/Description/EventDataDescription.php',
'Combodo\\iTop\\Service\\Events\\Description\\EventDescription' => __DIR__ . '/../..' . '/sources/Service/Events/Description/EventDescription.php',
'Combodo\\iTop\\Service\\Events\\EventData' => __DIR__ . '/../..' . '/sources/Service/Events/EventData.php',

View File

@@ -7,7 +7,7 @@
namespace Combodo\iTop\Forms\Block\DataModel;
use Combodo\iTop\DependencyInjection\DIService;
use Combodo\iTop\Service\DependencyInjection\DIService;
use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
use Combodo\iTop\Forms\IO\Converter\StringToAttributeConverter;
use Combodo\iTop\Forms\IO\Format\AttributeIOFormat;
@@ -47,7 +47,7 @@ class AttributeChoiceFormBlock extends ChoiceFormBlock
/**
* @param \Combodo\iTop\Forms\Register\OptionsRegister $oOptionsRegister
*
* @throws \Combodo\iTop\DependencyInjection\DIException
* @throws \Combodo\iTop\Service\DependencyInjection\DIException
* @throws \Combodo\iTop\Forms\Block\FormBlockException
* @throws \Combodo\iTop\Forms\Register\RegisterException
*/

View File

@@ -7,7 +7,7 @@
namespace Combodo\iTop\Forms\Block\DataModel;
use Combodo\iTop\DependencyInjection\DIService;
use Combodo\iTop\Service\DependencyInjection\DIService;
use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
use Combodo\iTop\Forms\Block\FormBlockException;
use Combodo\iTop\Forms\IO\Format\AttributeIOFormat;

View File

@@ -7,7 +7,7 @@
namespace Combodo\iTop\Forms\IO\Converter;
use Combodo\iTop\DependencyInjection\DIService;
use Combodo\iTop\Service\DependencyInjection\DIService;
use Combodo\iTop\Forms\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\IO\FormBlockIOException;
@@ -18,7 +18,7 @@ class OqlToClassConverter extends AbstractConverter
{
/** @inheritdoc
* @throws \Combodo\iTop\Forms\IO\FormBlockIOException
* @throws \Combodo\iTop\DependencyInjection\DIException
* @throws \Combodo\iTop\Service\DependencyInjection\DIException
*/
public function Convert(mixed $oData): ?ClassIOFormat
{

View File

@@ -2,7 +2,7 @@
namespace Combodo\iTop\Forms\IO\Format;
use Combodo\iTop\DependencyInjection\DIService;
use Combodo\iTop\Service\DependencyInjection\DIService;
use Combodo\iTop\Forms\IO\FormBlockIOException;
class ClassIOFormat extends AbstractIOFormat
@@ -10,7 +10,7 @@ class ClassIOFormat extends AbstractIOFormat
public string $sClassName;
/**
* @throws \Combodo\iTop\DependencyInjection\DIException
* @throws \Combodo\iTop\Service\DependencyInjection\DIException
* @throws \Combodo\iTop\Forms\IO\FormBlockIOException
*/
public function __construct(string $sClassName)

View File

@@ -5,7 +5,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\DependencyInjection;
namespace Combodo\iTop\Service\DependencyInjection;
use IssueLog;
use Throwable;

View File

@@ -5,7 +5,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\DependencyInjection;
namespace Combodo\iTop\Service\DependencyInjection;
class DIService
{
@@ -48,7 +48,7 @@ class DIService
* @param string $sName name of the service to get
*
* @return mixed
* @throws \Combodo\iTop\DependencyInjection\DIException
* @throws \Combodo\iTop\Service\DependencyInjection\DIException
*/
final public function GetService(string $sName): mixed
{