N°8699 - attributedef.class.inc.php to PSR4

core/oql/oqlquery.class.inc.php

@@ -495,8 +495,8 @@ public function Check(ModelReflection $oModelReflection, $sSourceQuery, $aParent
 				{
 					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 @@ public function Check(ModelReflection $oModelReflection, $sSourceQuery, $aParent
 					}
 					$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());
 					}

sources/Core/AttributeDefinition/AttributeApplicationLanguage.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Core\AttributeDefinition;
+
+use Dict;
+use ValueSetEnum;
+
+/**
+ * An attibute that matches one of the language codes availables in the dictionnary
+ *
+ * @package     iTopORM
+ */
+class AttributeApplicationLanguage extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	public static function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+	}
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aAvailableLanguages = Dict::GetLanguages();
+		$aLanguageCodes = array();
+		foreach ($aAvailableLanguages as $sLangCode => $aInfo) {
+			$aLanguageCodes[$sLangCode] = $aInfo['description'].' ('.$aInfo['localized_description'].')';
+		}
+
+		// N°6462 This should be sorted directly in \Dict during the compilation but we can't for 2 reasons:
+		// - Additional languages can be added on the fly even though it is not recommended
+		// - Formatting is done at run time (just above)
+		natcasesort($aLanguageCodes);
+
+		$aParams["allowed_values"] = new ValueSetEnum($aLanguageCodes);
+		parent::__construct($sCode, $aParams);
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+}

sources/Core/AttributeDefinition/AttributeArchiveDate.php

@@ -0,0 +1,44 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Core\AttributeDefinition;
+
+use Dict;
+use Exception;
+
+class AttributeArchiveDate extends AttributeDate
+{
+	/**
+	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)
+	 *
+	 * @see https://www.php.net/manual/fr/language.oop5.decon.php states that child constructor can be ommited
+	 * @see https://bugs.php.net/bug.php?id=79010 bug solved in PHP 7.4.9
+	 *
+	 * @param string $sCode
+	 * @param array $aParams
+	 *
+	 * @throws Exception
+	 * @noinspection SenselessProxyMethodInspection
+	 */
+	public function __construct($sCode, $aParams)
+	{
+		parent::__construct($sCode, $aParams);
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveDate/Label', $sDefault);
+
+		return parent::GetLabel($sDefault);
+	}
+
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveDate/Label+', $sDefault);
+
+		return parent::GetDescription($sDefault);
+	}
+}

sources/Core/AttributeDefinition/AttributeArchiveFlag.php

@@ -0,0 +1,57 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Core\AttributeDefinition;
+
+use Dict;
+
+class AttributeArchiveFlag extends AttributeBoolean
+{
+	public function __construct($sCode)
+	{
+		parent::__construct($sCode, array(
+			"allowed_values"  => null,
+			"sql"             => $sCode,
+			"default_value"   => false,
+			"is_null_allowed" => false,
+			"depends_on"      => array(),
+		));
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function CopyOnAllTables()
+	{
+		return true;
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label', $sDefault);
+
+		return parent::GetLabel($sDefault);
+	}
+
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label+', $sDefault);
+
+		return parent::GetDescription($sDefault);
+	}
+}