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

N°3129 PHP 8.0 compat: Fix "Access level to MFElement::ReplaceWith() must be public (as in class DOMElement)"

Browse Source
This commit is contained in:
Pierre Goiffon
2022-01-28 10:27:47 +01:00
parent 7495fb9af4
commit 606bdc1909
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/modelfactory.class.inc.php
View File

@@ -2161,7 +2161,7 @@ class MFElement extends Combodo\iTop\DesignElement
EOF;
throw new MFException($sExceptionMessage, MFException::COULD_NOT_BE_ADDED, $iLine, $sPath);
}
$oExisting->ReplaceWith($oNode);
$oExisting->MFReplaceWith($oNode);
$sFlag = 'replaced';
}
else
@@ -2208,7 +2208,7 @@ EOF;
throw new MFException($sPath." at line $iLine: could not be modified (marked as deleted)",
MFException::COULD_NOT_BE_MODIFIED_ALREADY_DELETED, $sPath, $iLine);
}
$oExisting->ReplaceWith($oNode);
$oExisting->MFReplaceWith($oNode);
if (!$this->IsInDefinition())
{
if ($sPrevFlag == '')
@@ -2253,7 +2253,7 @@ EOF;
{
$sFlag = $sPrevFlag; // added, replaced or ''
}
$oExisting->ReplaceWith($oNode);
$oExisting->MFReplaceWith($oNode);
}
else
{
@@ -2294,8 +2294,11 @@ EOF;
* Replaces a node by another one, making sure that recursive nodes are preserved
*
* @param MFElement $oNewNode The replacement
*
* @since 2.7.7 3.0.1 3.1.0 N°3129 rename method (from `ReplaceWith` to `MFReplaceWith`) to avoid collision with parent `\DOMElement::replaceWith` method (different method modifier and parameters :
* throws fatal error in PHP 8.0)
*/
protected function ReplaceWith($oNewNode)
protected function MFReplaceWith($oNewNode)
{
// Move the classes from the old node into the new one
if ($this->IsClassNode())