poc timezone

* 🌐Update cs.dictionary.itop.core.php

* 🌐Update cs.dictionary.itop.ui.php

* 🌐Update cs.dictionary.itop.ui.php

* 🌐Update cs.dict.itop-portal-base.php

* 🌐Update cs.dict.combodo-backoffice-darkmoon-theme.php

* 🌐 Update cs.dictionary.itop.ui.php

Typo fix

.doc/itop-version-history.md

@@ -68,6 +68,8 @@ gitGraph
     branch support/3.1 order: 840
     checkout support/3.1
     commit id: "2023-08-09" tag: "3.1.0-2"
+    checkout support/2.7
+    commit id: "2023-08-10" tag: "2.7.9"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

README.md

@@ -107,6 +107,7 @@ We would like to give a special thank you 🤗 to the people from the community
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
 - Seki, Shoji
 - Shilov, Vladimir
+- Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
 - Tulio, Marco
 - Turrubiates, Miguel

app.php

@@ -0,0 +1,14 @@
+<?php
+
+use Combodo\iTop\DI\ITopKernel;
+use Symfony\Component\HttpFoundation\Request;
+
+require_once('approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+
+$kernel = new ITopKernel('dev', true);
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);

application/cmdbabstract.class.inc.php

@@ -6279,4 +6279,19 @@ JS
 		return $iFlags;
 	}
 
+
+	public function __call($name, $args)
+	{
+		return $this->Get($name);
+	}
+
+	public function __get($property)
+	{
+		return $this->Get($property);
+	}
+
+	public function __set($property, $value): void
+	{
+		$this->Set($property, $value);
+	}
 }

application/datamodel.application.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>

approot.inc.php

@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
  *
  * @see ITOP_CORE_VERSION to get full iTop core version
  */
-define('ITOP_DESIGN_LATEST_VERSION', '3.1');
+define('ITOP_DESIGN_LATEST_VERSION', '3.2');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.1');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.1.0');
+define('ITOP_CORE_VERSION', '3.2.0');
 
 /**
  * @since 3.0.4 N°6274 Allow to test if PHPUnit is currently running. Starting with PHPUnit 9.5 we'll be able to replace it with $GLOBALS['phpunit_version']

composer.json

@@ -4,7 +4,7 @@
   "type": "project",
   "license": "AGPL-3.0-only",
   "require": {
-    "php": ">=7.4.0 <8.2.0",
+    "php": ">=8.1.0 <8.2.0",
     "ext-ctype": "*",
     "ext-dom": "*",
     "ext-gd": "*",
@@ -23,18 +23,21 @@
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "^6.0.0",
     "scssphp/scssphp": "^1.10.3",
-    "symfony/console": "5.4.*",
-    "symfony/dotenv": "5.4.*",
-    "symfony/framework-bundle": "5.4.*",
-    "symfony/http-foundation": "5.4.*",
-    "symfony/http-kernel": "5.4.*",
-    "symfony/twig-bundle": "5.4.*",
-    "symfony/yaml": "5.4.*",
+    "symfony/console": "^6.3",
+    "symfony/dotenv": "^6.3",
+    "symfony/form": "^6.3",
+    "symfony/framework-bundle": " ^6.3",
+    "symfony/http-foundation": "^6.3",
+    "symfony/http-kernel": "^6.3",
+    "symfony/serializer": "^6.3",
+    "symfony/twig-bundle": "^6.3",
+    "symfony/validator": "^6.3",
+    "symfony/yaml": "^6.3",
     "thenetworg/oauth2-azure": "^2.0"
   },
   "require-dev": {
-    "symfony/stopwatch": "5.4.*",
-    "symfony/web-profiler-bundle": "5.4.*"
+    "symfony/stopwatch": "^6.3",
+    "symfony/web-profiler-bundle": "^6.3"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",
@@ -46,7 +49,7 @@
   },
   "config": {
     "platform": {
-      "php": "7.4.0"
+      "php": "8.1.0"
     },
     "vendor-dir": "lib",
     "preferred-install": {

core/attributedef.class.inc.php

@@ -8584,7 +8584,7 @@ class AttributeBlob extends AttributeDefinition
 	public function RecordAttChange(DBObject $oObject, $original, $value): void
 	{
 		// N°6502 Don't record history if only the download count has changed
-		if ($original->EqualsExceptDownloadsCount($value)) {
+		if ($value == null || $original->EqualsExceptDownloadsCount($value)) {
 			return;
 		}
 

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.1.1-dev');
+define('ITOP_VERSION', '3.2.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -105,6 +105,9 @@ class Config
 	//for each conf entry, whether the non interpreted value can be kept in case is is written back to the disk.
 	private $m_aCanOverrideSettings;
 
+	public function GetSettings(){
+		return $this->m_aSettings;
+	}
 	/**
 	 * New way to store the settings !
 	 *
@@ -2868,4 +2871,7 @@ class ConfigPlaceholdersResolver
 		IssueLog::Error($sErrorMessage, self::class, array($sSourceName, $sKey, $sDefault, $sWholeMask));
 		throw new ConfigException($sErrorMessage);
 	}
+
+
+
 }

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -270,7 +270,7 @@
         </fields>
       </class>
     </classes>
-    <attribute_properties_definition  _delta="define">
+    <attribute_properties_definition _delta="define">
       <properties>
         <property id="sql">
           <php_param>sql</php_param>

core/kpi.class.inc.php

@@ -509,4 +509,14 @@ class ExecutionKPI
 		// PHP > 5.2.1 - this verb depends on a compilation option
 		return 0;
 	}
+
+	static public function getExecData()
+	{
+		return self::$m_aExecData;
+	}
+
+	static public function getStats()
+	{
+		return self::$m_aStats;
+	}
 }

core/ormlinkset.class.inc.php

@@ -28,7 +28,7 @@ require_once('dbobjectiterator.php');
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
+class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator, ArrayAccess
 {
 	public const LINK_ALIAS = 'Link';
 	public const REMOTE_ALIAS = 'Remote';
@@ -886,4 +886,45 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	{
 		return $this->oOriginalSet;
 	}
+
+
+	// to allow usage of CollectionType with orm link set
+	// Value needs to implement ArrayAccess
+
+	public function offsetExists($offset) : bool
+	{
+		$aOriginalObjects = array_flip($this->aOriginalObjects);
+		return array_key_exists($offset, $aOriginalObjects);
+	}
+
+	public function offsetGet($offset) : mixed
+	{
+		$aOriginalObjects = array_flip($this->aOriginalObjects);
+		return MetaModel::GetObject($this->sClass, $aOriginalObjects[$offset]);
+	}
+
+	public function offsetSet($offset, $value) : void
+	{
+		$aData = array_flip($this->aPreserved);
+		if(array_key_exists($offset, $aData)){
+			$this->ModifyItem($value);
+		}
+		else{
+			$this->AddItem($value);
+		}
+	}
+
+	public function offsetUnset($offset) : void
+	{
+		$aData = array_flip($this->aPreserved);
+		if(array_key_exists($offset, $aData)){
+			$this->RemoveItem($aData[$offset]);
+		}
+	}
+
+	public function IsDeleted($value) : bool
+	{
+		return (array_key_exists($value->GetKey(), $this->aRemoved));
+	}
 }
+

css/DI/app.css

@@ -0,0 +1,114 @@
+/* body */
+body{
+	font-family: 'Montserrat', serif;
+	padding-top: 64px;
+}
+
+/* app icon dark */
+body[data-bs-theme="dark"] .app_icon{
+	filter: invert(1);
+}
+
+/* navbar actions */
+.navbar-actions button,.navbar-actions a{
+	margin: 0 3px;
+}
+
+/* dropdown */
+.dropdown_scroll_300{
+	max-height: 300px;
+	overflow-y: auto;
+	overflow-x: clip;
+}
+
+/* LAYOUT */
+
+/* row */
+[data-block="row_container"] > div{
+	display: flex;
+}
+
+/* column */
+[data-block="column_container"]{
+	padding: 10px;
+	flex-grow: 1;
+	width: 0;
+}
+
+/* fieldset */
+[data-block="fieldset_container"]{
+	flex-grow: 1;
+}
+[data-block="fieldset_container"] > legend{
+	font-weight: bold;
+	border-bottom: 2px solid #b7b7b7;
+	margin-bottom: 10px;
+}
+[data-block="fieldset_container"] > div{
+	border: #b7b7b7 dashed 1px;
+	padding: 10px;
+	border-radius: 10px;
+}
+
+/* ATTRIBUTES */
+
+/* attribute */
+[data-block="attribute_container"].loading{
+	position: relative;
+}
+[data-block="attribute_container"].loading:after{
+	content: 'loading...';
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	background-color: #0d6efd11;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 10px;
+}
+
+/* FORM */
+
+/* form */
+form{
+	border-radius: 10px;
+	padding: 5px;
+}
+
+/* label */
+form label.required:after{
+	content: ' *';
+	color: red;
+}
+form label.locked:after{
+	content: "\f023";
+	font-family: "Font Awesome 5 Free", serif;
+	font-weight: 600;
+	margin-left: 8px;
+	color: #ffcc00;
+	font-size: .7rem;
+}
+form label.dependent{
+	color: #2757af;
+}
+
+
+/* overriding theme template */
+
+.overriding_text_row{
+	border: 1px solid #00aac1;
+	padding: 15px;
+}
+
+.overriding_text_label{
+	color: #00aac1;
+}
+
+.overriding_text_widget{
+	border: 1px solid #00aac1;
+	border-radius: 20px;
+	outline: none;
+}

