From 64e8aa5fee8219cca43e1e0c4a93e471c51e5dc6 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Wed, 26 Jan 2022 10:31:20 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B04714=20New=20ITOP=5FCORE=5FVERSION=20con?=
 =?UTF-8?q?stant=20See=20following=20constants=20PHPDoc=20for=20informatio?=
 =?UTF-8?q?n=20:=20*=20core/config.class.inc.php=20ITOP=5FVERSION=20*=20co?=
 =?UTF-8?q?re/config.class.inc.php=20ITOP=5FCORE=5FVERSION=20*=20setup/ito?=
 =?UTF-8?q?pdesignformat.class.inc.php=20ITOP=5FDESIGN=5FLATEST=5FVERSION?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/config.class.inc.php            | 15 ++++++++++++---
 setup/itopdesignformat.class.inc.php |  6 ++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index 5107d09d2..41c756984 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -27,12 +27,21 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  * Constant containing the application version
  * Warning: this might be different from iTop core version!
  *
- * @see     ITOP_DESIGN_LATEST_VERSION for iTop core version
- *
- * @used-by utils::GetItopPatchVersion
+ * @see ITOP_CORE_VERSION to get iTop core version
  */
 define('ITOP_VERSION', '2.7.0-dev');
 
+/**
+ * Constant containing the iTop core version, whatever application was built
+ *
+ * Note that in iTop 3.0.0 we used {@see ITOP_DESIGN_LATEST_VERSION} to get core version.
+ * When releasing, both constants should be updated : see `.make/release/update-versions.php` for that !
+ *
+ * @since 2.7.7 3.0.1 3.1.1 N°4714 constant creation
+ * @used-by utils::GetItopPatchVersion
+ */
+define('ITOP_CORE_VERSION', '2.7.7');
+
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');
 define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);
diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php
index f588c8dd4..e0fbc84dd 100644
--- a/setup/itopdesignformat.class.inc.php
+++ b/setup/itopdesignformat.class.inc.php
@@ -20,9 +20,11 @@
 
 /**
  * iTop Datamodel XML format version
- * And also iTop core version
  *
- * To test for iTop core version use this constant instead of {@link ITOP_VERSION} !
+ * It was also used in iTop 3.0.0 to get iTop core version (instead of {@see ITOP_VERSION} which gives the application version).
+ * To address this need you should now use {@see ITOP_CORE_VERSION}
+ *
+ * @see ITOP_CORE_VERSION to get full iTop core version
  */
 define('ITOP_DESIGN_LATEST_VERSION', '1.7');