From 6a4217e87b4279fbb8c2ea77dedafa5333e8b928 Mon Sep 17 00:00:00 2001 From: acognet Date: Tue, 10 May 2022 16:39:31 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B03950=20-=20Deprecate=20old=20unreference?= =?UTF-8?q?d=20methods=20that=20are=20@deprecated=20-=20remove=20ajaxwebpa?= =?UTF-8?q?ge=20and=20iTopWebPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/ajaxwebpage.class.inc.php | 10 +++++++--- application/itopwebpage.class.inc.php | 2 +- datamodels/2.x/itop-backup/backup.php | 1 - datamodels/2.x/itop-backup/common.cli-execution.php | 1 - datamodels/2.x/itop-backup/restore.php | 1 - datamodels/2.x/itop-hub-connector/ajax.php | 12 ++++++------ datamodels/2.x/itop-hub-connector/launch.php | 1 - pages/ajax.csvimport.php | 1 - pages/csvimport.php | 1 - test/replay_query_log.php | 1 - 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php index d6303d067..cd1a73692 100644 --- a/application/ajaxwebpage.class.inc.php +++ b/application/ajaxwebpage.class.inc.php @@ -5,16 +5,20 @@ * @copyright Copyright (C) 2010-2021 Combodo SARL */ -// cannot notify depreciation for now as this is still MASSIVELY used in iTop core ! +// cannot notify depreciation for now as this is still load in autoloader //DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader'); /** * Class ajax_page * - * @deprecated will be removed in 3.1.0 - moved to AjaxPage + * @deprecated since 3.0.0 will be removed in 3.1.0 - moved to AjaxPage */ class ajax_page extends AjaxPage { - + function __construct($s_title) + { + DeprecatedCallsLog::NotifyDeprecatedPhpMethod('ajax_page is deprecated. Please use AjaxPage instead'); + parent::__construct($s_title); + } } diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index 1cbc0d6f0..6bf370dd7 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -6,4 +6,4 @@ */ // cannot notify depreciation for now as this is still MASSIVELY used in iTop core ! -//DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader'); \ No newline at end of file +DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/iTopWebPage.php, now loadable using autoloader'); \ No newline at end of file diff --git a/datamodels/2.x/itop-backup/backup.php b/datamodels/2.x/itop-backup/backup.php index 6381d409a..3c8f45fad 100644 --- a/datamodels/2.x/itop-backup/backup.php +++ b/datamodels/2.x/itop-backup/backup.php @@ -30,7 +30,6 @@ if (!defined('APPROOT')) } } require_once(APPROOT.'application/application.inc.php'); -require_once(APPROOT.'application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'core/log.class.inc.php'); require_once(APPROOT.'application/startup.inc.php'); diff --git a/datamodels/2.x/itop-backup/common.cli-execution.php b/datamodels/2.x/itop-backup/common.cli-execution.php index 5ecce13f2..dd9576569 100644 --- a/datamodels/2.x/itop-backup/common.cli-execution.php +++ b/datamodels/2.x/itop-backup/common.cli-execution.php @@ -30,7 +30,6 @@ if (!defined('APPROOT')) } } require_once(APPROOT.'application/application.inc.php'); -require_once(APPROOT.'application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'core/log.class.inc.php'); require_once(APPROOT.'application/startup.inc.php'); diff --git a/datamodels/2.x/itop-backup/restore.php b/datamodels/2.x/itop-backup/restore.php index 522676eb1..2f0ff6e9f 100644 --- a/datamodels/2.x/itop-backup/restore.php +++ b/datamodels/2.x/itop-backup/restore.php @@ -30,7 +30,6 @@ if (!defined('APPROOT')) } } require_once(APPROOT.'application/application.inc.php'); -require_once(APPROOT.'application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'core/log.class.inc.php'); require_once(APPROOT.'application/startup.inc.php'); require_once(dirname(__FILE__).'/dbrestore.class.inc.php'); diff --git a/datamodels/2.x/itop-hub-connector/ajax.php b/datamodels/2.x/itop-hub-connector/ajax.php index 7390f724e..60df89705 100644 --- a/datamodels/2.x/itop-hub-connector/ajax.php +++ b/datamodels/2.x/itop-hub-connector/ajax.php @@ -28,12 +28,12 @@ require_once (APPROOT.'application/utils.inc.php'); require_once (APPROOT.'core/log.class.inc.php'); IssueLog::Enable(APPROOT.'log/error.log'); -require_once (APPROOT.'setup/runtimeenv.class.inc.php'); -require_once (APPROOT.'setup/backup.class.inc.php'); -require_once (APPROOT.'core/mutex.class.inc.php'); -require_once (APPROOT.'core/dict.class.inc.php'); -require_once (APPROOT.'setup/xmldataloader.class.inc.php'); -require_once (__DIR__.'/hubruntimeenvironment.class.inc.php'); +require_once(APPROOT.'setup/runtimeenv.class.inc.php'); +require_once(APPROOT.'setup/backup.class.inc.php'); +require_once(APPROOT.'core/mutex.class.inc.php'); +require_once(APPROOT.'core/dict.class.inc.php'); +require_once(APPROOT.'setup/xmldataloader.class.inc.php'); +require_once(__DIR__.'/hubruntimeenvironment.class.inc.php'); /** * Overload of DBBackup to handle logging diff --git a/datamodels/2.x/itop-hub-connector/launch.php b/datamodels/2.x/itop-hub-connector/launch.php index 0971248e6..e418cc398 100644 --- a/datamodels/2.x/itop-hub-connector/launch.php +++ b/datamodels/2.x/itop-hub-connector/launch.php @@ -280,7 +280,6 @@ try { switch ($sTargetRoute) { case 'inform_after_setup': // Hidden IFRAME at the end of the setup - require_once(APPROOT.'/application/ajaxwebpage.class.inc.php'); $oPage = new NiceWebPage(''); $aDataToPost = MakeDataToPost($sTargetRoute); $oPage->add('
'); diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php index de1faef78..f3a7de2e7 100644 --- a/pages/ajax.csvimport.php +++ b/pages/ajax.csvimport.php @@ -15,7 +15,6 @@ use Combodo\iTop\Renderer\BlockRenderer; require_once('../approot.inc.php'); require_once(APPROOT.'/application/application.inc.php'); -require_once(APPROOT.'/application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'/application/wizardhelper.class.inc.php'); require_once(APPROOT.'/application/ui.linkswidget.class.inc.php'); diff --git a/pages/csvimport.php b/pages/csvimport.php index 886c16352..001cc4d86 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -33,7 +33,6 @@ use Combodo\iTop\Renderer\BlockRenderer; try { require_once('../approot.inc.php'); require_once(APPROOT.'/application/application.inc.php'); - require_once(APPROOT.'/application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'/application/startup.inc.php'); require_once(APPROOT.'/application/loginwebpage.class.inc.php'); diff --git a/test/replay_query_log.php b/test/replay_query_log.php index 55e7e1984..a2988a8ef 100644 --- a/test/replay_query_log.php +++ b/test/replay_query_log.php @@ -205,7 +205,6 @@ class QueryLogEntry require_once('../approot.inc.php'); require_once(APPROOT.'/application/application.inc.php'); -require_once(APPROOT.'/application/ajaxwebpage.class.inc.php'); require_once(APPROOT.'/application/startup.inc.php'); $operation = utils::ReadParam('operation', '');