diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index ea490edff..fffc65e80 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -64,7 +64,7 @@ require_once('dbproperty.class.inc.php'); // db change tracking data model require_once('cmdbchange.class.inc.php'); -require_once('cmdbchangeop.class.inc.php'); +//require_once('cmdbchangeop.class.inc.php'); // customization data model // Romain: temporary moved into application.inc.php (see explanations there) @@ -77,7 +77,7 @@ require_once('cmdbchangeop.class.inc.php'); require_once('templatestring.class.inc.php'); require_once('csvparser.class.inc.php'); -require_once('bulkchange.class.inc.php'); +//require_once('bulkchange.class.inc.php'); /** * A persistent object, which changes are accurately recorded diff --git a/core/config.class.inc.php b/core/config.class.inc.php index bc2dc839d..5c07d5483 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -49,7 +49,7 @@ define('ACCESS_READONLY', 0); */ require_once('attributedef.class.inc.php'); // For the defines -require_once('simplecrypt.class.inc.php'); +//require_once('simplecrypt.class.inc.php'); // was utf8 but it only supports BMP chars (https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html) // so we switched to utf8mb4 in iTop 2.5, adding dependency to MySQL 5.5.3 diff --git a/core/metamodel.class.php b/core/metamodel.class.php index b48835f22..6c8dbce27 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -26,7 +26,7 @@ require_once APPROOT.'core/modulehandler.class.inc.php'; require_once APPROOT.'core/querymodifier.class.inc.php'; require_once APPROOT.'core/metamodelmodifier.inc.php'; require_once APPROOT.'core/computing.inc.php'; -require_once APPROOT.'core/relationgraph.class.inc.php'; +//require_once APPROOT.'core/relationgraph.class.inc.php'; require_once APPROOT.'core/apc-compat.php'; require_once APPROOT.'core/expressioncache.class.inc.php'; diff --git a/core/ormpassword.class.inc.php b/core/ormpassword.class.inc.php index a90780bdd..62e891f0b 100644 --- a/core/ormpassword.class.inc.php +++ b/core/ormpassword.class.inc.php @@ -17,7 +17,7 @@ // along with iTop. If not, see -require_once(APPROOT.'/core/simplecrypt.class.inc.php'); +//require_once(APPROOT.'/core/simplecrypt.class.inc.php'); /** * ormPassword diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index a1d549bf6..a02edaf28 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -92,13 +92,13 @@ return array( 'BackgroundTask' => $baseDir . '/core/backgroundtask.class.inc.php', 'BinaryExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'BinaryOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php', - 'BulkChange' => $baseDir . '/core/bulkchange.class.inc.php', + 'BulkChange' => $baseDir . '/sources/Core/BulkChange/bulkchange/BulkChange.php', 'BulkChangeException' => $baseDir . '/application/exceptions/BulkChangeException.php', - 'BulkExport' => $baseDir . '/core/bulkexport.class.inc.php', - 'BulkExportException' => $baseDir . '/core/bulkexport.class.inc.php', - 'BulkExportMissingParameterException' => $baseDir . '/core/bulkexport.class.inc.php', - 'BulkExportResult' => $baseDir . '/core/bulkexport.class.inc.php', - 'BulkExportResultGC' => $baseDir . '/core/bulkexport.class.inc.php', + 'BulkExport' => $baseDir . '/sources/Application/BulkExport/BulkExport.php', + 'BulkExportException' => $baseDir . '/sources/Application/BulkExport/BulkExportException.php', + 'BulkExportMissingParameterException' => $baseDir . '/sources/Application/BulkExport/BulkExportMissingParameterException.php', + 'BulkExportResult' => $baseDir . '/sources/Application/BulkExport/BulkExportResult.php', + 'BulkExportResultGC' => $baseDir . '/sources/Application/BulkExport/BulkExportResultGC.php', 'CAS_AuthenticationException' => $vendorDir . '/apereo/phpcas/source/CAS/AuthenticationException.php', 'CAS_Client' => $vendorDir . '/apereo/phpcas/source/CAS/Client.php', 'CAS_CookieJar' => $vendorDir . '/apereo/phpcas/source/CAS/CookieJar.php', @@ -151,25 +151,25 @@ return array( 'CAS_Session_PhpSession' => $vendorDir . '/apereo/phpcas/source/CAS/Session/PhpSession.php', 'CAS_TypeMismatchException' => $vendorDir . '/apereo/phpcas/source/CAS/TypeMismatchException.php', 'CMDBChange' => $baseDir . '/core/cmdbchange.class.inc.php', - 'CMDBChangeOp' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpCreate' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpDelete' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpPlugin' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttribute' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeBlob' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeCaseLog' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeCustomFields' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeEncrypted' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeHTML' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLinks' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLinksAddRemove' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLinksTune' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLongText' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeOneWayPassword' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeScalar' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeTagSet' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeText' => $baseDir . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeURL' => $baseDir . '/core/cmdbchangeop.class.inc.php', + 'CMDBChangeOp' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOp.php', + 'CMDBChangeOpCreate' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpCreate.php', + 'CMDBChangeOpDelete' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpDelete.php', + 'CMDBChangeOpPlugin' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpPlugin.php', + 'CMDBChangeOpSetAttribute' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttribute.php', + 'CMDBChangeOpSetAttributeBlob' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeBlob.php', + 'CMDBChangeOpSetAttributeCaseLog' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeCaseLog.php', + 'CMDBChangeOpSetAttributeCustomFields' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeCustomFields.php', + 'CMDBChangeOpSetAttributeEncrypted' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeEncrypted.php', + 'CMDBChangeOpSetAttributeHTML' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeHTML.php', + 'CMDBChangeOpSetAttributeLinks' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinks.php', + 'CMDBChangeOpSetAttributeLinksAddRemove' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinksAddRemove.php', + 'CMDBChangeOpSetAttributeLinksTune' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinksTune.php', + 'CMDBChangeOpSetAttributeLongText' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLongText.php', + 'CMDBChangeOpSetAttributeOneWayPassword' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeOneWayPassword.php', + 'CMDBChangeOpSetAttributeScalar' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeScalar.php', + 'CMDBChangeOpSetAttributeTagSet' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeTagSet.php', + 'CMDBChangeOpSetAttributeText' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeText.php', + 'CMDBChangeOpSetAttributeURL' => $baseDir . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeURL.php', 'CMDBObject' => $baseDir . '/core/cmdbobject.class.inc.php', 'CMDBObjectSet' => $baseDir . '/core/cmdbobject.class.inc.php', 'CMDBSource' => $baseDir . '/core/cmdbsource.class.inc.php', @@ -177,13 +177,13 @@ return array( 'CSVParser' => $baseDir . '/core/csvparser.class.inc.php', 'CSVParserException' => $baseDir . '/application/exceptions/CSVParserException.php', 'CURLStringFile' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php', - 'CellChangeSpec' => $baseDir . '/core/bulkchange.class.inc.php', - 'CellStatus_Ambiguous' => $baseDir . '/core/bulkchange.class.inc.php', - 'CellStatus_Issue' => $baseDir . '/core/bulkchange.class.inc.php', - 'CellStatus_Modify' => $baseDir . '/core/bulkchange.class.inc.php', - 'CellStatus_NullIssue' => $baseDir . '/core/bulkchange.class.inc.php', - 'CellStatus_SearchIssue' => $baseDir . '/core/bulkchange.class.inc.php', - 'CellStatus_Void' => $baseDir . '/core/bulkchange.class.inc.php', + 'CellChangeSpec' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellChangeSpec.php', + 'CellStatus_Ambiguous' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Ambiguous.php', + 'CellStatus_Issue' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Issue.php', + 'CellStatus_Modify' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Modify.php', + 'CellStatus_NullIssue' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_NullIssue.php', + 'CellStatus_SearchIssue' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_SearchIssue.php', + 'CellStatus_Void' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Void.php', 'CharConcatExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'CharConcatWSExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'CheckStopWatchThresholds' => $baseDir . '/core/ormstopwatch.class.inc.php', @@ -539,7 +539,7 @@ return array( 'CoreTemplateException' => $baseDir . '/application/exceptions/CoreTemplateException.php', 'CoreUnexpectedValue' => $baseDir . '/application/exceptions/CoreUnexpectedValue.php', 'CoreWarning' => $baseDir . '/application/exceptions/CoreWarning.php', - 'CryptEngine' => $baseDir . '/core/simplecrypt.class.inc.php', + 'CryptEngine' => $baseDir . '/sources/Application/SimpleCrypt/CryptEngine.php', 'CustomFieldsHandler' => $baseDir . '/core/customfieldshandler.class.inc.php', 'DBObject' => $baseDir . '/core/dbobject.class.php', 'DBObjectSearch' => $baseDir . '/core/dbobjectsearch.class.php', @@ -1501,12 +1501,12 @@ return array( 'QueryOQL' => $baseDir . '/application/query.class.inc.php', 'QueryReflection' => $baseDir . '/core/modelreflection.class.inc.php', 'QueryReflectionRuntime' => $baseDir . '/core/modelreflection.class.inc.php', - 'RelationEdge' => $baseDir . '/core/relationgraph.class.inc.php', - 'RelationGraph' => $baseDir . '/core/relationgraph.class.inc.php', - 'RelationObjectNode' => $baseDir . '/core/relationgraph.class.inc.php', - 'RelationRedundancyNode' => $baseDir . '/core/relationgraph.class.inc.php', + 'RelationEdge' => $baseDir . '/sources/Core/RelationGraph/RelationEdge.php', + 'RelationGraph' => $baseDir . '/sources/Core/RelationGraph/relationgraph.class.inc.php', + 'RelationObjectNode' => $baseDir . '/sources/Core/RelationGraph/relationgraph.class.inc.php', + 'RelationRedundancyNode' => $baseDir . '/sources/Core/RelationGraph/relationgraph.class.inc.php', 'RelationTypeIterator' => $baseDir . '/core/simplegraph.class.inc.php', - 'ReportValue' => $baseDir . '/core/bulkchange.class.inc.php', + 'ReportValue' => $baseDir . '/sources/Core/BulkChange/bulkchange/ReportValue.php', 'RestDelete' => $baseDir . '/core/restservices.class.inc.php', 'RestResult' => $baseDir . '/application/applicationextension/rest/RestResult.php', 'RestResultWithObjects' => $baseDir . '/core/restservices.class.inc.php', @@ -1514,13 +1514,13 @@ return array( 'RestUtils' => $baseDir . '/application/applicationextension/rest/RestUtils.php', 'ReturnTypeWillChange' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php', 'RotatingLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php', - 'RowStatus' => $baseDir . '/core/bulkchange.class.inc.php', - 'RowStatus_Disappeared' => $baseDir . '/core/bulkchange.class.inc.php', - 'RowStatus_Error' => $baseDir . '/core/bulkchange.class.inc.php', - 'RowStatus_Issue' => $baseDir . '/core/bulkchange.class.inc.php', - 'RowStatus_Modify' => $baseDir . '/core/bulkchange.class.inc.php', - 'RowStatus_NewObj' => $baseDir . '/core/bulkchange.class.inc.php', - 'RowStatus_NoChange' => $baseDir . '/core/bulkchange.class.inc.php', + 'RowStatus' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus.php', + 'RowStatus_Disappeared' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Disappeared.php', + 'RowStatus_Error' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Error.php', + 'RowStatus_Issue' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Issue.php', + 'RowStatus_Modify' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Modify.php', + 'RowStatus_NewObj' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_NewObj.php', + 'RowStatus_NoChange' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_NoChange.php', 'RunTimeIconSelectionField' => $baseDir . '/application/forms.class.inc.php', 'RuntimeDashboard' => $baseDir . '/application/dashboard.class.inc.php', 'SQLExpression' => $baseDir . '/core/oql/expression.class.inc.php', @@ -1630,12 +1630,12 @@ return array( 'ShortcutContainerMenuNode' => $baseDir . '/application/menunode.class.inc.php', 'ShortcutMenuNode' => $baseDir . '/application/menunode.class.inc.php', 'ShortcutOQL' => $baseDir . '/application/shortcut.class.inc.php', - 'SimpleCrypt' => $baseDir . '/core/simplecrypt.class.inc.php', - 'SimpleCryptMcryptEngine' => $baseDir . '/core/simplecrypt.class.inc.php', - 'SimpleCryptOpenSSLEngine' => $baseDir . '/core/simplecrypt.class.inc.php', - 'SimpleCryptOpenSSLMcryptCompatibilityEngine' => $baseDir . '/core/simplecrypt.class.inc.php', - 'SimpleCryptSimpleEngine' => $baseDir . '/core/simplecrypt.class.inc.php', - 'SimpleCryptSodiumEngine' => $baseDir . '/core/simplecrypt.class.inc.php', + 'SimpleCrypt' => $baseDir . '/sources/Application/SimpleCrypt/SimpleCrypt.php', + 'SimpleCryptMcryptEngine' => $baseDir . '/sources/Application/SimpleCrypt/SimpleCryptMcryptEngine.php', + 'SimpleCryptOpenSSLEngine' => $baseDir . '/sources/Application/SimpleCrypt/SimpleCryptOpenSSLEngine.php', + 'SimpleCryptOpenSSLMcryptCompatibilityEngine' => $baseDir . '/sources/Application/SimpleCrypt/SimpleCryptOpenSSLMcryptCompatibilityEngine.php', + 'SimpleCryptSimpleEngine' => $baseDir . '/sources/Application/SimpleCrypt/SimpleCryptSimpleEngine.php', + 'SimpleCryptSodiumEngine' => $baseDir . '/sources/Application/SimpleCrypt/SimpleCryptSodiumEngine.php', 'SimpleGraph' => $baseDir . '/core/simplegraph.class.inc.php', 'SimpleGraphException' => $baseDir . '/core/simplegraph.class.inc.php', 'Soundasleep\\Html2Text' => $vendorDir . '/soundasleep/html2text/src/Html2Text.php', @@ -2929,18 +2929,18 @@ return array( 'ThemeHandler' => $baseDir . '/application/themehandler.class.inc.php', 'ThemeHandlerService' => $baseDir . '/application/themehandlerservice.class.inc.php', 'ToolsLog' => $baseDir . '/core/log.class.inc.php', - 'Trigger' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnAttributeBlobDownload' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnObject' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnObjectCreate' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnObjectDelete' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnObjectMention' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnObjectUpdate' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnPortalUpdate' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnStateChange' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnStateEnter' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnStateLeave' => $baseDir . '/core/trigger.class.inc.php', - 'TriggerOnThresholdReached' => $baseDir . '/core/trigger.class.inc.php', + 'Trigger' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/Trigger.php', + 'TriggerOnAttributeBlobDownload' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnAttributeBlobDownload.php', + 'TriggerOnObject' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObject.php', + 'TriggerOnObjectCreate' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectCreate.php', + 'TriggerOnObjectDelete' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectDelete.php', + 'TriggerOnObjectMention' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectMention.php', + 'TriggerOnObjectUpdate' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectUpdate.php', + 'TriggerOnPortalUpdate' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnPortalUpdate.php', + 'TriggerOnStateChange' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnStateChange.php', + 'TriggerOnStateEnter' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnStateEnter.php', + 'TriggerOnStateLeave' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnStateLeave.php', + 'TriggerOnThresholdReached' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/TriggerOnThresholdReached.php', 'TrueExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'Twig\\AbstractTwigCallable' => $vendorDir . '/twig/twig/src/AbstractTwigCallable.php', 'Twig\\Attribute\\FirstClassTwigCallableReady' => $vendorDir . '/twig/twig/src/Attribute/FirstClassTwigCallableReady.php', @@ -3200,7 +3200,7 @@ return array( 'iBackofficeScriptExtension' => $baseDir . '/application/applicationextension/backoffice/iBackofficeScriptExtension.php', 'iBackofficeStyleExtension' => $baseDir . '/application/applicationextension/backoffice/iBackofficeStyleExtension.php', 'iBackupExtraFilesExtension' => $baseDir . '/application/applicationextension/iBackupExtraFilesExtension.php', - 'iCMDBChangeOp' => $baseDir . '/core/cmdbchangeop.class.inc.php', + 'iCMDBChangeOp' => $baseDir . '/sources/Core/DataModel/CMDBChange/iCMDBChangeOp.php', 'iDBObjectSetIterator' => $baseDir . '/core/dbobjectiterator.php', 'iDBObjectURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php', 'iDisplay' => $baseDir . '/core/dbobject.class.php', @@ -3234,7 +3234,7 @@ return array( 'iWelcomePopupExtension' => $baseDir . '/application/applicationextension/backoffice/iWelcomePopupExtension.php', 'iWorkingTimeComputer' => $baseDir . '/core/computing.inc.php', 'lnkAuditCategoryToAuditDomain' => $baseDir . '/application/audit.domain.class.inc.php', - 'lnkTriggerAction' => $baseDir . '/core/trigger.class.inc.php', + 'lnkTriggerAction' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/lnkTriggerAction.php', 'ormCaseLog' => $baseDir . '/core/ormcaselog.class.inc.php', 'ormCustomFieldsValue' => $baseDir . '/core/ormcustomfieldsvalue.class.inc.php', 'ormDocument' => $baseDir . '/core/ormdocument.class.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index b828c8a56..7993c5252 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -470,13 +470,13 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'BackgroundTask' => __DIR__ . '/../..' . '/core/backgroundtask.class.inc.php', 'BinaryExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'BinaryOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php', - 'BulkChange' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', + 'BulkChange' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/BulkChange.php', 'BulkChangeException' => __DIR__ . '/../..' . '/application/exceptions/BulkChangeException.php', - 'BulkExport' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php', - 'BulkExportException' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php', - 'BulkExportMissingParameterException' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php', - 'BulkExportResult' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php', - 'BulkExportResultGC' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php', + 'BulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExport.php', + 'BulkExportException' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExportException.php', + 'BulkExportMissingParameterException' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExportMissingParameterException.php', + 'BulkExportResult' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExportResult.php', + 'BulkExportResultGC' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExportResultGC.php', 'CAS_AuthenticationException' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/AuthenticationException.php', 'CAS_Client' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/Client.php', 'CAS_CookieJar' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/CookieJar.php', @@ -529,25 +529,25 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'CAS_Session_PhpSession' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/Session/PhpSession.php', 'CAS_TypeMismatchException' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS/TypeMismatchException.php', 'CMDBChange' => __DIR__ . '/../..' . '/core/cmdbchange.class.inc.php', - 'CMDBChangeOp' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpCreate' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpDelete' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpPlugin' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttribute' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeBlob' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeCaseLog' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeCustomFields' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeEncrypted' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeHTML' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLinks' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLinksAddRemove' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLinksTune' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeLongText' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeOneWayPassword' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeScalar' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeTagSet' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeText' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', - 'CMDBChangeOpSetAttributeURL' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', + 'CMDBChangeOp' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOp.php', + 'CMDBChangeOpCreate' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpCreate.php', + 'CMDBChangeOpDelete' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpDelete.php', + 'CMDBChangeOpPlugin' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpPlugin.php', + 'CMDBChangeOpSetAttribute' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttribute.php', + 'CMDBChangeOpSetAttributeBlob' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeBlob.php', + 'CMDBChangeOpSetAttributeCaseLog' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeCaseLog.php', + 'CMDBChangeOpSetAttributeCustomFields' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeCustomFields.php', + 'CMDBChangeOpSetAttributeEncrypted' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeEncrypted.php', + 'CMDBChangeOpSetAttributeHTML' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeHTML.php', + 'CMDBChangeOpSetAttributeLinks' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinks.php', + 'CMDBChangeOpSetAttributeLinksAddRemove' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinksAddRemove.php', + 'CMDBChangeOpSetAttributeLinksTune' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinksTune.php', + 'CMDBChangeOpSetAttributeLongText' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLongText.php', + 'CMDBChangeOpSetAttributeOneWayPassword' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeOneWayPassword.php', + 'CMDBChangeOpSetAttributeScalar' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeScalar.php', + 'CMDBChangeOpSetAttributeTagSet' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeTagSet.php', + 'CMDBChangeOpSetAttributeText' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeText.php', + 'CMDBChangeOpSetAttributeURL' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeURL.php', 'CMDBObject' => __DIR__ . '/../..' . '/core/cmdbobject.class.inc.php', 'CMDBObjectSet' => __DIR__ . '/../..' . '/core/cmdbobject.class.inc.php', 'CMDBSource' => __DIR__ . '/../..' . '/core/cmdbsource.class.inc.php', @@ -555,13 +555,13 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'CSVParser' => __DIR__ . '/../..' . '/core/csvparser.class.inc.php', 'CSVParserException' => __DIR__ . '/../..' . '/application/exceptions/CSVParserException.php', 'CURLStringFile' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php', - 'CellChangeSpec' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'CellStatus_Ambiguous' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'CellStatus_Issue' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'CellStatus_Modify' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'CellStatus_NullIssue' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'CellStatus_SearchIssue' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'CellStatus_Void' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', + 'CellChangeSpec' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellChangeSpec.php', + 'CellStatus_Ambiguous' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Ambiguous.php', + 'CellStatus_Issue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Issue.php', + 'CellStatus_Modify' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Modify.php', + 'CellStatus_NullIssue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_NullIssue.php', + 'CellStatus_SearchIssue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_SearchIssue.php', + 'CellStatus_Void' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Void.php', 'CharConcatExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'CharConcatWSExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'CheckStopWatchThresholds' => __DIR__ . '/../..' . '/core/ormstopwatch.class.inc.php', @@ -917,7 +917,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'CoreTemplateException' => __DIR__ . '/../..' . '/application/exceptions/CoreTemplateException.php', 'CoreUnexpectedValue' => __DIR__ . '/../..' . '/application/exceptions/CoreUnexpectedValue.php', 'CoreWarning' => __DIR__ . '/../..' . '/application/exceptions/CoreWarning.php', - 'CryptEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', + 'CryptEngine' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/CryptEngine.php', 'CustomFieldsHandler' => __DIR__ . '/../..' . '/core/customfieldshandler.class.inc.php', 'DBObject' => __DIR__ . '/../..' . '/core/dbobject.class.php', 'DBObjectSearch' => __DIR__ . '/../..' . '/core/dbobjectsearch.class.php', @@ -1879,12 +1879,12 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'QueryOQL' => __DIR__ . '/../..' . '/application/query.class.inc.php', 'QueryReflection' => __DIR__ . '/../..' . '/core/modelreflection.class.inc.php', 'QueryReflectionRuntime' => __DIR__ . '/../..' . '/core/modelreflection.class.inc.php', - 'RelationEdge' => __DIR__ . '/../..' . '/core/relationgraph.class.inc.php', - 'RelationGraph' => __DIR__ . '/../..' . '/core/relationgraph.class.inc.php', - 'RelationObjectNode' => __DIR__ . '/../..' . '/core/relationgraph.class.inc.php', - 'RelationRedundancyNode' => __DIR__ . '/../..' . '/core/relationgraph.class.inc.php', + 'RelationEdge' => __DIR__ . '/../..' . '/sources/Core/RelationGraph/RelationEdge.php', + 'RelationGraph' => __DIR__ . '/../..' . '/sources/Core/RelationGraph/relationgraph.class.inc.php', + 'RelationObjectNode' => __DIR__ . '/../..' . '/sources/Core/RelationGraph/relationgraph.class.inc.php', + 'RelationRedundancyNode' => __DIR__ . '/../..' . '/sources/Core/RelationGraph/relationgraph.class.inc.php', 'RelationTypeIterator' => __DIR__ . '/../..' . '/core/simplegraph.class.inc.php', - 'ReportValue' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', + 'ReportValue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/ReportValue.php', 'RestDelete' => __DIR__ . '/../..' . '/core/restservices.class.inc.php', 'RestResult' => __DIR__ . '/../..' . '/application/applicationextension/rest/RestResult.php', 'RestResultWithObjects' => __DIR__ . '/../..' . '/core/restservices.class.inc.php', @@ -1892,13 +1892,13 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'RestUtils' => __DIR__ . '/../..' . '/application/applicationextension/rest/RestUtils.php', 'ReturnTypeWillChange' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php', 'RotatingLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php', - 'RowStatus' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RowStatus_Disappeared' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RowStatus_Error' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RowStatus_Issue' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RowStatus_Modify' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RowStatus_NewObj' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RowStatus_NoChange' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', + 'RowStatus' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus.php', + 'RowStatus_Disappeared' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Disappeared.php', + 'RowStatus_Error' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Error.php', + 'RowStatus_Issue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Issue.php', + 'RowStatus_Modify' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Modify.php', + 'RowStatus_NewObj' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_NewObj.php', + 'RowStatus_NoChange' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_NoChange.php', 'RunTimeIconSelectionField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', 'RuntimeDashboard' => __DIR__ . '/../..' . '/application/dashboard.class.inc.php', 'SQLExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', @@ -2008,12 +2008,12 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'ShortcutContainerMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php', 'ShortcutMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php', 'ShortcutOQL' => __DIR__ . '/../..' . '/application/shortcut.class.inc.php', - 'SimpleCrypt' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', - 'SimpleCryptMcryptEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', - 'SimpleCryptOpenSSLEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', - 'SimpleCryptOpenSSLMcryptCompatibilityEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', - 'SimpleCryptSimpleEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', - 'SimpleCryptSodiumEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php', + 'SimpleCrypt' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/SimpleCrypt.php', + 'SimpleCryptMcryptEngine' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/SimpleCryptMcryptEngine.php', + 'SimpleCryptOpenSSLEngine' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/SimpleCryptOpenSSLEngine.php', + 'SimpleCryptOpenSSLMcryptCompatibilityEngine' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/SimpleCryptOpenSSLMcryptCompatibilityEngine.php', + 'SimpleCryptSimpleEngine' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/SimpleCryptSimpleEngine.php', + 'SimpleCryptSodiumEngine' => __DIR__ . '/../..' . '/sources/Application/SimpleCrypt/SimpleCryptSodiumEngine.php', 'SimpleGraph' => __DIR__ . '/../..' . '/core/simplegraph.class.inc.php', 'SimpleGraphException' => __DIR__ . '/../..' . '/core/simplegraph.class.inc.php', 'Soundasleep\\Html2Text' => __DIR__ . '/..' . '/soundasleep/html2text/src/Html2Text.php', @@ -3307,18 +3307,18 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'ThemeHandler' => __DIR__ . '/../..' . '/application/themehandler.class.inc.php', 'ThemeHandlerService' => __DIR__ . '/../..' . '/application/themehandlerservice.class.inc.php', 'ToolsLog' => __DIR__ . '/../..' . '/core/log.class.inc.php', - 'Trigger' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnAttributeBlobDownload' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnObject' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnObjectCreate' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnObjectDelete' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnObjectMention' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnObjectUpdate' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnPortalUpdate' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnStateChange' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnStateEnter' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnStateLeave' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', - 'TriggerOnThresholdReached' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', + 'Trigger' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/Trigger.php', + 'TriggerOnAttributeBlobDownload' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnAttributeBlobDownload.php', + 'TriggerOnObject' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObject.php', + 'TriggerOnObjectCreate' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectCreate.php', + 'TriggerOnObjectDelete' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectDelete.php', + 'TriggerOnObjectMention' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectMention.php', + 'TriggerOnObjectUpdate' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectUpdate.php', + 'TriggerOnPortalUpdate' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnPortalUpdate.php', + 'TriggerOnStateChange' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnStateChange.php', + 'TriggerOnStateEnter' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnStateEnter.php', + 'TriggerOnStateLeave' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnStateLeave.php', + 'TriggerOnThresholdReached' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/TriggerOnThresholdReached.php', 'TrueExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'Twig\\AbstractTwigCallable' => __DIR__ . '/..' . '/twig/twig/src/AbstractTwigCallable.php', 'Twig\\Attribute\\FirstClassTwigCallableReady' => __DIR__ . '/..' . '/twig/twig/src/Attribute/FirstClassTwigCallableReady.php', @@ -3578,7 +3578,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'iBackofficeScriptExtension' => __DIR__ . '/../..' . '/application/applicationextension/backoffice/iBackofficeScriptExtension.php', 'iBackofficeStyleExtension' => __DIR__ . '/../..' . '/application/applicationextension/backoffice/iBackofficeStyleExtension.php', 'iBackupExtraFilesExtension' => __DIR__ . '/../..' . '/application/applicationextension/iBackupExtraFilesExtension.php', - 'iCMDBChangeOp' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php', + 'iCMDBChangeOp' => __DIR__ . '/../..' . '/sources/Core/DataModel/CMDBChange/iCMDBChangeOp.php', 'iDBObjectSetIterator' => __DIR__ . '/../..' . '/core/dbobjectiterator.php', 'iDBObjectURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php', 'iDisplay' => __DIR__ . '/../..' . '/core/dbobject.class.php', @@ -3612,7 +3612,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'iWelcomePopupExtension' => __DIR__ . '/../..' . '/application/applicationextension/backoffice/iWelcomePopupExtension.php', 'iWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php', 'lnkAuditCategoryToAuditDomain' => __DIR__ . '/../..' . '/application/audit.domain.class.inc.php', - 'lnkTriggerAction' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', + 'lnkTriggerAction' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/lnkTriggerAction.php', 'ormCaseLog' => __DIR__ . '/../..' . '/core/ormcaselog.class.inc.php', 'ormCustomFieldsValue' => __DIR__ . '/../..' . '/core/ormcustomfieldsvalue.class.inc.php', 'ormDocument' => __DIR__ . '/../..' . '/core/ormdocument.class.inc.php', diff --git a/pages/UI.php b/pages/UI.php index c8efc163e..8b1680c7a 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -1397,7 +1397,7 @@ try case 'swf_navigator': /** @deprecated SWF was removed in iTop */ case 'view_relations': // Graphical display of the relations "impact" / "depends on" require_once(APPROOT.'core/simplegraph.class.inc.php'); - require_once(APPROOT.'core/relationgraph.class.inc.php'); + //require_once(APPROOT.'core/relationgraph.class.inc.php'); require_once(APPROOT.'core/displayablegraph.class.inc.php'); $sClass = utils::ReadParam('class', '', false, 'class'); $id = utils::ReadParam('id', 0); diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 465650ea0..898399fb4 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1538,7 +1538,7 @@ EOF case 'relation_pdf': case 'relation_attachment': require_once(APPROOT.'core/simplegraph.class.inc.php'); - require_once(APPROOT.'core/relationgraph.class.inc.php'); + //require_once(APPROOT.'core/relationgraph.class.inc.php'); require_once(APPROOT.'core/displayablegraph.class.inc.php'); $sRelation = utils::ReadParam('relation', 'impacts'); $sDirection = utils::ReadParam('direction', 'down'); @@ -1696,7 +1696,7 @@ EOF case 'relation_json': require_once(APPROOT.'core/simplegraph.class.inc.php'); - require_once(APPROOT.'core/relationgraph.class.inc.php'); + //require_once(APPROOT.'core/relationgraph.class.inc.php'); require_once(APPROOT.'core/displayablegraph.class.inc.php'); $sRelation = utils::ReadParam('relation', 'impacts'); $sDirection = utils::ReadParam('direction', 'down'); @@ -1801,7 +1801,7 @@ EOF case 'ticket_impact': require_once(APPROOT.'core/simplegraph.class.inc.php'); - require_once(APPROOT.'core/relationgraph.class.inc.php'); + //require_once(APPROOT.'core/relationgraph.class.inc.php'); require_once(APPROOT.'core/displayablegraph.class.inc.php'); $sRelation = utils::ReadParam('relation', 'impacts'); diff --git a/sources/Core/RelationGraph/relationgraph.class.inc.php b/sources/Core/RelationGraph/relationgraph.class.inc.php index 43b82f703..febccf3c6 100644 --- a/sources/Core/RelationGraph/relationgraph.class.inc.php +++ b/sources/Core/RelationGraph/relationgraph.class.inc.php @@ -1,21 +1,4 @@ - /** * Data structures (i.e. PHP classes) to build and use relation graphs @@ -25,169 +8,6 @@ * */ -require_once(APPROOT.'core/simplegraph.class.inc.php'); - -/** - * An object Node inside a RelationGraph - */ -class RelationObjectNode extends GraphNode -{ - public function __construct($oGraph, $oObject) - { - parent::__construct($oGraph, self::MakeId($oObject)); - $this->SetProperty('object', $oObject); - $this->SetProperty('label', get_class($oObject).'::'.$oObject->GetKey().' ('.$oObject->Get('friendlyname').')'); - } - - /** - * Make a normalized ID to ensure the uniqueness of such a node - * - * @param string $oObject - * - * @return string - */ - public static function MakeId($oObject) - { - return get_class($oObject).'::'.$oObject->GetKey(); - } - - /** - * Formatting for GraphViz - * - * @param bool $bNoLabel - * - * @return string - */ - public function GetDotAttributes($bNoLabel = false) - { - $sDot = parent::GetDotAttributes(); - if ($this->GetProperty('developped', false)) - { - $sDot .= ',fontcolor=black'; - } - else - { - $sDot .= ',fontcolor=lightgrey'; - } - if ($this->GetProperty('source', false) || $this->GetProperty('sink', false)) - { - $sDot .= ',shape=rectangle'; - } - if ($this->GetProperty('is_reached', false)) - { - $sDot .= ',fillcolor="#ffdddd"'; - } - else - { - $sDot .= ',fillcolor=white'; - } - return $sDot; - } - - /** - * Recursively mark the objects nodes as reached, unless we get stopped by a redundancy node or a 'not allowed' node - * - * @param string $sProperty - * @param $value - */ - public function ReachDown($sProperty, $value) - { - if (is_null($this->GetProperty($sProperty)) && ($this->GetProperty($sProperty.'_allowed') !== false)) - { - $this->SetProperty($sProperty, $value); - foreach ($this->GetOutgoingEdges() as $oOutgoingEdge) - { - // Recurse - $oOutgoingEdge->GetSinkNode()->ReachDown($sProperty, $value); - } - } - } -} - -/** - * An redundancy Node inside a RelationGraph - */ -class RelationRedundancyNode extends GraphNode -{ - public function __construct($oGraph, $sId, $iMinUp, $fThreshold) - { - parent::__construct($oGraph, $sId); - $this->SetProperty('min_up', $iMinUp); - $this->SetProperty('threshold', $fThreshold); - } - - /** - * Make a normalized ID to ensure the uniqueness of such a node - * - * @param string $sRelCode - * @param string $sNeighbourId - * @param $oSourceObject - * @param \DBObject $oSinkObject - * - * @return string - */ - public static function MakeId($sRelCode, $sNeighbourId, $oSourceObject, $oSinkObject) - { - return 'redundancy-'.$sRelCode.'-'.$sNeighbourId.'-'.get_class($oSinkObject).'::'.$oSinkObject->GetKey(); - } - - /** - * Formatting for GraphViz - * - * @param bool $bNoLabel - * - * @return string - */ - public function GetDotAttributes($bNoLabel = false) - { - $sDisplayThreshold = sprintf('%.1f', $this->GetProperty('threshold')); - $sDot = 'shape=doublecircle,fillcolor=indianred,fontcolor=papayawhip,label="'.$sDisplayThreshold.'"'; - return $sDot; - } - - /** - * Recursively mark the objects nodes as reached, unless we get stopped by a redundancy node - * - * @param string $sProperty - * @param $value - */ - public function ReachDown($sProperty, $value) - { - $this->SetProperty($sProperty.'_count', $this->GetProperty($sProperty.'_count', 0) + 1); - if ($this->GetProperty($sProperty.'_count') > $this->GetProperty('threshold')) - { - // Looping... though there should be only ONE SINGLE outgoing edge - foreach ($this->GetOutgoingEdges() as $oOutgoingEdge) - { - // Recurse - $oOutgoingEdge->GetSinkNode()->ReachDown($sProperty, $value); - } - } - } -} - - -/** - * Helper to name the edges in a unique way - */ -class RelationEdge extends GraphEdge -{ - /** - * RelationEdge constructor. - * - * @param \SimpleGraph $oGraph - * @param \GraphNode $oSourceNode - * @param \GraphNode $oSinkNode - * @param bool $bMustBeUnique - * - * @throws \SimpleGraphException - */ - public function __construct(SimpleGraph $oGraph, GraphNode $oSourceNode, GraphNode $oSinkNode, $bMustBeUnique = false) - { - $sId = $oSourceNode->GetId().'-to-'.$oSinkNode->GetId(); - parent::__construct($oGraph, $sId, $oSourceNode, $oSinkNode, $bMustBeUnique); - } -} /** * A graph representing the relations between objects diff --git a/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.php index f16adeb73..c698d4e69 100644 --- a/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.php +++ b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.php @@ -27,7 +27,7 @@ class BulkChangeExtKeyTest extends ItopDataTestCase { protected function setUp() : void { parent::setUp(); - require_once(APPROOT.'core/bulkchange.class.inc.php'); + //require_once(APPROOT.'core/bulkchange.class.inc.php'); } private function deleteAllRacks(){