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

N°3129 Fix compatibility with PHP 8 for \MFElement::ReplaceWith

Browse Source 
New method added in PHP 8 : \DOMChildNode::replaceWith with a different signature (both visibility and parameters)
This commit is contained in:
Pierre Goiffon
2020-12-11 10:12:56 +01:00
parent eb89c52bae
commit 728c09d97d
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2158,14 +2158,13 @@ class MFElement extends Combodo\iTop\DesignElement
$oExisting = $this->_FindChildNode($oNode);
if ($oExisting)
{
if ($oExisting->getAttribute('_alteration') != 'removed')
{
if ($oExisting->getAttribute('_alteration') != 'removed') {
$sPath = MFDocument::GetItopNodePath($oNode);
$iLine = $oNode->getLineNo();
throw new MFException($sPath.' at line '.$iLine.": could not be added (already exists)", MFException::COULD_NOT_BE_ADDED,
$iLine, $sPath);
}
$oExisting->ReplaceWith($oNode);
$oExisting->ReplaceWithSingleNode($oNode);
$sFlag = 'replaced';
}
else
@@ -2205,18 +2204,15 @@ class MFElement extends Combodo\iTop\DesignElement
$sPath, $iLine);
}
$sPrevFlag = $oExisting->getAttribute('_alteration');
if ($sPrevFlag == 'removed')
{
if ($sPrevFlag == 'removed') {
$sPath = MFDocument::GetItopNodePath($this)."/".$oNode->tagName.(empty($sSearchId) ? '' : "[$sSearchId]");
$iLine = $oNode->getLineNo();
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);
if (!$this->IsInDefinition())
{
if ($sPrevFlag == '')
{
$oExisting->ReplaceWithSingleNode($oNode);
if (!$this->IsInDefinition()) {
if ($sPrevFlag == '') {
$sPrevFlag = 'replaced';
}
$oNode->setAttribute('_alteration', $sPrevFlag);
@@ -2249,15 +2245,12 @@ class MFElement extends Combodo\iTop\DesignElement
}
$sPrevFlag = $oExisting->getAttribute('_alteration');
if ($sPrevFlag == 'removed')
{
if ($sPrevFlag == 'removed') {
$sFlag = $bForce ? 'forced' : 'replaced';
}
else
{
} else {
$sFlag = $sPrevFlag; // added, replaced or ''
}
$oExisting->ReplaceWith($oNode);
$oExisting->ReplaceWithSingleNode($oNode);
}
else
{
@@ -2288,8 +2281,7 @@ class MFElement extends Combodo\iTop\DesignElement
return $this->parentNode->IsClassNode();
}
else
{
else {
return false;
}
}
@@ -2299,13 +2291,11 @@ class MFElement extends Combodo\iTop\DesignElement
*
* @param MFElement $oNewNode The replacement
*/
protected function ReplaceWith($oNewNode)
protected function ReplaceWithSingleNode($oNewNode)
{
// Move the classes from the old node into the new one
if ($this->IsClassNode())
{
foreach ($this->GetNodes('class') as $oChild)
{
if ($this->IsClassNode()) {
foreach ($this->GetNodes('class') as $oChild) {
$oNewNode->appendChild($oChild);
}
}