From 8357c86361f5f2080f8a2c4fc4ce801e958772bf Mon Sep 17 00:00:00 2001 From: jf-cbd Date: Mon, 8 Apr 2024 11:10:12 +0200 Subject: [PATCH 1/2] :bug: Fix php 7.4 compatibility in bulkchange.class.inc.php (for itop 3.1) --- core/bulkchange.class.inc.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php index 755843841..330eeaca7 100644 --- a/core/bulkchange.class.inc.php +++ b/core/bulkchange.class.inc.php @@ -276,12 +276,21 @@ class CellStatus_NullIssue extends CellStatus_Issue */ class ReportValue { + protected DBObject $oObject; + protected string $sAttCode; + protected bool $bOriginal; + /** * @param DBObject $oObject * @param string $sAttCode * @param bool $bOriginal */ - public function __construct(protected DBObject $oObject, protected string $sAttCode, protected bool $bOriginal){} + public function __construct(DBObject $oObject, string $sAttCode, bool $bOriginal) + { + $this->oObject = $oObject; + $this->sAttCode = $sAttCode; + $this->bOriginal = $bOriginal; + } public function GetAsHTML(bool $bLocalizedValues) { From cd34f8b5eb3836b2b19e793ad3bedddd18b01bd8 Mon Sep 17 00:00:00 2001 From: jf-cbd Date: Mon, 8 Apr 2024 12:19:43 +0200 Subject: [PATCH 2/2] Removed namespaces in 3.1 --- pages/csvimport.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pages/csvimport.php b/pages/csvimport.php index d372d83e6..2091cc1fd 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -25,10 +25,6 @@ use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactor use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab; use Combodo\iTop\Application\UI\Base\Layout\TabContainer\TabContainer; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; -use Combodo\iTop\Application\WebPage\AjaxPage; -use Combodo\iTop\Application\WebPage\ErrorPage; -use Combodo\iTop\Application\WebPage\iTopWebPage; -use Combodo\iTop\Application\WebPage\WebPage; use Combodo\iTop\Service\Import\CSVImportPageProcessor; use Combodo\iTop\Core\CMDBChange\CMDBChangeOrigin; use Combodo\iTop\Renderer\BlockRenderer;