composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°8699 - attributedef.class.inc.php to PSR4 [3-PSR4]

Browse Source 
- Add namespaces
- Add use statements
- reformat code
This commit is contained in:
Benjamin Dalsass
2025-09-11 08:15:59 +02:00
committed by Benjamin Dalsass
parent f0adbbba29
commit 3fa500c9c1
65 changed files with 12100 additions and 11369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
core/attributedef.class.inc.php
View File

@@ -5,84 +5,14 @@
*/
require_once('MyHelpers.class.inc.php');
require_once('ormdocument.class.inc.php');
require_once('ormstopwatch.class.inc.php');
require_once('ormpassword.class.inc.php');
require_once('ormcaselog.class.inc.php');
require_once('ormlinkset.class.inc.php');
require_once('ormset.class.inc.php');
require_once('ormtagset.class.inc.php');
require_once('htmlsanitizer.class.inc.php');
require_once('customfieldshandler.class.inc.php');
require_once('ormcustomfieldsvalue.class.inc.php');
require_once('datetimeformat.class.inc.php');
require_once(APPROOT.'/sources/Core/Orm/ormDocument.php');
require_once(APPROOT.'/sources/Core/Orm/ormStopWatch.php');
require_once(APPROOT.'/sources/Core/Orm/ormPassword.php');
require_once(APPROOT.'/sources/Core/Orm/ormCaseLog.php');
require_once(APPROOT.'/sources/Core/Orm/ormLinkSet.php');
require_once(APPROOT.'/sources/Core/Orm/ormSet.php');
require_once(APPROOT.'/sources/Core/Orm/ormTagSet.php');
require_once(APPROOT.'/sources/Core/Orm/ormCustomFieldsValue.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/MissingColumnException.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/iAttributeNoGroupBy.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDefinition.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDashboard.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLinkedSet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLinkedSetIndirect.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDBFieldVoid.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDBField.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeInteger.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObjectKey.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePercentage.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDecimal.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeBoolean.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeString.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClass.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClassState.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeApplicationLanguage.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeFinalClass.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePassword.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEncryptedString.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeText.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLongText.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeCaseLog.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeHTML.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEmailAddress.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeIPAddress.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePhoneNumber.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeOQL.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateString.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateText.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateHTML.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEnum.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeMetaEnum.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDateTime.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDuration.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDate.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDeadline.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeExternalKey.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeHierarchicalKey.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeExternalField.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeURL.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeBlob.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeImage.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeStopWatch.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeSubItem.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeOneWayPassword.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTable.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePropertySet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeSet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEnumSet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeQueryAttCodeSet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTagSet.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeFriendlyName.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeRedundancySettings.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceDate.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeCustomFields.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeArchiveFlag.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeArchiveDate.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceFlag.php');
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceDate.php');
// Indexed array having two dimensions
// The PHP value is a hash array, it is stored as a TEXT column

6
core/oql/oqlquery.class.inc.php
View File

@@ -495,8 +495,8 @@ class OqlObjectQuery extends OqlQuery
{
throw new OqlNormalizeException('Unknown class in join condition (right expression)', $sSourceQuery, $oRightField->GetParentDetails(), array_keys($aAliases));
}
$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeExternalKey');
$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeObjectKey');
$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], \Combodo\iTop\Core\AttributeDefinition\AttributeExternalKey::class);
$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], \Combodo\iTop\Core\AttributeDefinition\AttributeObjectKey::class);
$aAllKeys = array_merge($aExtKeys, $aObjKeys);
if (!array_key_exists($sExtKeyAttCode, $aAllKeys))
{
@@ -557,7 +557,7 @@ class OqlObjectQuery extends OqlQuery
}
$aAttList = $oModelReflection->ListAttributes($aAliases[$sFromClass]);
$sAttType = $aAttList[$sExtKeyAttCode];
if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, 'AttributeHierarchicalKey') && ($sAttType != 'AttributeHierarchicalKey'))
if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class) && ($sAttType != \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class))
{
throw new OqlNormalizeException("The specified tree operator $sOperator is not applicable to the key", $sSourceQuery, $oLeftField->GetNameDetails());
}