Commit a4305d7e authored by Cédric Anne's avatar Cédric Anne Committed by Johan Cwiklinski
Browse files

Rename x.x to 10.0

parent bc7e28f5
......@@ -3,7 +3,7 @@
The present file will list all changes made to the project; according to the
[Keep a Changelog](http://keepachangelog.com/) project.
## [x.x.x] unreleased
## [10.0.0] unreleased
### Added
- Added UUID to all other itemtypes that are related to Operating Systems (Phones, Printers, etc)
......
......@@ -38,7 +38,7 @@ use GuzzleHttp\Client as Guzzle_Client;
use GuzzleHttp\Psr7\Response;
/**
* @since x.x.x
* @since 10.0.0
**/
class Agent extends CommonDBTM {
......
......@@ -2650,7 +2650,7 @@ abstract class API {
/**
* Get network ports
*
* @since x.x.x
* @since 10.0.0
*
* @param int $id Id of the source item
* @param string $itemtype Type of the source item
......
......@@ -198,7 +198,7 @@ class Calendar extends CommonDropdown {
*
* @param array $options Array of new values to set
* @return boolean True on success or false on failure
* @deprecated x.x.x Use the {@link \Glpi\Features\Clonable} trait instead
* @deprecated 10.0.0 Use the {@link \Glpi\Features\Clonable} trait instead
*/
function duplicate($options = []) {
......
......@@ -35,7 +35,7 @@ if (!defined('GLPI_ROOT')) {
}
/**
* @since x.x.x
* @since 10.0.0
*/
class CleanSoftwareCron extends CommonDBTM
{
......
......@@ -1254,7 +1254,7 @@ class CommonDBTM extends CommonGLPI {
* @param boolean $history do history log ? (true by default)
*
* @return integer the new ID of the clone (or false if fail)
* @deprecated x.x.x Use the {@link \Glpi\Features\Clonable} trait instead
* @deprecated 10.0.0 Use the {@link \Glpi\Features\Clonable} trait instead
*/
function clone(array $override_input = [], bool $history = true) {
global $DB, $CFG_GLPI;
......@@ -1429,7 +1429,7 @@ class CommonDBTM extends CommonGLPI {
* @param array $input datas used to add the item
*
* @return array the modified $input array
* @deprecated x.x.x Use the {@link \Glpi\Features\Clonable} trait
* @deprecated 10.0.0 Use the {@link \Glpi\Features\Clonable} trait
**/
function prepareInputForClone($input) {
\Toolbox::deprecated();
......@@ -1461,7 +1461,7 @@ class CommonDBTM extends CommonGLPI {
* @param $history do history log ?
*
* @return void
* @deprecated x.x.x Use the {@link \Glpi\Features\Clonable} trait
* @deprecated 10.0.0 Use the {@link \Glpi\Features\Clonable} trait
**/
function post_clone($source, $history) {
\Toolbox::deprecated();
......
......@@ -33,7 +33,7 @@
/**
* Base class for recurrent tickets and changes
*
* @since x.x.x
* @since 10.0.0
*/
abstract class CommonITILRecurrent extends CommonDropdown
{
......
......@@ -33,7 +33,7 @@
/**
* Cron task creating recurrent tickets and changes
*
* @since x.x.x
* @since 10.0.0
*/
class CommonITILRecurrentCron extends CommonDBTM
{
......
......@@ -2637,7 +2637,7 @@ class Config extends CommonDBTM {
*
* @return boolean True for success, false if an error occured
*
* @since x.x.x Parameter $older_to_latest is not longer used.
* @since 10.0.0 Parameter $older_to_latest is not longer used.
*/
public static function loadLegacyConfiguration() {
......@@ -3414,7 +3414,7 @@ class Config extends CommonDBTM {
/**
* Security form related to management entries.
*
* @since x.x.x
* @since 10.0.0
*
* @return void|boolean (display) Returns false if there is a rights error.
*/
......
......@@ -188,8 +188,8 @@ class UpdateCommand extends AbstractCommand implements ForceNoPluginsOptionComma
} else if ($force) {
// Replay last update script even if there is no schema change.
// It can be used in dev environment when update script has been updated/fixed.
include_once(GLPI_ROOT . '/install/update_95_xx.php');
update95toXX();
include_once(GLPI_ROOT . '/install/update_95_100.php');
update95to100();
$output->writeln('<info>' . __('Last migration replayed.') . '</info>');
}
......
......@@ -41,7 +41,7 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
/**
* This exception is used to easilly trigger an exit of current command from a sub method.
*
* @since x.x.x
* @since 10.0.0
*/
class EarlyExitException extends \Exception implements ExceptionInterface {
......
......@@ -106,7 +106,7 @@ class DBConnection extends CommonDBTM {
*
* @return boolean
*
* @since x.x.x
* @since 10.0.0
*/
static function updateConfigProperty($name, $value, $update_slave = true, string $config_dir = GLPI_CONFIG_DIR): bool {
$main_config_file = 'config_db.php';
......@@ -611,7 +611,7 @@ class DBConnection extends CommonDBTM {
*
* @return void
*
* @since x.x.x
* @since 10.0.0
*/
public static function setConnectionCharset(mysqli $dbh, bool $use_utf8mb4): void {
$charset = $use_utf8mb4 ? 'utf8mb4' : 'utf8';
......@@ -639,7 +639,7 @@ class DBConnection extends CommonDBTM {
*
* @return string
*
* @since x.x.x
* @since 10.0.0
*/
public static function getDefaultCharset(): string {
global $DB;
......@@ -656,7 +656,7 @@ class DBConnection extends CommonDBTM {
*
* @return string
*
* @since x.x.x
* @since 10.0.0
*/
public static function getDefaultCollation(): string {
global $DB;
......
......@@ -1331,7 +1331,7 @@ class DBmysql {
/**
* Truncate table in the database
*
* @since x.x.x
* @since 10.0.0
*
* @param string $table Table name
*
......@@ -1346,7 +1346,7 @@ class DBmysql {
* Truncate table in the database or die
* (optionally with a message) if it fails
*
* @since x.x.x
* @since 10.0.0
*
* @param string $table Table name
* @param string $message Explanation of query (default '')
......@@ -1381,7 +1381,7 @@ class DBmysql {
*
* @return array
*
* @deprecated x.x.x
* @deprecated 10.0.0
*/
public function getTableSchema($table, $structure = null) {
Toolbox::deprecated();
......
......@@ -31,7 +31,7 @@
*/
// Current version of GLPI
define('GLPI_VERSION', '9.5.4');
define('GLPI_VERSION', '10.0.0-dev');
if (substr(GLPI_VERSION, -4) === '-dev') {
//for dev version
define('GLPI_PREVER', str_replace('-dev', '', GLPI_VERSION));
......@@ -41,7 +41,7 @@ if (substr(GLPI_VERSION, -4) === '-dev') {
);
} else {
//for stable version
define("GLPI_SCHEMA_VERSION", '9.5.4');
define("GLPI_SCHEMA_VERSION", '10.0.0');
}
define('GLPI_MIN_PHP', '7.3.0'); // Must also be changed in top of index.php
define('GLPI_YEAR', '2021');
......
......@@ -60,7 +60,7 @@ trait Clonable {
*
* @return array
*
* @since x.x.x
* @since 10.0.0
*/
private function cleanCloneInput(array $input): array {
$properties_to_clean = [
......@@ -87,7 +87,7 @@ trait Clonable {
*
* @return void
*
* @since x.x.x
* @since 10.0.0
*/
private function cloneRelations(CommonDBTM $source, bool $history): void {
$clone_relations = $this->getCloneRelations();
......@@ -119,7 +119,7 @@ trait Clonable {
* Prepare input datas for cloning the item.
* This empty method is meant to be redefined in objects that need a specific prepareInputForClone logic.
*
* @since x.x.x
* @since 10.0.0
*
* @param array $input datas used to add the item
*
......@@ -132,7 +132,7 @@ trait Clonable {
/**
* Clones the current item
*
* @since x.x.x
* @since 10.0.0
*
* @param array $override_input custom input to override
* @param boolean $history do history log ?
......
......@@ -4069,7 +4069,7 @@ JAVASCRIPT
*
* @return $content
*
* @deprecated x.x.x
* @deprecated 10.0.0
**/
static function setRichTextContent($name, $content, $rand, $readonly = false) {
......@@ -5586,7 +5586,7 @@ JAVASCRIPT;
* - editor_id the dom id of the tinymce editor
* @return string The Html
*
* @deprecated x.x
* @deprecated 10.0.0
*/
static function fileForRichText($options = []) {
Toolbox::deprecated();
......
......@@ -2035,7 +2035,7 @@ class MailCollector extends CommonDBTM {
*
* @param Message $message
*
* @since x.x.x
* @since 10.0.0
*
* @return bool
*/
......
......@@ -35,7 +35,7 @@ if (!defined('GLPI_ROOT')) {
}
/// OCS Rules class
// @deprecated x.x.x @see RuleImportAsset
// @deprecated 10.0.0 @see RuleImportAsset
class RuleImportComputer extends Rule {
const RULE_ACTION_LINK_OR_IMPORT = 0;
......
......@@ -35,7 +35,7 @@ if (!defined('GLPI_ROOT')) {
}
/// Import rules collection class
// @deprecated x.x.x @see RuleImportAssetCollection
// @deprecated 10.0.0 @see RuleImportAssetCollection
class RuleImportComputerCollection extends RuleCollection {
// From RuleCollection
......
......@@ -39,7 +39,7 @@ if (!defined('GLPI_ROOT')) {
use DBmysql;
/**
* @since x.x.x
* @since 10.0.0
*/
class DatabaseKeysChecker {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment