From 1fac2ae787468c6a9946024d15879fcf2f2a470d Mon Sep 17 00:00:00 2001
From: Benjamin Dalsass <benjamin.dalsass@combodo.com>
Date: Wed, 19 Jan 2022 07:48:03 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B04454=20-=20Measuring=20the=20use=20of=20?=
 =?UTF-8?q?the=20queryphrase=20book=20(code=20review)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/query.class.inc.php      | 13 ++++++++-----
 test/application/query/QueryTest.php |  5 +++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/application/query.class.inc.php b/application/query.class.inc.php
index 0d92c001c..d32448135 100644
--- a/application/query.class.inc.php
+++ b/application/query.class.inc.php
@@ -115,12 +115,16 @@ abstract class Query extends cmdbAbstractObject
 	}
 
 
-	/** @inheritdoc */
+	/**
+	 * @inheritdoc
+	 *
+	 * @since 3.1.0
+	 */
 	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
 	{
 		// read only attribute
 		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])){
-			return(OPT_ATT_READONLY);
+			return OPT_ATT_READONLY;
 		}
 
 		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
@@ -133,14 +137,13 @@ abstract class Query extends cmdbAbstractObject
 	 * @param array|null $aValues optional values for the query
 	 *
 	 * @return string|null
+	 * @since 3.1.0
 	 */
 	public abstract function GetExportUrl(array $aValues = null) : ?string;
 
 	/**
 	 * Update last export information.
 	 *
-	 * @todo validation with Pierre
-	 *
 	 * @return void
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -230,7 +233,7 @@ class QueryOQL extends Query
 			// inject parameters
 			$aParameters = $oSearch->GetQueryParams();
 			foreach ($aParameters as $sParam => $val) {
-				($aValues === null || $aValues[$sParam] === null) ? $paramValue = $sParam : $paramValue = $aValues[$sParam];
+				$paramValue = ($aValues === null || $aValues[$sParam] === null) ? $sParam : $aValues[$sParam];
 				$sUrl .= '&arg_' . $sParam . '=' . $paramValue;
 			}
 
diff --git a/test/application/query/QueryTest.php b/test/application/query/QueryTest.php
index d4b9b6085..322d14fc3 100644
--- a/test/application/query/QueryTest.php
+++ b/test/application/query/QueryTest.php
@@ -19,7 +19,12 @@
  *
  */
 
+namespace Combodo\iTop\Test\UnitTest\Application\Search;
+
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use MetaModel;
+use Query;
+use QueryOQL;
 
 /**
  * This test creates call export on requests and check request usage counter.