diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 646fbafdb..ed599b69c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,23 +52,23 @@ Here are the branches we use and their meaning : For example, if no version is currently prepared for shipping we could have: -- `develop` containing future 2.8.0 version +- `develop` containing future 3.0.0 version - `support/2.7`: 2.7.x maintenance version - `support/2.6`: 2.6.x maintenance version - `support/2.5`: 2.5.x maintenance version -In this example, when 2.8.0-beta is shipped that will become: +In this example, when 3.0.0-beta is shipped that will become: -- `develop`: future 2.9.0 version -- `release/2.8.0`: 2.8.0-beta +- `develop`: future 3.1.0 version +- `release/3.0.0`: 3.0.0-beta - `support/2.7`: 2.7.x maintenance version - `support/2.6`: 2.6.x maintenance version - `support/2.5`: 2.5.x maintenance version -And when 2.8.0 final will be out: +And when 3.0.0 final will be out: -- `develop`: future 2.9.0 version -- `support/2.8`: 2.8.x maintenance version (will host developments for 2.8.1) +- `develop`: future 3.1.0 version +- `support/2.8`: 2.8.x maintenance version (will host developments for 3.0.1) - `support/2.7`: 2.7.x maintenance version - `support/2.6`: 2.6.x maintenance version - `support/2.5`: 2.5.x maintenance version diff --git a/application/applicationcontext.class.inc.php b/application/applicationcontext.class.inc.php index 87c02b1fa..e0e6f89a4 100644 --- a/application/applicationcontext.class.inc.php +++ b/application/applicationcontext.class.inc.php @@ -205,7 +205,7 @@ class ApplicationContext return implode("&", $aParams); } /** - * @since 2.8.0 N°2534 - dashboard: bug with autorefresh that deactivates filtering on organisation + * @since 3.0.0 N°2534 - dashboard: bug with autorefresh that deactivates filtering on organisation * Returns the params as c[menu]:..., c[org_id]:.... * @return string The params */ diff --git a/application/themehandler.class.inc.php b/application/themehandler.class.inc.php index fe85a3440..db5134d59 100644 --- a/application/themehandler.class.inc.php +++ b/application/themehandler.class.inc.php @@ -337,7 +337,7 @@ CSS; * @param string $sThemeId : used only for logging purpose * * @return array complete path of the images, but with slashes as dir separator instead of DIRECTORY_SEPARATOR - * @since 2.8.0 + * @since 3.0.0 */ public static function GetIncludedImages($aThemeParametersVariables, $aStylesheetFiles, $sThemeId) { diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php index e1382f0f3..cb2d3d079 100644 --- a/application/ui.extkeywidget.class.inc.php +++ b/application/ui.extkeywidget.class.inc.php @@ -120,7 +120,7 @@ class UIExtKeyWidget } /** - * @since 2.8.0 N°2508 - Include Obsolescence icon within list and autocomplete + * @since 3.0.0 N°2508 - Include Obsolescence icon within list and autocomplete * Get the HTML fragment corresponding to the ext key editing widget * @param WebPage $oP The web page used for all the output * @param array $aArgs Extra context arguments @@ -322,7 +322,7 @@ JS } /** - * @since 2.8.0 N°2508 - Include Obsolescence icon within list and autocomplete + * @since 3.0.0 N°2508 - Include Obsolescence icon within list and autocomplete * Get the HTML fragment corresponding to the ext key editing widget * @param WebPage $oP The web page used for all the output * @param array $aArgs Extra context arguments diff --git a/application/utils.inc.php b/application/utils.inc.php index f24fbf0d1..412c4d769 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -2409,7 +2409,7 @@ class utils * @param \Exception $oException * * @throws \Exception - * @since 2.7.2/ 2.8.0 + * @since 2.7.2/ 3.0.0 */ public static function EnrichRaisedException($oCmdbAbstract, $oException) { diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php index bb3bcc578..a58f5d7fd 100644 --- a/application/wizardhelper.class.inc.php +++ b/application/wizardhelper.class.inc.php @@ -346,7 +346,7 @@ class WizardHelper /** * @return string JS code to be executed for fields update - * @since 2.8.0 N°3198 + * @since 3.0.0 N°3198 */ public function GetJsForUpdateFields() { diff --git a/bootstrap.inc.php b/bootstrap.inc.php index f61a88ed1..b9bfd5835 100644 --- a/bootstrap.inc.php +++ b/bootstrap.inc.php @@ -25,7 +25,7 @@ * This is a hard-coded check that limits errors : we are stopping for anything < PHP 7.0.0 * The "real one" will be done in {@link \SetupUtils::CheckPhpVersion()} * - * @since 2.8.0 N°2214 + * @since 3.0.0 N°2214 */ $bIsValidPhpVersion = false; if (PHP_MAJOR_VERSION >= 7) { diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index dbe00d1f9..11d81d06c 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -553,7 +553,7 @@ abstract class CMDBObject extends DBObject * @param $iActionCode * * @throws \SecurityException - * @deprecated in 2.8.0 will be removed in 2.9 + * @deprecated in 3.0.0 will be removed in 2.9 */ protected function CheckUserRights($bSkipStrongSecurity, $iActionCode) { diff --git a/core/config.class.inc.php b/core/config.class.inc.php index c661107b7..54c2da741 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -22,7 +22,7 @@ define('ITOP_APPLICATION', 'iTop'); define('ITOP_APPLICATION_SHORT', 'iTop'); -define('ITOP_VERSION', '2.8.0-dev'); +define('ITOP_VERSION', '3.0.0-dev'); define('ITOP_REVISION', 'svn'); define('ITOP_BUILD_DATE', '$WCNOW$'); define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION); diff --git a/core/coreexception.class.inc.php b/core/coreexception.class.inc.php index 7188446c7..80b4e18ec 100644 --- a/core/coreexception.class.inc.php +++ b/core/coreexception.class.inc.php @@ -85,7 +85,7 @@ class CoreException extends Exception * getTraceAsString() cannot be overrided and it is limited as only current exception stack is returned. * we need stack of all previous exceptions * @uses __tostring() already does the work. - * @since 2.7.2/ 2.8.0 + * @since 2.7.2/ 3.0.0 */ public function getFullStackTraceAsString(){ return "" . $this; diff --git a/core/dbobject.class.php b/core/dbobject.class.php index b68da7eb4..f6eb94566 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -2121,7 +2121,7 @@ abstract class DBObject implements iDisplay * * @uses m_aCheckWarnings to log to user duplicates found * - * @since 2.8.0 N°3198 check duplicates if necessary :
+ * @since 3.0.0 N°3198 check duplicates if necessary :
* Before we could only add or remove lnk using the uilinks widget. This widget has a filter based on existing values, and so * forbids to add duplicates.
* Now we can modify existing entries using the extkey widget, and the widget doesn't have (yet !) such diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 2fba90935..9153460d9 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -1933,7 +1933,7 @@ abstract class MetaModel * * @return \AttributeDefinition[] list of attdefs to display by default for the remote class * - * @since 2.8.0 N°2334 + * @since 3.0.0 N°2334 */ public static function GetZListAttDefsFilteredForIndirectRemoteClass($sRemoteClass) { @@ -1961,7 +1961,7 @@ abstract class MetaModel * @return \AttributeDefinition[] list of attdefs to display by default for lnk class * * @throws \CoreException - * @since 2.8.0 N°2334 + * @since 3.0.0 N°2334 */ public static function GetZListAttDefsFilteredForIndirectLinkClass($sClass, $sAttCode) { diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php index 1c7773f90..cda6e5140 100644 --- a/core/oql/expression.class.inc.php +++ b/core/oql/expression.class.inc.php @@ -31,7 +31,7 @@ class ExpressionHelper { * * @uses \DBSearch::AllowAllData() * - * @since 2.7.2 2.8.0 N°3324 + * @since 2.7.2 3.0.0 N°3324 */ public static function ExpressionAllowAllDataCallback($oExpression, $bAllowAllData) { if (!($oExpression instanceof NestedQueryExpression)) { diff --git a/core/ormlinkset.class.inc.php b/core/ormlinkset.class.inc.php index 8bc982930..7a307c129 100644 --- a/core/ormlinkset.class.inc.php +++ b/core/ormlinkset.class.inc.php @@ -795,7 +795,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator * @throws \MySQLException * @throws \Exception * - * @since 2.8.0 N°2334 returns both lnk and remote classes for indirect relations + * @since 3.0.0 N°2334 returns both lnk and remote classes for indirect relations */ public function ToDBObjectSet($bShowObsolete = true) { diff --git a/datamodels/2.x/authent-cas/module.authent-cas.php b/datamodels/2.x/authent-cas/module.authent-cas.php index 39c70f50a..2e5ffd9b4 100644 --- a/datamodels/2.x/authent-cas/module.authent-cas.php +++ b/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/2.8.0', + 'authent-cas/3.0.0', array( // Identification // diff --git a/datamodels/2.x/authent-external/module.authent-external.php b/datamodels/2.x/authent-external/module.authent-external.php index e0a0cd6c5..735fe4ce3 100755 --- a/datamodels/2.x/authent-external/module.authent-external.php +++ b/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/2.8.0', + 'authent-external/3.0.0', array( // Identification // diff --git a/datamodels/2.x/authent-ldap/module.authent-ldap.php b/datamodels/2.x/authent-ldap/module.authent-ldap.php index 4a3d5cdc4..7c76826fa 100755 --- a/datamodels/2.x/authent-ldap/module.authent-ldap.php +++ b/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/2.8.0', + 'authent-ldap/3.0.0', array( // Identification // diff --git a/datamodels/2.x/authent-local/module.authent-local.php b/datamodels/2.x/authent-local/module.authent-local.php index 1dd520fbf..e23778e36 100755 --- a/datamodels/2.x/authent-local/module.authent-local.php +++ b/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/2.8.0', + 'authent-local/3.0.0', array( // Identification // diff --git a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php index c123b4204..dca3cfc9d 100644 --- a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php +++ b/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/2.8.0', + 'combodo-db-tools/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-attachments/module.itop-attachments.php b/datamodels/2.x/itop-attachments/module.itop-attachments.php index e348615ac..3d3448b33 100644 --- a/datamodels/2.x/itop-attachments/module.itop-attachments.php +++ b/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/2.8.0', + 'itop-attachments/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-backup/module.itop-backup.php b/datamodels/2.x/itop-backup/module.itop-backup.php index ca0c58182..c684e5abb 100644 --- a/datamodels/2.x/itop-backup/module.itop-backup.php +++ b/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/2.8.0', + 'itop-backup/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php index 6cd6061d9..6940defe5 100644 --- a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php +++ b/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/2.8.0', + 'itop-bridge-cmdb-ticket/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php index e3c7adba1..9e08d26b3 100644 --- a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php +++ b/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/2.8.0', + 'itop-bridge-virtualization-storage/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php index e7f47f384..9dab35300 100755 --- a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php +++ b/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/2.8.0', + 'itop-change-mgmt-itil/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php index a095feebc..873b32c2f 100755 --- a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php +++ b/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/2.8.0', + 'itop-change-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php index 04d9ca05c..db6c5e8dc 100755 --- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php +++ b/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/2.8.0', + 'itop-config-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-config/module.itop-config.php b/datamodels/2.x/itop-config/module.itop-config.php index cddfe4c3f..cc0a62759 100644 --- a/datamodels/2.x/itop-config/module.itop-config.php +++ b/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/2.8.0', + 'itop-config/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-core-update/module.itop-core-update.php b/datamodels/2.x/itop-core-update/module.itop-core-update.php index e3dd60013..97b61903d 100644 --- a/datamodels/2.x/itop-core-update/module.itop-core-update.php +++ b/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/2.8.0', + 'itop-core-update/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php index 7998563a7..8a0f3fac6 100755 --- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php +++ b/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/2.8.0', + 'itop-datacenter-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php index 97f31ed1d..4b4104b2a 100644 --- a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php +++ b/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/2.8.0', + 'itop-endusers-devices/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php index 5b27be69c..a4545ed3e 100755 --- a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php +++ b/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/2.8.0', + 'itop-faq-light/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-files-information/module.itop-files-information.php b/datamodels/2.x/itop-files-information/module.itop-files-information.php index 15080edfd..d7eae07ab 100644 --- a/datamodels/2.x/itop-files-information/module.itop-files-information.php +++ b/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/2.8.0', + 'itop-files-information/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php index bd7e5a7d2..cae844eca 100644 --- a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php +++ b/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/2.8.0', + 'itop-full-itil/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php index 6edc0d6d9..54ae967e9 100644 --- a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php +++ b/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/2.8.0', + 'itop-hub-connector/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php index 8fe0ff2c7..1af6b2190 100755 --- a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php +++ b/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/2.8.0', + 'itop-incident-mgmt-itil/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php b/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php index 76ea04922..ec75d5b3f 100755 --- a/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php +++ b/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-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-knownerror-light/2.8.0', + 'itop-knownerror-light/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php index 35c6a6238..7f38a8030 100644 --- a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php +++ b/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/2.8.0', array( + 'itop-portal-base/3.0.0', array( // Identification 'label' => 'Portal Development Library', 'category' => 'Portal', diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php index 2cc60346e..5118c492a 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php @@ -373,7 +373,7 @@ class UserProfileBrickController extends BrickController $aFormData['error'] = $e->GetMessage(); } - // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8 + // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 3.0 $aFormData['picture_url'] = $oUrlGenerator->generate('p_object_document_display', array('sObjectClass' => get_class($oCurContact), 'sObjectId' => $oCurContact->GetKey(), 'sObjectField' => $sPictureAttCode, 'cache' => 86400, 't' => time())); $aFormData['validation'] = array( 'valid' => true, diff --git a/datamodels/2.x/itop-portal-base/portal/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php b/datamodels/2.x/itop-portal-base/portal/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php index 423c4159f..a23f6e6ab 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php +++ b/datamodels/2.x/itop-portal-base/portal/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php @@ -111,7 +111,7 @@ class CombodoCurrentContactPhotoUrl $oImage = $oContact->Get($sPictureAttCode); if (is_object($oImage) && !$oImage->IsEmpty()) { - // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8 + // TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 3.0 $sContactPhotoUrl = $this->oContainer->get('url_generator')->generate('p_object_document_display', array('sObjectClass' => get_class($oContact), 'sObjectId' => $oContact->GetKey(), 'sObjectField' => $sPictureAttCode, 'cache' => 86400)); } else diff --git a/datamodels/2.x/itop-portal/module.itop-portal.php b/datamodels/2.x/itop-portal/module.itop-portal.php index b72360256..e5bce49a2 100644 --- a/datamodels/2.x/itop-portal/module.itop-portal.php +++ b/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/2.8.0', array( + 'itop-portal/3.0.0', array( // Identification 'label' => 'Enhanced Customer Portal', 'category' => 'Portal', diff --git a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php index fc5d0d2c7..9b5f5124f 100755 --- a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php +++ b/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/2.8.0', + 'itop-problem-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php index 31497e2d9..be81b84b6 100755 --- a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php +++ b/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/2.8.0', + 'itop-profiles-itil/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php index b8be07884..03638c285 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php +++ b/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/2.8.0', + 'itop-request-mgmt-itil/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php index 95f7de4ac..be678f32b 100755 --- a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php +++ b/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/2.8.0', + 'itop-request-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php index 28b13a49b..8d4653349 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php +++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.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-service-mgmt-provider/2.8.0', + 'itop-service-mgmt-provider/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php index 3ce59e497..94a462be6 100755 --- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php +++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-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-service-mgmt/2.8.0', + 'itop-service-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php index c1f0829c9..65599fb37 100755 --- a/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php +++ b/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.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-sla-computation/2.8.0', + 'itop-sla-computation/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php index a49cc7135..5d39fe69d 100644 --- a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php +++ b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.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-storage-mgmt/2.8.0', + 'itop-storage-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php index 5576249fb..838fa5b50 100644 --- a/datamodels/2.x/itop-structure/module.itop-structure.php +++ b/datamodels/2.x/itop-structure/module.itop-structure.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-structure/2.8.0', + 'itop-structure/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php index 4fc4e1c2d..bb793ca90 100755 --- a/datamodels/2.x/itop-tickets/module.itop-tickets.php +++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php @@ -3,7 +3,7 @@ SetupWebPage::AddModule( __FILE__, - 'itop-tickets/2.8.0', + 'itop-tickets/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php index 061a5c423..7c3a54d48 100644 --- a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php +++ b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php @@ -16,7 +16,7 @@ SetupWebPage::AddModule( __FILE__, // Path to the current file, all other file names are relative to the directory containing this file - 'itop-virtualization-mgmt/2.8.0', + 'itop-virtualization-mgmt/3.0.0', array( // Identification // diff --git a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php index 01bf82956..2a2f87486 100755 --- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php +++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-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-welcome-itil/2.8.0', + 'itop-welcome-itil/3.0.0', array( // Identification // diff --git a/datamodels/2.x/version.xml b/datamodels/2.x/version.xml index 5f5ac5376..966dd4519 100755 --- a/datamodels/2.x/version.xml +++ b/datamodels/2.x/version.xml @@ -1,4 +1,4 @@ - 2.8.0 + 3.0.0 diff --git a/js/jquery.autocomplete.js b/js/jquery.autocomplete.js index ced30419b..2085250bc 100644 --- a/js/jquery.autocomplete.js +++ b/js/jquery.autocomplete.js @@ -13,7 +13,7 @@ * patched by sabello to : replace .size() to length * set the row response split to "\t" * - * @since 2.8.0 N°2284 replaced by JQuery UI Autocomplete Widget, but kept for legacy code in modules + * @since 3.0.0 N°2284 replaced by JQuery UI Autocomplete Widget, but kept for legacy code in modules */ ;(function($) { diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index a57ff0a3f..fa9a9f48a 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -150,27 +150,27 @@ class SetupPage extends NiceWebPage return parent::output(); } - //@deprecated since 2.8.0 use SetupLog::Error + //@deprecated since 3.0.0 use SetupLog::Error public static function log_error($sText) { SetupLog::Error($sText); } - //@deprecated since 2.8.0 use SetupLog::Warning + //@deprecated since 3.0.0 use SetupLog::Warning public static function log_warning($sText) { SetupLog::Warning($sText); } - //@deprecated since 2.8.0 use SetupLog::Info + //@deprecated since 3.0.0 use SetupLog::Info public static function log_info($sText) { SetupLog::Info($sText); } - //@deprecated since 2.8.0 use SetupLog::Ok + //@deprecated since 3.0.0 use SetupLog::Ok public static function log_ok($sText) { SetupLog::Ok($sText); } - //@deprecated since 2.8.0 use SetupLog::Ok + //@deprecated since 3.0.0 use SetupLog::Ok public static function log($sText) { SetupLog::Ok($sText); diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 341d90e08..39e5696dc 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -41,7 +41,7 @@ class CheckResult { /** * @return string - * @since 2.8.0 N°2214 + * @since 3.0.0 N°2214 */ public function __toString(): string { $sPrintDesc = (empty($this->sDescription)) ? '' : " ({$this->sDescription})"; @@ -55,7 +55,7 @@ class CheckResult { * * @return \CheckResult[] only elements that have one of the passed severity * - * @since 2.8.0 N°2214 + * @since 3.0.0 N°2214 */ public static function FilterCheckResultArray(array $aResults, array $aCheckResultSeverities): array { return array_filter($aResults, @@ -75,7 +75,7 @@ class CheckResult { * @return string[] * @uses \CheckResult::__toString * - * @since 2.8.0 N°2214 + * @since 3.0.0 N°2214 */ public static function FromObjectsToStrings(array $aResults): array { return array_map(static function ($value) { @@ -129,8 +129,8 @@ class SetupUtils *
  • php.ini option : session.save_handler * * - * @since 2.8.0 N°2214 disable some checks when in CLI mode - * @since 2.8.0 N°2214 replace SetupLog::Ok calls by CheckResult::TRACE + * @since 3.0.0 N°2214 disable some checks when in CLI mode + * @since 3.0.0 N°2214 replace SetupLog::Ok calls by CheckResult::TRACE */ public static function CheckPhpAndExtensions() { $aResult = array(); @@ -409,7 +409,7 @@ class SetupUtils * @uses \IssueLog::Error() * @uses \exit() * - * @since 2.8.0 N°2214 Add PHP version checks in CLI scripts + * @since 3.0.0 N°2214 Add PHP version checks in CLI scripts */ public static function CheckPhpAndExtensionsForCli($oCliPage, $iExitCode = -1) { $aPhpCheckResults = self::CheckPhpAndExtensions(); @@ -436,7 +436,7 @@ class SetupUtils /** * @param CheckResult[] $aResult checks log * - * @since 2.8.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE + * @since 3.0.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE */ private static function CheckPhpVersion(array &$aResult) { $aResult[] = new CheckResult(CheckResult::TRACE, 'Info - CheckPHPVersion'); @@ -482,7 +482,7 @@ class SetupUtils * * @return array * - * @since 2.8.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE + * @since 3.0.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE */ public static function CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules) { $aResult = array(); @@ -510,7 +510,7 @@ class SetupUtils * * @return \CheckResult[] An array of CheckResults objects * - * @since 2.8.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE + * @since 3.0.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE */ public static function CheckBackupPrerequisites($sDBBackupPath, $sMySQLBinDir = null) { $aResult = array(); @@ -595,7 +595,7 @@ class SetupUtils * @return CheckResult[] The result of the check AS CheckResult::INFO or CheckResult::WARNING, plus debug traces as some * CheckResult::TRACE * - * @since 2.8.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE + * @since 3.0.0 N°2214 replace SetupLog::Log calls by CheckResult::TRACE */ public static function CheckGraphviz($sGraphvizPath) { $aResult = []; @@ -653,7 +653,7 @@ class SetupUtils * * @return string * - * @since 2.8.0 + * @since 3.0.0 */ private static function GetStringForJsonEncode(string $sValue, string $sFallbackValue): string { return (json_encode($sValue) !== false) @@ -2109,7 +2109,7 @@ JS * @param string $sText * * @since 2.7.0 N°2240 Maintenance mode - * @since 2.8.0 N°2522 uses SetupLog instead of SetupPage (but still uses SetupPage for setup/console detection) + * @since 3.0.0 N°2522 uses SetupLog instead of SetupPage (but still uses SetupPage for setup/console detection) */ private static function Log($sText) { if (class_exists('SetupPage')) { diff --git a/test/core/DBSearchTest.php b/test/core/DBSearchTest.php index 839c2feae..9127fe89f 100644 --- a/test/core/DBSearchTest.php +++ b/test/core/DBSearchTest.php @@ -696,7 +696,7 @@ class DBSearchTest extends ItopDataTestCase } /** - * @since 2.7.2 2.8.0 N°3324 + * @since 2.7.2 3.0.0 N°3324 */ public function testAllowAllData() { $oSimpleSearch = \DBObjectSearch::FromOQL('SELECT FunctionalCI');