Skip to content

Commit 041c30d

Browse files
bdalsassbdalsass
committed
N°8699 - attributedef.class.inc.php to PSR4 [3-PSR4]
- Add namespaces - Add use statements - reformat code
1 parent abafeff commit 041c30d

65 files changed

Lines changed: 13127 additions & 12396 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/attributedef.class.inc.php‎

Lines changed: 8 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,84 +5,14 @@
55
*/
66

77
require_once('MyHelpers.class.inc.php');
8+
require_once('ormdocument.class.inc.php');
9+
require_once('ormstopwatch.class.inc.php');
10+
require_once('ormpassword.class.inc.php');
11+
require_once('ormcaselog.class.inc.php');
12+
require_once('ormlinkset.class.inc.php');
13+
require_once('ormset.class.inc.php');
14+
require_once('ormtagset.class.inc.php');
815
require_once('htmlsanitizer.class.inc.php');
916
require_once('customfieldshandler.class.inc.php');
17+
require_once('ormcustomfieldsvalue.class.inc.php');
1018
require_once('datetimeformat.class.inc.php');
11-
12-
require_once(APPROOT.'/sources/Core/Orm/ormDocument.php');
13-
require_once(APPROOT.'/sources/Core/Orm/ormStopWatch.php');
14-
require_once(APPROOT.'/sources/Core/Orm/ormPassword.php');
15-
require_once(APPROOT.'/sources/Core/Orm/ormCaseLog.php');
16-
require_once(APPROOT.'/sources/Core/Orm/ormLinkSet.php');
17-
require_once(APPROOT.'/sources/Core/Orm/ormSet.php');
18-
require_once(APPROOT.'/sources/Core/Orm/ormTagSet.php');
19-
require_once(APPROOT.'/sources/Core/Orm/ormCustomFieldsValue.php');
20-
21-
22-
require_once(APPROOT.'/sources/Core/AttributeDefinition/MissingColumnException.php');
23-
require_once(APPROOT.'/sources/Core/AttributeDefinition/iAttributeNoGroupBy.php');
24-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDefinition.php');
25-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDashboard.php');
26-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLinkedSet.php');
27-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLinkedSetIndirect.php');
28-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDBFieldVoid.php');
29-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDBField.php');
30-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeInteger.php');
31-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObjectKey.php');
32-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePercentage.php');
33-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDecimal.php');
34-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeBoolean.php');
35-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeString.php');
36-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClass.php');
37-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClassState.php');
38-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeApplicationLanguage.php');
39-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeFinalClass.php');
40-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePassword.php');
41-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEncryptedString.php');
42-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeText.php');
43-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLongText.php');
44-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeCaseLog.php');
45-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeHTML.php');
46-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEmailAddress.php');
47-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeIPAddress.php');
48-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePhoneNumber.php');
49-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeOQL.php');
50-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateString.php');
51-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateText.php');
52-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateHTML.php');
53-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEnum.php');
54-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeMetaEnum.php');
55-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDateTime.php');
56-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDuration.php');
57-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDate.php');
58-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDeadline.php');
59-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeExternalKey.php');
60-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeHierarchicalKey.php');
61-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeExternalField.php');
62-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeURL.php');
63-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeBlob.php');
64-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeImage.php');
65-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeStopWatch.php');
66-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeSubItem.php');
67-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeOneWayPassword.php');
68-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTable.php');
69-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePropertySet.php');
70-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeSet.php');
71-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEnumSet.php');
72-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php');
73-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeQueryAttCodeSet.php');
74-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTagSet.php');
75-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeFriendlyName.php');
76-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeRedundancySettings.php');
77-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceDate.php');
78-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeCustomFields.php');
79-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeArchiveFlag.php');
80-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeArchiveDate.php');
81-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceFlag.php');
82-
require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceDate.php');
83-
84-
85-
86-
// Indexed array having two dimensions
87-
88-
// The PHP value is a hash array, it is stored as a TEXT column

‎core/oql/oqlquery.class.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,8 @@ public function Check(ModelReflection $oModelReflection, $sSourceQuery, $aParent
495495
{
496496
throw new OqlNormalizeException('Unknown class in join condition (right expression)', $sSourceQuery, $oRightField->GetParentDetails(), array_keys($aAliases));
497497
}
498-
$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeExternalKey');
499-
$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeObjectKey');
498+
$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], \Combodo\iTop\Core\AttributeDefinition\AttributeExternalKey::class);
499+
$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], \Combodo\iTop\Core\AttributeDefinition\AttributeObjectKey::class);
500500
$aAllKeys = array_merge($aExtKeys, $aObjKeys);
501501
if (!array_key_exists($sExtKeyAttCode, $aAllKeys))
502502
{
@@ -557,7 +557,7 @@ public function Check(ModelReflection $oModelReflection, $sSourceQuery, $aParent
557557
}
558558
$aAttList = $oModelReflection->ListAttributes($aAliases[$sFromClass]);
559559
$sAttType = $aAttList[$sExtKeyAttCode];
560-
if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, 'AttributeHierarchicalKey') && ($sAttType != 'AttributeHierarchicalKey'))
560+
if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class) && ($sAttType != \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class))
561561
{
562562
throw new OqlNormalizeException("The specified tree operator $sOperator is not applicable to the key", $sSourceQuery, $oLeftField->GetNameDetails());
563563
}

0 commit comments

Comments
 (0)