Merge remote-tracking branch 'origin/develop' into feature/new-dashboard-layout

# Conflicts:
#	dictionaries/en.dictionary.itop.ui.php
#	lib/symfony/cache/Adapter/ArrayAdapter.php
This commit is contained in:
Benjamin DALSASS
2026-02-19 11:31:33 +01:00
149 changed files with 5732 additions and 2132 deletions

View File

@@ -95,8 +95,23 @@ class AttributeText extends AttributeString
return 65535;
}
public static function RenderWikiHtml($sText, $bWikiOnly = false)
/**
* @param string|null $sText
* @param bool $bWikiOnly
*
* @return string
* @throws \ArchivedObjectException
* @throws \ConfigException
* @throws \CoreException
* @throws \DictExceptionMissingString
*
* @since 3.3.0 N°8681 Add type hint for parameters and return value
*/
public static function RenderWikiHtml(string|null $sText, bool $bWikiOnly = false): string
{
// N°8681 - Ensure to have a string value
$sText = $sText ?? '';
if (!$bWikiOnly) {
$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
if (preg_match_all(