Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

This commit is contained in:
Molkobain
2020-10-14 10:09:14 +02:00
57 changed files with 80 additions and 80 deletions

View File

@@ -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

View File

@@ -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
*/

View File

@@ -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)
{

View File

@@ -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

View File

@@ -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)
{

View File

@@ -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()
{

View File

@@ -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) {

View File

@@ -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)
{

View File

@@ -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);

View File

@@ -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;

View File

@@ -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 :<br>
* @since 3.0.0 N°3198 check duplicates if necessary :<br>
* 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.<br>
* Now we can modify existing entries using the extkey widget, and the widget doesn't have (yet !) such

View File

@@ -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)
{

View File

@@ -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)) {

View File

@@ -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)
{

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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',

View File

@@ -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,

View File

@@ -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

View File

@@ -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',

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__,
'itop-tickets/2.8.0',
'itop-tickets/3.0.0',
array(
// Identification
//

View File

@@ -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
//

View File

@@ -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
//

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<information>
<version>2.8.0</version>
<version>3.0.0</version>
</information>

View File

@@ -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($) {

View File

@@ -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);

View File

@@ -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
* <li>php.ini option : session.save_handler
* </ul>
*
* @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')) {

View File

@@ -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');