datamodels/2.x/authent-cas/datamodel.authent-cas.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants>
   </constants>
   <classes>

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.1.0',
+	'authent-cas/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-cas/src/CASLogger.php

@@ -29,51 +29,51 @@ class CASLogger implements LoggerInterface
 		LogLevel::DEBUG => LogAPI::LEVEL_DEBUG,
 	];
 
-	public function emergency($message, array $context = array())
+	public function emergency($message, array $context = array()): void
 	{
 		CASLog::Error('EMERGENCY: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 		IssueLog::Error('EMERGENCY: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function alert($message, array $context = array())
+	public function alert($message, array $context = array()): void
 	{
 		CASLog::Error('ALERT: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 		IssueLog::Error('ALERT: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function critical($message, array $context = array())
+	public function critical($message, array $context = array()): void
 	{
 		CASLog::Error('CRITICAL: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 		IssueLog::Error('CRITICAL: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function error($message, array $context = array())
+	public function error($message, array $context = array()): void
 	{
 		CASLog::Error('ERROR: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 		IssueLog::Error('ERROR: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function warning($message, array $context = array())
+	public function warning($message, array $context = array()): void
 	{
 		CASLog::Warning('WARNING: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function notice($message, array $context = array())
+	public function notice($message, array $context = array()): void
 	{
 		CASLog::Info('NOTICE: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function info($message, array $context = array())
+	public function info($message, array $context = array()): void
 	{
 		CASLog::Info('INFO: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function debug($message, array $context = array())
+	public function debug($message, array $context = array()): void
 	{
 		CASLog::Debug('DEBUG: '.$message, CASLog::CHANNEL_DEFAULT, $context);
 	}
 
-	public function log($level, $message, array $context = array())
+	public function log($level, $message, array $context = array()): void
 	{
 		$sLevel = self::LEVEL_COMPAT[$level] ?? LogAPI::LEVEL_ERROR;
 		CASLog::Log($sLevel, strtoupper($level).": $message", CASLog::CHANNEL_DEFAULT, $context);

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.1.0',
+	'authent-external/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/3.1.0',
+	'authent-ldap/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-local/datamodel.authent-local.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>

datamodels/2.x/authent-local/module.authent-local.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.1.0',
+	'authent-local/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php

@@ -21,5 +21,5 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'theme:darkmoon' => 'Dark moon~~',
-));
+	'theme:darkmoon' => 'Dark moon',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-darkmoon-theme/3.1.0',
+	'combodo-backoffice-darkmoon-theme/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>30</rank>

datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/3.1.0',
+	'combodo-db-tools/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>

datamodels/2.x/itop-attachments/module.itop-attachments.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/3.1.0',
+	'itop-attachments/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-backup/datamodel.itop-backup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>

datamodels/2.x/itop-backup/module.itop-backup.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/3.1.0',
+	'itop-backup/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToProviderContract" _delta="define">

datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-services/3.1.0',
+	'itop-bridge-cmdb-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToTicket" _delta="define">

datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/3.1.0',
+	'itop-bridge-cmdb-ticket/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="Rack" _delta="must_exist">

datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-datacenter-mgmt-services/3.1.0',
+	'itop-bridge-datacenter-mgmt-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="Phone" _delta="must_exist">

datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-endusers-devices-services/3.1.0',
+	'itop-bridge-endusers-devices-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="SANSwitch" _delta="must_exist">

datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-storage-mgmt-services/3.1.0',
+	'itop-bridge-storage-mgmt-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="Hypervisor" _delta="must_exist">

datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-mgmt-services/3.1.0',
+	'itop-bridge-virtualization-mgmt-services/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/3.1.0',
+	'itop-bridge-virtualization-storage/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -49,20 +49,12 @@
             <value id="approved">approved
               <code>approved</code>
               <rank>60</rank>
-              <style>
-                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                <decoration_classes>fas fa-user-check</decoration_classes>
-              </style>
+              <style><main_color>$ibo-lifecycle-success-state-primary-color</main_color><complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color><decoration_classes>fas fa-user-check</decoration_classes></style>
             </value>
             <value id="assigned">assigned
               <code>assigned</code>
               <rank>40</rank>
-              <style>
-                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                <decoration_classes/>
-              </style>
+              <style><main_color>$ibo-lifecycle-neutral-state-primary-color</main_color><complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color><decoration_classes/></style>
             </value>
             <value id="closed">
               <code>closed</code>
@@ -1296,7 +1288,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2097,7 +2089,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3103,7 +3095,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3801,7 +3793,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <style>

datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/3.1.0',
+	'itop-change-mgmt-itil/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/3.1.0',
+	'itop-change-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="FunctionalCI" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -272,7 +272,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -530,8 +530,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -702,8 +702,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -992,8 +992,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="networkdevicetype_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="networkdevicetype_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1293,8 +1293,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1621,7 +1621,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1797,7 +1797,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1943,7 +1943,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -2145,7 +2145,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2299,7 +2299,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2453,7 +2453,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2607,7 +2607,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2740,7 +2740,7 @@
             <attribute id="system_name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -2872,8 +2872,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="middleware_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="middleware_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3011,8 +3011,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="dbserver_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="dbserver_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3148,8 +3148,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="webserver_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="webserver_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3304,8 +3304,8 @@
             <attribute id="version"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="vendor"></attribute>
-            <attribute id="type"></attribute>
+            <attribute id="vendor"/>
+            <attribute id="type"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -3782,7 +3782,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -4260,7 +4260,6 @@
               <rank>70</rank>
             </item>
           </items>
-
         </summary>
       </presentation>
     </class>
@@ -4372,7 +4371,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="osfamily_name"></attribute>
+            <attribute id="osfamily_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -4561,8 +4560,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="brand_name"></attribute>
-            <attribute id="type"></attribute>
+            <attribute id="brand_name"/>
+            <attribute id="type"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -5425,8 +5424,8 @@
             <attribute id="ip_mask"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="org_name"></attribute>
-            <attribute id="subnet_name"></attribute>
+            <attribute id="org_name"/>
+            <attribute id="subnet_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -5649,7 +5648,7 @@
             <attribute id="vlan_tag"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="org_name"></attribute>
+            <attribute id="org_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -5942,7 +5941,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="ipaddress"></attribute>
+            <attribute id="ipaddress"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -6841,8 +6840,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="owner_name"></attribute>
-            <attribute id="type"></attribute>
+            <attribute id="owner_name"/>
+            <attribute id="type"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/3.1.0',
+	'itop-config-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config/datamodel.itop-config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
       <rank>10</rank>

datamodels/2.x/itop-config/module.itop-config.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/3.1.0',
+	'itop-config/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
     <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
       <rank>60</rank>

datamodels/2.x/itop-core-update/module.itop-core-update.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-core-update/3.1.0',
+	'itop-core-update/3.2.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -213,7 +213,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
             <attribute id="rack_name"/>
           </complementary_attributes>
@@ -419,7 +419,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -585,7 +585,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
@@ -754,7 +754,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="location_name"/>
             <attribute id="rack_name"/>
             <attribute id="powerstart_name"/>

datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php

@@ -18,7 +18,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/3.1.0',
+	'itop-datacenter-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="TelephonyCI" _delta="define">
       <parent>PhysicalDevice</parent>
@@ -15,7 +15,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -173,7 +173,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -343,7 +343,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -533,7 +533,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
             <attribute id="phonenumber"/>
           </complementary_attributes>
         </naming>
@@ -703,7 +703,7 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
+            <attribute id="organization_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -869,8 +869,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1139,8 +1139,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -1339,8 +1339,8 @@
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="location_name"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="location_name"/>
           </complementary_attributes>
         </naming>
         <style>

datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php

@@ -25,7 +25,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/3.1.0',
+	'itop-endusers-devices/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="FAQ" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-faq-light/module.itop-faq-light.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-faq-light/3.1.0',
+	'itop-faq-light/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
 </itop_design>

datamodels/2.x/itop-files-information/module.itop-files-information.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-files-information/3.1.0',
+	'itop-files-information/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Ticket">
       <methods>

datamodels/2.x/itop-full-itil/module.itop-full-itil.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/3.1.0',
+	'itop-full-itil/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants>
   </constants>
   <classes>

datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/3.1.0',
+	'itop-hub-connector/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Incident" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/3.1.0',
+	'itop-incident-mgmt-itil/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="KnownError" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/3.1.0',
+	'itop-knownerror-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <constants/>
   <classes>
     <class id="OAuthClient" _delta="define">

datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-oauth-client/3.1.0',
+	'itop-oauth-client/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design version="3.1">
+<itop_design version="3.2">
   <events>
     <event id="EVENT_DISPLAY_OBJECT_DETAILS" _delta="define">
       <description>An object details is about to be displayed to a user</description>

datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php

@@ -23,9 +23,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Page:Home' => 'Domů',
 	'Page:GoPortalHome' => 'Domů',
 	'Page:GoPreviousPage' => 'Předchozí stránka',
-	'Page:ReloadPage' => 'Reload page~~',
+	'Page:ReloadPage' => 'Reload stránky',
 	'Portal:Button:Submit' => 'Odeslat',
-	'Portal:Button:Apply' => 'Update~~',
+	'Portal:Button:Apply' => 'Aktualizovat',
 	'Portal:Button:Cancel' => 'Zrušit',
 	'Portal:Button:Close' => 'Zavřít',
 	'Portal:Button:Add' => 'Přidat',
@@ -87,7 +87,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 
 // AggregatePageBrick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Brick:Portal:AggregatePage:DefaultTitle' => 'Dashboard~~',
+	'Brick:Portal:AggregatePage:DefaultTitle' => 'Dashboard',
 ));
 
 // BrowseBrick brick
@@ -95,7 +95,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Browse:Name' => 'Procházet položky',
 	'Brick:Portal:Browse:Mode:List' => 'Seznam',
 	'Brick:Portal:Browse:Mode:Tree' => 'Strom',
-	'Brick:Portal:Browse:Mode:Mosaic' => 'Mosaic~~',
+	'Brick:Portal:Browse:Mode:Mosaic' => 'Mozaika',
 	'Brick:Portal:Browse:Action:Drilldown' => 'Rozpad',
 	'Brick:Portal:Browse:Action:View' => 'Podrobnosti',
 	'Brick:Portal:Browse:Action:Edit' => 'Upravit',
@@ -112,16 +112,16 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Manage:Table:NoData' => 'Žádná položka',
 	'Brick:Portal:Manage:Table:ItemActions' => 'Actions~~',
 	'Brick:Portal:Manage:DisplayMode:list' => 'List~~',
-	'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Pie Chart~~',
-	'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Bar Chart',
-	'Brick:Portal:Manage:Others' => 'Others~~',
-	'Brick:Portal:Manage:All' => 'All~~',
-	'Brick:Portal:Manage:Group' => 'Group~~',
-	'Brick:Portal:Manage:fct:count' => 'Total~~',
-	'Brick:Portal:Manage:fct:sum' => 'Sum~~',
-	'Brick:Portal:Manage:fct:avg' => 'Average~~',
-	'Brick:Portal:Manage:fct:min' => 'Min~~',
-	'Brick:Portal:Manage:fct:max' => 'Max~~',
+	'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Koláčový graf',
+	'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Sloupcový graf',
+	'Brick:Portal:Manage:Others' => 'Ostatní',
+	'Brick:Portal:Manage:All' => 'Vše',
+	'Brick:Portal:Manage:Group' => 'Skupina',
+	'Brick:Portal:Manage:fct:count' => 'Celkem',
+	'Brick:Portal:Manage:fct:sum' => 'Suma',
+	'Brick:Portal:Manage:fct:avg' => 'Průměr',
+	'Brick:Portal:Manage:fct:min' => 'Min',
+	'Brick:Portal:Manage:fct:max' => 'Max',
 ));
 
 // ObjectBrick brick
@@ -132,23 +132,23 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
 	'Brick:Portal:Object:Form:Stimulus:Title' => 'Vyplňte prosím následující informace:',
 	'Brick:Portal:Object:Form:Message:Saved' => 'Uloženo',
-	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo~~',
+	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo',
 	'Brick:Portal:Object:Search:Regular:Title' => 'Vybrat %1$s (%2$s)',
 	'Brick:Portal:Object:Search:Hierarchy:Title' => 'Vybrat %1$s (%2$s)',
-	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',
-	'Brick:Portal:Object:Copy:Tooltip' => 'Copy object link~~',
-	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copied~~'
+	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
+	'Brick:Portal:Object:Copy:Tooltip' => 'Zkopíruj odkaz na objekt',
+	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Zkopírováno'
 ));
 
 // CreateBrick brick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Create:Name' => 'Rychlé vytvoření',
-	'Brick:Portal:Create:ChooseType' => 'Please, choose a type~~',
+	'Brick:Portal:Create:ChooseType' => 'Vyberte typ',
 ));
 
 // Filter brick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
 	'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
-	'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
+	'Brick:Portal:Filter:SearchInput:Submit' => 'Vyhledat',
 ));

datamodels/2.x/itop-portal-base/module.itop-portal-base.php

@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/3.1.0', array(
+	'itop-portal-base/3.2.0', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',

datamodels/2.x/itop-portal-base/portal/config/services.yaml

@@ -52,6 +52,8 @@ services:
       $aCombodoPortalInstanceConf:        '%combodo.portal.instance.conf%'
       $sCombodoPortalInstanceAbsoluteUrl: '%env(string:COMBODO_PORTAL_INSTANCE_ABSOLUTE_URL)%'
 
+  Symfony\Component\DependencyInjection\ContainerInterface: '@service_container'
+
   # Makes classes in src/ available to be used as services
   # This creates a service per class whose id is the fully-qualified class name
   Combodo\iTop\Portal\:
@@ -103,6 +105,9 @@ services:
     decorates: 'router'
     arguments: ['@Combodo\iTop\Portal\Routing\UrlGenerator.inner']
 
+  Combodo\iTop\Portal\Helper\UIExtensionsHelper:
+    arguments: ['@service_container']
+
   # Standard services
   combodo.current_contact.photo_url:
     public: true

datamodels/2.x/itop-portal-base/portal/src/Controller/AbstractController.php

@@ -118,4 +118,10 @@ abstract class AbstractController extends SymfonyAbstractController
 
 		return $aRouteDefaults['_controller'];
 	}
+
+
+	protected function get(string $sServiceName)
+	{
+		return $this->container->get($sServiceName);
+	}
 }

datamodels/2.x/itop-portal-base/portal/src/Kernel.php

@@ -43,7 +43,7 @@ class Kernel extends BaseKernel
 	/**
 	 * @return string
 	 */
-	public function getCacheDir()
+	public function getCacheDir() : string
 	{
 		$cacheDir = $_ENV['PORTAL_ID'].'-'.$this->environment;
 
@@ -53,7 +53,7 @@ class Kernel extends BaseKernel
 	/**
 	 * @return string
 	 */
-	public function getLogDir()
+	public function getLogDir() : string
     {
 	    $logDir = $_ENV['PORTAL_ID'] . '-' . $this->environment;
 
@@ -63,7 +63,7 @@ class Kernel extends BaseKernel
 	/**
 	 * @return \Generator|iterable|\Symfony\Component\HttpKernel\Bundle\BundleInterface[]
 	 */
-	public function registerBundles()
+	public function registerBundles() : \Generator
     {
         $contents = require $this->getProjectDir().'/config/bundles.php';
         foreach ($contents as $class => $envs) {
@@ -78,7 +78,7 @@ class Kernel extends BaseKernel
 	 *
 	 * @return void
 	 */
-	protected function configureContainer(ContainerConfigurator $container)
+	protected function configureContainer(ContainerConfigurator $container) : void
 	{
 		$confDir = '../config';
 
@@ -96,7 +96,7 @@ class Kernel extends BaseKernel
 	 *
 	 * @return void
 	 */
-	protected function configureRoutes(RoutingConfigurator $routes)
+	protected function configureRoutes(RoutingConfigurator $routes) : void
 	{
 		$confDir = '../config';
 

datamodels/2.x/itop-portal-base/portal/src/Routing/UrlGenerator.php

@@ -48,7 +48,7 @@ class UrlGenerator implements RouterInterface
 	/**
 	 * @inheritDoc
 	 */
-	public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
+	public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) : string
 	{
 		$parameters = $this->getExtraParams($parameters);
 
@@ -66,7 +66,7 @@ class UrlGenerator implements RouterInterface
 	/**
 	 * @inheritDoc
 	 */
-	public function getContext()
+	public function getContext() : RequestContext
 	{
 		return $this->router->getContext();
 	}
@@ -82,7 +82,7 @@ class UrlGenerator implements RouterInterface
 	/**
 	 * @inheritDoc
 	 */
-	public function match($pathinfo)
+	public function match($pathinfo) : array
 	{
 		return $this->router->match($pathinfo);
 	}

datamodels/2.x/itop-portal-base/portal/vendor/autoload.php

@@ -2,24 +2,6 @@
 
 // autoload.php @generated by Composer
 
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
-        }
-    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
-}
-
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitdf408f3f8ea034d298269cdf7647358b::getLoader();

datamodels/2.x/itop-portal-base/portal/vendor/composer/ClassLoader.php

@@ -42,9 +42,6 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
-    /** @var \Closure(string):void */
-    private static $includeFile;
-
     /** @var ?string */
     private $vendorDir;
 
@@ -109,7 +106,6 @@ class ClassLoader
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
     }
 
     /**
@@ -153,7 +149,7 @@ class ClassLoader
 
     /**
      * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
+     * @psalm-var array<string, string>
      */
     public function getClassMap()
     {
@@ -429,8 +425,7 @@ class ClassLoader
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            $includeFile = self::$includeFile;
-            $includeFile($file);
+            includeFile($file);
 
             return true;
         }
@@ -560,26 +555,18 @@ class ClassLoader
 
         return false;
     }
-
-    /**
-     * @return void
-     */
-    private static function initializeIncludeClosure()
-    {
-        if (self::$includeFile !== null) {
-            return;
-        }
-
-        /**
-         * Scope isolated include.
-         *
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
-    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
+ */
+function includeFile($file)
+{
+    include $file;
 }

datamodels/2.x/itop-portal-base/portal/vendor/composer/InstalledVersions.php

@@ -21,14 +21,12 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
  */
 class InstalledVersions
 {
     /**
      * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
      */
     private static $installed;
 
@@ -39,7 +37,7 @@ class InstalledVersions
 
     /**
      * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     private static $installedByVendor = array();
 
@@ -98,7 +96,7 @@ class InstalledVersions
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
             }
         }
 
@@ -119,7 +117,7 @@ class InstalledVersions
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints((string) $constraint);
+        $constraint = $parser->parseConstraints($constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -243,7 +241,7 @@ class InstalledVersions
 
     /**
      * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
      */
     public static function getRootPackage()
     {
@@ -257,7 +255,7 @@ class InstalledVersions
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
      */
     public static function getRawData()
     {
@@ -280,7 +278,7 @@ class InstalledVersions
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     public static function getAllRawData()
     {
@@ -303,7 +301,7 @@ class InstalledVersions
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
      */
     public static function reload($data)
     {
@@ -313,7 +311,7 @@ class InstalledVersions
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     private static function getInstalled()
     {
@@ -328,9 +326,7 @@ class InstalledVersions
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                    $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
@@ -342,17 +338,12 @@ class InstalledVersions
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
-                $required = require __DIR__ . '/installed.php';
-                self::$installed = $required;
+                self::$installed = require __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();
             }
         }
-
-        if (self::$installed !== array()) {
-            $installed[] = self::$installed;
-        }
+        $installed[] = self::$installed;
 
         return $installed;
     }

datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_classmap.php

@@ -2,66 +2,9 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Combodo\\iTop\\Portal\\Brick\\AbstractBrick' => $baseDir . '/src/Brick/AbstractBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\AggregatePageBrick' => $baseDir . '/src/Brick/AggregatePageBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\BrickCollection' => $baseDir . '/src/Brick/BrickCollection.php',
-    'Combodo\\iTop\\Portal\\Brick\\BrickNotFoundException' => $baseDir . '/src/Brick/BrickNotFoundException.php',
-    'Combodo\\iTop\\Portal\\Brick\\BrowseBrick' => $baseDir . '/src/Brick/BrowseBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\CreateBrick' => $baseDir . '/src/Brick/CreateBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\FilterBrick' => $baseDir . '/src/Brick/FilterBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\ManageBrick' => $baseDir . '/src/Brick/ManageBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\PortalBrick' => $baseDir . '/src/Brick/PortalBrick.php',
-    'Combodo\\iTop\\Portal\\Brick\\PropertyNotFoundException' => $baseDir . '/src/Brick/PropertyNotFoundException.php',
-    'Combodo\\iTop\\Portal\\Brick\\UserProfileBrick' => $baseDir . '/src/Brick/UserProfileBrick.php',
-    'Combodo\\iTop\\Portal\\Controller\\AbstractController' => $baseDir . '/src/Controller/AbstractController.php',
-    'Combodo\\iTop\\Portal\\Controller\\AggregatePageBrickController' => $baseDir . '/src/Controller/AggregatePageBrickController.php',
-    'Combodo\\iTop\\Portal\\Controller\\BrickController' => $baseDir . '/src/Controller/BrickController.php',
-    'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController' => $baseDir . '/src/Controller/BrowseBrickController.php',
-    'Combodo\\iTop\\Portal\\Controller\\CreateBrickController' => $baseDir . '/src/Controller/CreateBrickController.php',
-    'Combodo\\iTop\\Portal\\Controller\\DefaultController' => $baseDir . '/src/Controller/DefaultController.php',
-    'Combodo\\iTop\\Portal\\Controller\\ManageBrickController' => $baseDir . '/src/Controller/ManageBrickController.php',
-    'Combodo\\iTop\\Portal\\Controller\\ObjectController' => $baseDir . '/src/Controller/ObjectController.php',
-    'Combodo\\iTop\\Portal\\Controller\\SessionMessageController' => $baseDir . '/src/Controller/SessionMessageController.php',
-    'Combodo\\iTop\\Portal\\Controller\\UserProfileBrickController' => $baseDir . '/src/Controller/UserProfileBrickController.php',
-    'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\AbstractConfiguration' => $baseDir . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/AbstractConfiguration.php',
-    'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Basic' => $baseDir . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Basic.php',
-    'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Forms' => $baseDir . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Forms.php',
-    'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Lists' => $baseDir . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Lists.php',
-    'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetPluginPropertyClass' => $baseDir . '/src/EventListener/ApplicationContextSetPluginPropertyClass.php',
-    'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetUrlMakerClass' => $baseDir . '/src/EventListener/ApplicationContextSetUrlMakerClass.php',
-    'Combodo\\iTop\\Portal\\EventListener\\CssFromSassCompiler' => $baseDir . '/src/EventListener/CssFromSassCompiler.php',
-    'Combodo\\iTop\\Portal\\EventListener\\ExceptionListener' => $baseDir . '/src/EventListener/ExceptionListener.php',
-    'Combodo\\iTop\\Portal\\EventListener\\UserProvider' => $baseDir . '/src/EventListener/UserProvider.php',
-    'Combodo\\iTop\\Portal\\Form\\ObjectFormManager' => $baseDir . '/src/Form/ObjectFormManager.php',
-    'Combodo\\iTop\\Portal\\Form\\PasswordFormManager' => $baseDir . '/src/Form/PasswordFormManager.php',
-    'Combodo\\iTop\\Portal\\Form\\PreferencesFormManager' => $baseDir . '/src/Form/PreferencesFormManager.php',
-    'Combodo\\iTop\\Portal\\Helper\\ApplicationHelper' => $baseDir . '/src/Helper/ApplicationHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\BrickControllerHelper' => $baseDir . '/src/Helper/BrickControllerHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\BrowseBrickHelper' => $baseDir . '/src/Helper/BrowseBrickHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\ContextManipulatorHelper' => $baseDir . '/src/Helper/ContextManipulatorHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\LifecycleValidatorHelper' => $baseDir . '/src/Helper/LifecycleValidatorHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\NavigationRuleHelper' => $baseDir . '/src/Helper/NavigationRuleHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\ObjectFormHandlerHelper' => $baseDir . '/src/Helper/ObjectFormHandlerHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\RequestManipulatorHelper' => $baseDir . '/src/Helper/RequestManipulatorHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\ScopeValidatorHelper' => $baseDir . '/src/Helper/ScopeValidatorHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\SecurityHelper' => $baseDir . '/src/Helper/SecurityHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\SessionMessageHelper' => $baseDir . '/src/Helper/SessionMessageHelper.php',
-    'Combodo\\iTop\\Portal\\Helper\\UIExtensionsHelper' => $baseDir . '/src/Helper/UIExtensionsHelper.php',
-    'Combodo\\iTop\\Portal\\Kernel' => $baseDir . '/src/Kernel.php',
-    'Combodo\\iTop\\Portal\\Routing\\ItopExtensionsExtraRoutes' => $baseDir . '/src/Routing/ItopExtensionsExtraRoutes.php',
-    'Combodo\\iTop\\Portal\\Routing\\UrlGenerator' => $baseDir . '/src/Routing/UrlGenerator.php',
-    'Combodo\\iTop\\Portal\\Twig\\AppExtension' => $baseDir . '/src/Twig/AppExtension.php',
-    'Combodo\\iTop\\Portal\\Twig\\AppGlobal' => $baseDir . '/src/Twig/AppGlobal.php',
-    'Combodo\\iTop\\Portal\\Twig\\AppVariable' => $baseDir . '/src/Twig/AppVariable.php',
-    'Combodo\\iTop\\Portal\\Twig\\CurrentUserAccessor' => $baseDir . '/src/Twig/CurrentUserAccessor.php',
-    'Combodo\\iTop\\Portal\\UrlMaker\\AbstractPortalUrlMaker' => $baseDir . '/src/UrlMaker/AbstractPortalUrlMaker.php',
-    'Combodo\\iTop\\Portal\\VariableAccessor\\AbstractStringVariableAccessor' => $baseDir . '/src/VariableAccessor/AbstractStringVariableAccessor.php',
-    'Combodo\\iTop\\Portal\\VariableAccessor\\AbstractVariableAccessor' => $baseDir . '/src/VariableAccessor/AbstractVariableAccessor.php',
-    'Combodo\\iTop\\Portal\\VariableAccessor\\CombodoCurrentContactPhotoUrl' => $baseDir . '/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php',
-    'Combodo\\iTop\\Portal\\VariableAccessor\\CombodoPortalInstanceConf' => $baseDir . '/src/VariableAccessor/CombodoPortalInstanceConf.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
 );

datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_psr4.php

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_real.php

@@ -23,13 +23,31 @@ class ComposerAutoloaderInitdf408f3f8ea034d298269cdf7647358b
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitdf408f3f8ea034d298269cdf7647358b', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInitdf408f3f8ea034d298269cdf7647358b', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitdf408f3f8ea034d298269cdf7647358b::getInitializer($loader));
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitdf408f3f8ea034d298269cdf7647358b::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
 
-        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;

datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_static.php

@@ -26,63 +26,6 @@ class ComposerStaticInitdf408f3f8ea034d298269cdf7647358b
     );
 
     public static $classMap = array (
-        'Combodo\\iTop\\Portal\\Brick\\AbstractBrick' => __DIR__ . '/../..' . '/src/Brick/AbstractBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\AggregatePageBrick' => __DIR__ . '/../..' . '/src/Brick/AggregatePageBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\BrickCollection' => __DIR__ . '/../..' . '/src/Brick/BrickCollection.php',
-        'Combodo\\iTop\\Portal\\Brick\\BrickNotFoundException' => __DIR__ . '/../..' . '/src/Brick/BrickNotFoundException.php',
-        'Combodo\\iTop\\Portal\\Brick\\BrowseBrick' => __DIR__ . '/../..' . '/src/Brick/BrowseBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\CreateBrick' => __DIR__ . '/../..' . '/src/Brick/CreateBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\FilterBrick' => __DIR__ . '/../..' . '/src/Brick/FilterBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\ManageBrick' => __DIR__ . '/../..' . '/src/Brick/ManageBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\PortalBrick' => __DIR__ . '/../..' . '/src/Brick/PortalBrick.php',
-        'Combodo\\iTop\\Portal\\Brick\\PropertyNotFoundException' => __DIR__ . '/../..' . '/src/Brick/PropertyNotFoundException.php',
-        'Combodo\\iTop\\Portal\\Brick\\UserProfileBrick' => __DIR__ . '/../..' . '/src/Brick/UserProfileBrick.php',
-        'Combodo\\iTop\\Portal\\Controller\\AbstractController' => __DIR__ . '/../..' . '/src/Controller/AbstractController.php',
-        'Combodo\\iTop\\Portal\\Controller\\AggregatePageBrickController' => __DIR__ . '/../..' . '/src/Controller/AggregatePageBrickController.php',
-        'Combodo\\iTop\\Portal\\Controller\\BrickController' => __DIR__ . '/../..' . '/src/Controller/BrickController.php',
-        'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController' => __DIR__ . '/../..' . '/src/Controller/BrowseBrickController.php',
-        'Combodo\\iTop\\Portal\\Controller\\CreateBrickController' => __DIR__ . '/../..' . '/src/Controller/CreateBrickController.php',
-        'Combodo\\iTop\\Portal\\Controller\\DefaultController' => __DIR__ . '/../..' . '/src/Controller/DefaultController.php',
-        'Combodo\\iTop\\Portal\\Controller\\ManageBrickController' => __DIR__ . '/../..' . '/src/Controller/ManageBrickController.php',
-        'Combodo\\iTop\\Portal\\Controller\\ObjectController' => __DIR__ . '/../..' . '/src/Controller/ObjectController.php',
-        'Combodo\\iTop\\Portal\\Controller\\SessionMessageController' => __DIR__ . '/../..' . '/src/Controller/SessionMessageController.php',
-        'Combodo\\iTop\\Portal\\Controller\\UserProfileBrickController' => __DIR__ . '/../..' . '/src/Controller/UserProfileBrickController.php',
-        'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\AbstractConfiguration' => __DIR__ . '/../..' . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/AbstractConfiguration.php',
-        'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Basic' => __DIR__ . '/../..' . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Basic.php',
-        'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Forms' => __DIR__ . '/../..' . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Forms.php',
-        'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Lists' => __DIR__ . '/../..' . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Lists.php',
-        'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetPluginPropertyClass' => __DIR__ . '/../..' . '/src/EventListener/ApplicationContextSetPluginPropertyClass.php',
-        'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetUrlMakerClass' => __DIR__ . '/../..' . '/src/EventListener/ApplicationContextSetUrlMakerClass.php',
-        'Combodo\\iTop\\Portal\\EventListener\\CssFromSassCompiler' => __DIR__ . '/../..' . '/src/EventListener/CssFromSassCompiler.php',
-        'Combodo\\iTop\\Portal\\EventListener\\ExceptionListener' => __DIR__ . '/../..' . '/src/EventListener/ExceptionListener.php',
-        'Combodo\\iTop\\Portal\\EventListener\\UserProvider' => __DIR__ . '/../..' . '/src/EventListener/UserProvider.php',
-        'Combodo\\iTop\\Portal\\Form\\ObjectFormManager' => __DIR__ . '/../..' . '/src/Form/ObjectFormManager.php',
-        'Combodo\\iTop\\Portal\\Form\\PasswordFormManager' => __DIR__ . '/../..' . '/src/Form/PasswordFormManager.php',
-        'Combodo\\iTop\\Portal\\Form\\PreferencesFormManager' => __DIR__ . '/../..' . '/src/Form/PreferencesFormManager.php',
-        'Combodo\\iTop\\Portal\\Helper\\ApplicationHelper' => __DIR__ . '/../..' . '/src/Helper/ApplicationHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\BrickControllerHelper' => __DIR__ . '/../..' . '/src/Helper/BrickControllerHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\BrowseBrickHelper' => __DIR__ . '/../..' . '/src/Helper/BrowseBrickHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\ContextManipulatorHelper' => __DIR__ . '/../..' . '/src/Helper/ContextManipulatorHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\LifecycleValidatorHelper' => __DIR__ . '/../..' . '/src/Helper/LifecycleValidatorHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\NavigationRuleHelper' => __DIR__ . '/../..' . '/src/Helper/NavigationRuleHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\ObjectFormHandlerHelper' => __DIR__ . '/../..' . '/src/Helper/ObjectFormHandlerHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\RequestManipulatorHelper' => __DIR__ . '/../..' . '/src/Helper/RequestManipulatorHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\ScopeValidatorHelper' => __DIR__ . '/../..' . '/src/Helper/ScopeValidatorHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\SecurityHelper' => __DIR__ . '/../..' . '/src/Helper/SecurityHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\SessionMessageHelper' => __DIR__ . '/../..' . '/src/Helper/SessionMessageHelper.php',
-        'Combodo\\iTop\\Portal\\Helper\\UIExtensionsHelper' => __DIR__ . '/../..' . '/src/Helper/UIExtensionsHelper.php',
-        'Combodo\\iTop\\Portal\\Kernel' => __DIR__ . '/../..' . '/src/Kernel.php',
-        'Combodo\\iTop\\Portal\\Routing\\ItopExtensionsExtraRoutes' => __DIR__ . '/../..' . '/src/Routing/ItopExtensionsExtraRoutes.php',
-        'Combodo\\iTop\\Portal\\Routing\\UrlGenerator' => __DIR__ . '/../..' . '/src/Routing/UrlGenerator.php',
-        'Combodo\\iTop\\Portal\\Twig\\AppExtension' => __DIR__ . '/../..' . '/src/Twig/AppExtension.php',
-        'Combodo\\iTop\\Portal\\Twig\\AppGlobal' => __DIR__ . '/../..' . '/src/Twig/AppGlobal.php',
-        'Combodo\\iTop\\Portal\\Twig\\AppVariable' => __DIR__ . '/../..' . '/src/Twig/AppVariable.php',
-        'Combodo\\iTop\\Portal\\Twig\\CurrentUserAccessor' => __DIR__ . '/../..' . '/src/Twig/CurrentUserAccessor.php',
-        'Combodo\\iTop\\Portal\\UrlMaker\\AbstractPortalUrlMaker' => __DIR__ . '/../..' . '/src/UrlMaker/AbstractPortalUrlMaker.php',
-        'Combodo\\iTop\\Portal\\VariableAccessor\\AbstractStringVariableAccessor' => __DIR__ . '/../..' . '/src/VariableAccessor/AbstractStringVariableAccessor.php',
-        'Combodo\\iTop\\Portal\\VariableAccessor\\AbstractVariableAccessor' => __DIR__ . '/../..' . '/src/VariableAccessor/AbstractVariableAccessor.php',
-        'Combodo\\iTop\\Portal\\VariableAccessor\\CombodoCurrentContactPhotoUrl' => __DIR__ . '/../..' . '/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php',
-        'Combodo\\iTop\\Portal\\VariableAccessor\\CombodoPortalInstanceConf' => __DIR__ . '/../..' . '/src/VariableAccessor/CombodoPortalInstanceConf.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
     );
 

datamodels/2.x/itop-portal-base/portal/vendor/composer/installed.php

@@ -1,22 +1,22 @@
 <?php return array(
     'root' => array(
-        'name' => '__root__',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => 'c9beba0ceadf11c644a8eb1b254efff9b17d804c',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
+        'reference' => '025c5edd153a023e6b851f95196d94eac7c6b598',
+        'name' => '__root__',
         'dev' => true,
     ),
     'versions' => array(
         '__root__' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => 'c9beba0ceadf11c644a8eb1b254efff9b17d804c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
+            'reference' => '025c5edd153a023e6b851f95196d94eac7c6b598',
             'dev_requirement' => false,
         ),
     ),

datamodels/2.x/itop-portal/datamodel.itop-portal.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <portals>
     <portal id="itop-portal" _delta="define">
       <!-- ID must match module_design[id] -->

datamodels/2.x/itop-portal/module.itop-portal.php

@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/3.1.0', array(
+	'itop-portal/3.2.0', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',

datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Problem" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/3.1.0',
+	'itop-problem-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes/>
   <user_rights>
     <groups>

datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-profiles-itil/3.1.0',
+	'itop-profiles-itil/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/3.1.0',
+	'itop-request-mgmt-itil/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>
@@ -21,7 +21,7 @@
             <attribute id="ref"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="title"></attribute>
+            <attribute id="title"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>

datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt/3.1.0',
+	'itop-request-mgmt/3.2.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <classes>
     <class id="Organization">
       <fields>
@@ -1115,8 +1115,8 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="organization_name"></attribute>
-            <attribute id="status"></attribute>
+            <attribute id="organization_name"/>
+            <attribute id="status"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>
@@ -1520,8 +1520,8 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="name"/>
           </attributes>
           <complementary_attributes>
-            <attribute id="service_provider"></attribute>
-            <attribute id="request_type"></attribute>
+            <attribute id="service_provider"/>
+            <attribute id="request_type"/>
           </complementary_attributes>
         </naming>
         <fields_semantic>