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

Merge branch 'support/3.3-beta1' into develop

Browse Source
This commit is contained in:
lenaick.moreira
2026-07-23 11:43:00 +02:00
parent 2cc071b07a c6e50a0ed7
commit a808e89c30
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/feature_removal/AbstractSetupAudit.php
View File

@@ -8,6 +8,7 @@ use DBObjectSet;
use IssueLog;
use MetaModel;
use SetupLog;
use TagSetFieldData;
require_once APPROOT.'setup/feature_removal/ModelReflectionSerializer.php';
@@ -68,6 +69,10 @@ abstract class AbstractSetupAudit
continue;
}
if (MetaModel::IsSameFamily($sClass, TagSetFieldData::class)) {
continue;
}
if (!MetaModel::IsStandaloneClass($sClass)) {
$iCount = $this->Count($sClass);
$this->aFinalClassesToCleanup[$sClass] = $iCount;

1
tests/php-unit-tests/unitary-tests/setup/feature_removal/SetupAuditTest.php
View File

@@ -79,6 +79,7 @@ class SetupAuditTest extends ItopCustomDatamodelTestCase
"Feature1Module1MyClass",
"FinalClassFeature2Module1MyClass",
"FinalClassFeature2Module1MyFinalClassFromLocation",
"TagSetFieldDataFor_FinalClassFeature2Module1MyFinalClassFromLocation__domains",
];
$this->assertEqualsCanonicalizing($expected, $oSetupAudit->GetRemovedClasses());

6
tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext1/finalclass_ext1_module1/datamodel.finalclass_ext1_module1.xml
View File

@@ -64,6 +64,12 @@
<is_null_allowed>false</is_null_allowed>
<validation_pattern/>
</field>
<field id="domains" xsi:type="AttributeTagSet">
<sql>domains</sql>
<is_null_allowed>true</is_null_allowed>
<tracking_level>all</tracking_level>
<max_items>12</max_items>
</field>
</fields>
<methods/>
<presentation/>

6
tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext2/finalclass_ext2_module1/datamodel.finalclass_ext2_module1.xml
View File

@@ -31,6 +31,12 @@
<default_value/>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="domains" xsi:type="AttributeTagSet">
<sql>domains</sql>
<is_null_allowed>true</is_null_allowed>
<tracking_level>all</tracking_level>
<max_items>12</max_items>
</field>
</fields>
<methods/>
<presentation/>