From 4a22361f39b8a4a8679458f60f000fb4105eb990 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Wed, 7 Dec 2022 17:36:28 +0100
Subject: [PATCH] =?UTF-8?q?:hammer:=20N=C2=B05633=20update-xml.php=20:=20a?=
 =?UTF-8?q?dd=20new=20XML=20dir=20(/application=20and=20/core)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .make/release/update-xml.php          |  3 +++
 .make/release/update.classes.inc.php  | 29 ++++++++++++++++++++++-----
 application/datamodel.application.xml | 24 +++++++++++-----------
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/.make/release/update-xml.php b/.make/release/update-xml.php
index 357919e88..469266d38 100644
--- a/.make/release/update-xml.php
+++ b/.make/release/update-xml.php
@@ -6,6 +6,8 @@
  * Will update version in the following files :
  *
  * datamodels/2.x/.../datamodel.*.xml
+ * application/*.xml
+ * core/*.xml
  *
  * Usage :
  * `php .make\release\update-xml.php "1.7"`
@@ -16,6 +18,7 @@
  * @since 2.7.0 simple version change using regexp (not doing conversion)
  * @since 3.1.0 N°5405 now does a real conversion
  * @since 3.1.0 N°5633 allow to use without parameter
+ * @since 3.1.0 N°5633 add /application and /core XML files
  ******************************************************************************/
 
 
diff --git a/.make/release/update.classes.inc.php b/.make/release/update.classes.inc.php
index 2df288449..cb6798730 100644
--- a/.make/release/update.classes.inc.php
+++ b/.make/release/update.classes.inc.php
@@ -125,16 +125,31 @@ class iTopVersionFileUpdater extends AbstractSingleFileVersionUpdater
 
 abstract class AbstractGlobFileVersionUpdater extends FileVersionUpdater
 {
-	protected $sGlobPattern;
+	/** @var array|string glob patterns to seek for files to modify */
+	protected $globPattern;
 
-	public function __construct($sGlobPattern)
+	public function __construct($globPattern)
 	{
-		$this->sGlobPattern = $sGlobPattern;
+		$this->globPattern = $globPattern;
 	}
 
 	public function GetFiles()
 	{
-		return glob($this->sGlobPattern);
+		$aGlobPatterns = (is_array($this->globPattern))
+			? $this->globPattern
+			: [$this->globPattern];
+
+		$aFiles = [];
+		foreach ($aGlobPatterns as $sGlobPattern) {
+			$result = glob($sGlobPattern);
+			if (false === $result) {
+				continue;
+			}
+			/** @noinspection SlowArrayOperationsInLoopInspection */
+			$aFiles = array_merge($aFiles, $result);
+		}
+
+		return $aFiles;
 	}
 }
 
@@ -166,7 +181,11 @@ class DatamodelsXmlFiles extends AbstractGlobFileVersionUpdater
 {
 	public function __construct()
 	{
-		parent::__construct(APPROOT.'datamodels/2.x/*/datamodel.*.xml');
+		parent::__construct([
+			APPROOT.'datamodels/2.x/*/datamodel.*.xml',
+			APPROOT.'application/*.xml',
+			APPROOT.'core/*.xml',
+		]);
 	}
 
 	/**
diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml
index 04f5fb34b..a9c6285f0 100644
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -55,9 +55,9 @@
   <menus>
     <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
       <rank>10</rank>
-	    <style>
-		    <decoration_classes>fas fa-home</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-home</decoration_classes>
+      </style>
     </menu>
     <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="define">
       <rank>10</rank>
@@ -151,9 +151,9 @@
     </menu>
     <menu id="ConfigurationTools" xsi:type="MenuGroup" _delta="define_if_not_exists">
       <rank>90</rank>
-	    <style>
-		    <decoration_classes>fas fa-cog</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-cog</decoration_classes>
+      </style>
     </menu>
     <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
       <rank>20</rank>
@@ -172,17 +172,17 @@
     </menu>
     <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
       <rank>80</rank>
-	    <style>
-		    <decoration_classes>fas fa-tools</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-tools</decoration_classes>
+      </style>
     </menu>
     <menu id="SystemTools" xsi:type="MenuGroup" _delta="define">
       <rank>100</rank>
       <enable_class>ResourceSystemMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
-	    <style>
-		    <decoration_classes>fas fa-terminal</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-terminal</decoration_classes>
+      </style>
     </menu>
   </menus>
   <events>