This commit is contained in:
Anne-Cath
2025-09-08 15:51:20 +02:00
parent dd2f6e7413
commit bbdef6b730
9 changed files with 18 additions and 5 deletions

View File

@@ -55,6 +55,7 @@ require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptMcryptEngine.p
require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptOpenSSLEngine.php');
require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptOpenSSLMcryptCompatibilityEngine.php');
require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptSimpleEngine.php');
require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptSodiumEngine.php');
// was utf8 but it only supports BMP chars (https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html)
// so we switched to utf8mb4 in iTop 2.5, adding dependency to MySQL 5.5.3

View File

@@ -1,5 +1,8 @@
<?php
use Combodo\iTop\Application\WebPage\Page;
use Combodo\iTop\Application\WebPage\WebPage;
/**
* Class BulkExport
*
@@ -193,7 +196,7 @@ abstract class BulkExport
}
public function SetHttpHeaders(\Combodo\iTop\Application\WebPage\WebPage $oPage)
public function SetHttpHeaders(WebPage $oPage)
{
}
@@ -254,7 +257,7 @@ abstract class BulkExport
/**
* @deprecated 3.0.0 use GetFormPart instead
*/
public function DisplayFormPart(\Combodo\iTop\Application\WebPage\WebPage $oP, $sPartId)
public function DisplayFormPart(WebPage $oP, $sPartId)
{
DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetFormPart instead');
$oP->AddSubBlock($this->GetFormPart($oP, $sPartId));
@@ -267,11 +270,11 @@ abstract class BulkExport
*
* @return UIContentBlock
*/
public function GetFormPart(\Combodo\iTop\Application\WebPage\WebPage $oP, $sPartId)
public function GetFormPart(WebPage $oP, $sPartId)
{
}
public function DisplayUsage(\Combodo\iTop\Application\WebPage\Page $oP)
public function DisplayUsage(Page $oP)
{
}

View File

@@ -17,7 +17,16 @@ class ValueSetObjectsTest extends ItopTestCase
protected function setUp(): void
{
parent::setUp();
$this->RequireOnceItopFile('core/valuesetdef.class.inc.php');
$this->RequireOnceItopFile('MyHelpers.class.inc.php');
$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetDefinition.php');
$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetObjects.php');
$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnum.php');
$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnumPadded.php');
$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetRange.php');
$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnumClasses.php');
$this->RequireOnceItopFile('application/startup.inc.php');
$this->RequireOnceUnitTestFile('./MockValueSetObjects.php');
}