Change comments to use same tickets ref syntax

This commit is contained in:
Pierre Goiffon
2018-11-06 17:36:03 +01:00
parent 9ed550ee7f
commit a4055c4a74
8 changed files with 19 additions and 17 deletions

View File

@@ -1,6 +1,7 @@
<?php
use Html2Text\Html2Text;
use Leafo\ScssPhp\Compiler;
// Copyright (C) 2010-2017 Combodo SARL
//
// This file is part of iTop.
@@ -826,7 +827,7 @@ class utils
/**
* Helper to handle the variety of HTTP servers
* See #286 (fixed in [896]), and #634 (this fix)
* See 286 (fixed in [896]), and 634 (this fix)
*
* Though the official specs says 'a non empty string', some servers like IIS do set it to 'off' !
* nginx set it to an empty string

View File

@@ -154,7 +154,7 @@ class WizardHelper
}
else
{
// May happen for security reasons (portal, see ticket #1074)
// May happen for security reasons (portal, see ticket 1074)
$oObj->Set($sAttCode, $value);
}
}

View File

@@ -114,12 +114,12 @@ class CMDBSource
protected static $m_sDBName;
/**
* @var boolean
* @since 2.5 #1260 MySQL TLS first implementation
* @since 2.5 1260 MySQL TLS first implementation
*/
protected static $m_bDBTlsEnabled;
/**
* @var string
* @since 2.5 #1260 MySQL TLS first implementation
* @since 2.5 1260 MySQL TLS first implementation
*/
protected static $m_sDBTlsCA;
@@ -133,7 +133,7 @@ class CMDBSource
* use expression as value)
*
* @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html
* @since 2.5 #1001 switch to utf8mb4
* @since 2.5 1001 switch to utf8mb4
*/
public static function GetSqlStringColumnDefinition()
{
@@ -1042,7 +1042,7 @@ class CMDBSource
* @return string query to upgrade table charset and collation if needed, null if not
* @throws \MySQLException
*
* @since 2.5 #1001 switch to utf8mb4
* @since 2.5 1001 switch to utf8mb4
* @see https://dev.mysql.com/doc/refman/5.7/en/charset-table.html
*/
public static function DBCheckTableCharsetAndCollation($sTableName)
@@ -1192,7 +1192,7 @@ class CMDBSource
* @return string query to upgrade database charset and collation if needed, null if not
* @throws \MySQLException
*
* @since 2.5 #1001 switch to utf8mb4
* @since 2.5 1001 switch to utf8mb4
* @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html
*/
public static function DBCheckCharsetAndCollation()

View File

@@ -167,7 +167,7 @@ class Config
'source_of_value' => '',
'show_in_conf_sample' => false,
),
'db_character_set' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
'db_character_set' => array( // @deprecated to remove in 2.7 ? 1001 utf8mb4 switch
'type' => 'string',
'description' => 'Deprecated since iTop 2.5 : now using utf8mb4',
'default' => 'DEPRECATED_2.5',
@@ -175,7 +175,7 @@ class Config
'source_of_value' => '',
'show_in_conf_sample' => false,
),
'db_collation' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
'db_collation' => array( // @deprecated to remove in 2.7 ? 1001 utf8mb4 switch
'type' => 'string',
'description' => 'Deprecated since iTop 2.5 : now using utf8mb4_unicode_ci',
'default' => 'DEPRECATED_2.5',
@@ -1560,7 +1560,7 @@ class Config
/**
* @return string
*
* @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
* @deprecated 2.5 will be removed in 2.6 1001 utf8mb4 switch
* @see Config::DEFAULT_CHARACTER_SET
*/
public function GetDBCharacterSet()
@@ -1571,7 +1571,7 @@ class Config
/**
* @return string
*
* @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
* @deprecated 2.5 will be removed in 2.6 1001 utf8mb4 switch
* @see Config::DEFAULT_COLLATION
*/
public function GetDBCollation()

View File

@@ -266,7 +266,7 @@ EOF
if ($this->aStatusInfo['charset'] != 'UTF-8')
{
// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
// and thus to convert field by field and not the whole row or file at once (see ticket #991)
// and thus to convert field by field and not the whole row or file at once (see ticket 991)
$aData[$idx] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $aData[$idx]);
}
}
@@ -325,7 +325,7 @@ EOF
if ($this->aStatusInfo['charset'] != 'UTF-8')
{
// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
// and thus to convert field by field and not the whole row or file at once (see ticket #991)
// and thus to convert field by field and not the whole row or file at once (see ticket 991)
$aData[] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $sField);
}
else

View File

@@ -2488,7 +2488,8 @@ abstract class DBObject implements iDisplay
$this->AfterDelete();
$this->m_bIsInDB = false;
// Fix for #926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete objects, reported as bug #926)
// Fix for 926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete
// objects, reported as bug N°926)
// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
}
}

View File

@@ -180,7 +180,7 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the "
/**
* utf8mb4 was added in MySQL 5.5.3 but works with programs like mysqldump only since MySQL 5.5.33
*
* @since 2.5 see #1001
* @since 2.5 see 1001
*/
const MYSQL_VERSION_WITH_UTF8MB4_IN_PROGRAMS = '5.5.33';

View File

@@ -908,7 +908,7 @@ class RunTimeEnvironment
*
* @param string $sQuery
*
* @since 2.5 #1001 utf8mb4 switch
* @since 2.5 1001 utf8mb4 switch
* @uses \SetupUtils::GetSetupQueriesFilePath()
*/
protected function log_db_query($sQuery)