composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/uninstallation

Browse Source
This commit is contained in:
odain
2026-03-30 11:24:45 +02:00
parent a13543c0d3 443fa60459
commit 5ae8edd2c0
181 changed files with 2200 additions and 2346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/modulediscovery/ModuleFileReaderException.php
View File

@@ -14,7 +14,7 @@ class ModuleFileReaderException extends Exception
* @param int $iHttpCode
* @param Exception|null $oPrevious
*/
public function __construct($sMessage, $iHttpCode = 0, Exception $oPrevious = null, $sModuleFile = null)
public function __construct($sMessage, $iHttpCode = 0, ?Exception $oPrevious = null, $sModuleFile = null)
{
$e = new Exception("");

2
setup/setuppage.class.inc.php
View File

@@ -36,6 +36,8 @@ class SetupPage extends NiceWebPage
{
public const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/setuppage/layout';
protected const BODY_DATA_GUI_TYPE = 'setup';
public function __construct($sTitle)
{
parent::__construct($sTitle);