-
-
-
-
+
+ {{ inputs.hidden('id', id) }}
+ {{ inputs.submit('validate', _x('button', 'Validate the model', 'datainjection'), _x('button', 'Validate the model', 'datainjection')) }}
\ No newline at end of file
diff --git a/tests/AbstractDataInjectionTestCase.php b/tests/AbstractDataInjectionTestCase.php
new file mode 100644
index 00000000..03b17a4a
--- /dev/null
+++ b/tests/AbstractDataInjectionTestCase.php
@@ -0,0 +1,64 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2007-2023 by DataInjection plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/datainjection
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Datainjection\Tests;
+
+use Glpi\Tests\DbTestCase;
+use Plugin;
+
+abstract class AbstractDataInjectionTestCase extends DbTestCase
+{
+ public function setUp(): void
+ {
+ parent::setUp();
+ $this->login();
+
+ // Functions defined in hook.php (migration steps, needUpdateOrInstall(), ...)
+ // are only required when the plugin is actually (re)loaded, which
+ // Plugin::activate() skips once it is already active. Load explicitly so
+ // tests can call those functions directly.
+ Plugin::load('datainjection', true);
+ }
+
+ /**
+ * Run DDL (CREATE/DROP/ALTER TABLE) outside of the transaction that wraps each test.
+ */
+ protected function withoutTransaction(callable $callback): mixed
+ {
+ global $DB;
+ $DB->commit();
+ try {
+ return $callback();
+ } finally {
+ $DB->clearSchemaCache();
+ $DB->beginTransaction();
+ }
+ }
+}
diff --git a/tests/unit/EngineInjectLineTest.php b/tests/unit/EngineInjectLineTest.php
new file mode 100644
index 00000000..12e48add
--- /dev/null
+++ b/tests/unit/EngineInjectLineTest.php
@@ -0,0 +1,145 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2007-2023 by DataInjection plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/datainjection
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Datainjection\Tests\Unit;
+
+use Computer;
+use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
+use PluginDatainjectionCommonInjectionLib;
+use PluginDatainjectionEngine;
+use PluginDatainjectionMapping;
+use PluginDatainjectionModel;
+use Session;
+
+final class EngineInjectLineTest extends AbstractDataInjectionTestCase
+{
+ private function createModelWithMappings(array $model_overrides = []): PluginDatainjectionModel
+ {
+ $model = $this->createItem(PluginDatainjectionModel::class, array_merge([
+ 'name' => 'Test_Engine_Model_' . uniqid(),
+ 'itemtype' => Computer::class,
+ 'entities_id' => 0,
+ 'is_private' => 0,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 1,
+ 'behavior_update' => 1,
+ ], $model_overrides));
+
+ $this->createItem(PluginDatainjectionMapping::class, [
+ 'models_id' => $model->getID(),
+ 'itemtype' => Computer::class,
+ 'rank' => 0,
+ 'name' => 'Name',
+ 'value' => 'name',
+ 'is_mandatory' => 1,
+ ]);
+
+ $this->createItem(PluginDatainjectionMapping::class, [
+ 'models_id' => $model->getID(),
+ 'itemtype' => Computer::class,
+ 'rank' => 1,
+ 'name' => 'Serial',
+ 'value' => 'serial',
+ 'is_mandatory' => 0,
+ ]);
+
+ return $model;
+ }
+
+ public function testInjectLineCreatesItemFromMappedCsvRow(): void
+ {
+ $model = $this->createModelWithMappings();
+
+ $engine = new PluginDatainjectionEngine($model, [], $model->fields['entities_id']);
+ $results = $engine->injectLine(['Test_Engine_Computer', 'ABC123'], 1);
+
+ self::assertSame(PluginDatainjectionCommonInjectionLib::SUCCESS, $results['status']);
+ self::assertSame(PluginDatainjectionCommonInjectionLib::IMPORT_ADD, $results['type']);
+ self::assertEmpty($engine->getLinesInError());
+
+ $computer = new Computer();
+ self::assertTrue($computer->getFromDB($results['Computer']));
+ self::assertSame('Test_Engine_Computer', $computer->fields['name']);
+ self::assertSame('ABC123', $computer->fields['serial']);
+ }
+
+ public function testInjectLineUpdatesExistingItemFromMappedCsvRow(): void
+ {
+ $model = $this->createModelWithMappings();
+
+ $computer = $this->createItem(Computer::class, [
+ 'name' => 'Test_Engine_Computer_Update',
+ 'entities_id' => 0,
+ 'serial' => 'OLD_SERIAL',
+ ]);
+
+ $engine = new PluginDatainjectionEngine($model, [], $model->fields['entities_id']);
+ $results = $engine->injectLine(['Test_Engine_Computer_Update', 'NEW_SERIAL'], 1);
+
+ self::assertSame(PluginDatainjectionCommonInjectionLib::SUCCESS, $results['status']);
+ self::assertSame(PluginDatainjectionCommonInjectionLib::IMPORT_UPDATE, $results['type']);
+
+ $computer->getFromDB($computer->getID());
+ self::assertSame('NEW_SERIAL', $computer->fields['serial']);
+ }
+
+ public function testInjectLineRejectsNewItemWhenModelDisallowsAdd(): void
+ {
+ $model = $this->createModelWithMappings(['behavior_add' => 0]);
+
+ $engine = new PluginDatainjectionEngine($model, [], $model->fields['entities_id']);
+ $results = $engine->injectLine(['Test_Engine_Computer_NoAdd', 'XYZ'], 1);
+
+ self::assertSame(PluginDatainjectionCommonInjectionLib::ERROR_CANNOT_IMPORT, $results['status']);
+ self::assertNotEmpty($engine->getLinesInError());
+
+ $computer = new Computer();
+ self::assertFalse($computer->getFromDBbyCrit(['name' => 'Test_Engine_Computer_NoAdd']));
+ }
+
+ public function testInjectLineRejectsUpdateWhenModelDisallowsUpdate(): void
+ {
+ $model = $this->createModelWithMappings(['behavior_update' => 0]);
+
+ $computer = $this->createItem(Computer::class, [
+ 'name' => 'Test_Engine_Computer_NoUpdate',
+ 'entities_id' => 0,
+ 'serial' => 'ORIGINAL',
+ ]);
+
+ $engine = new PluginDatainjectionEngine($model, [], $model->fields['entities_id']);
+ $results = $engine->injectLine(['Test_Engine_Computer_NoUpdate', 'CHANGED'], 1);
+
+ self::assertSame(PluginDatainjectionCommonInjectionLib::ERROR_CANNOT_UPDATE, $results['status']);
+
+ $computer->getFromDB($computer->getID());
+ self::assertSame('ORIGINAL', $computer->fields['serial']);
+ }
+}
diff --git a/tests/unit/MigrationTest.php b/tests/unit/MigrationTest.php
new file mode 100644
index 00000000..b0c408ee
--- /dev/null
+++ b/tests/unit/MigrationTest.php
@@ -0,0 +1,103 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2007-2023 by DataInjection plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/datainjection
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Datainjection\Tests\Unit;
+
+use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
+use Migration;
+use Psr\Log\LogLevel;
+use Session;
+
+final class MigrationTest extends AbstractDataInjectionTestCase
+{
+ public function testMigration2158To2159FixesLegacyNegativeEntityId(): void
+ {
+ /** @var \DBmysql $DB */
+ global $DB;
+
+ $table = 'glpi_plugin_datainjection_models';
+
+ // Recreate the pre-2158 column shape: signed, defaulting to -1,
+ // exactly as described in the migration's own comments.
+ $this->withoutTransaction(static function () use ($DB, $table): void {
+ $DB->doQuery("ALTER TABLE `$table` CHANGE `entities_id` `entities_id` int NOT NULL default '-1'");
+ });
+ // GLPI itself warns on signed keys; expected here since we are
+ // deliberately recreating the legacy (pre-migration) column shape.
+ $this->hasPhpLogRecordThatContains(
+ 'Usage of signed integers in primary or foreign keys is discouraged',
+ LogLevel::WARNING,
+ );
+
+ $id = null;
+
+ try {
+ $DB->insert($table, [
+ 'name' => 'Test_Migration_Legacy_Private_Model',
+ 'itemtype' => 'Computer',
+ 'entities_id' => -1,
+ 'is_private' => 1,
+ 'is_recursive' => 0,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 1,
+ ]);
+ $id = $DB->insertId();
+
+ $this->withoutTransaction(static function (): void {
+ plugin_datainjection_migration_2158_2159(new Migration(PLUGIN_DATAINJECTION_VERSION));
+ });
+
+ $row = $DB->request(['FROM' => $table, 'WHERE' => ['id' => $id]])->current();
+
+ self::assertSame(0, (int) $row['entities_id']);
+ self::assertSame(1, (int) $row['is_private']);
+ self::assertSame(1, (int) $row['is_recursive']);
+
+ $column = null;
+ foreach ($DB->listFields($table) as $field) {
+ if ($field['Field'] === 'entities_id') {
+ $column = $field;
+ }
+ }
+ self::assertNotNull($column);
+ self::assertStringContainsString('unsigned', $column['Type']);
+ } finally {
+ if ($id !== null) {
+ $DB->delete($table, ['id' => $id]);
+ }
+ // Guarantee the column ends up unsigned regardless of whether the
+ // assertions above passed, matching the schema every other test
+ // in this suite relies on.
+ $this->withoutTransaction(static function () use ($DB, $table): void {
+ $DB->doQuery("ALTER TABLE `$table` CHANGE `entities_id` `entities_id` int unsigned NOT NULL default '0'");
+ });
+ }
+ }
+}
diff --git a/tests/unit/ModelCrudTest.php b/tests/unit/ModelCrudTest.php
new file mode 100644
index 00000000..4c325fa1
--- /dev/null
+++ b/tests/unit/ModelCrudTest.php
@@ -0,0 +1,120 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2007-2023 by DataInjection plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/datainjection
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Datainjection\Tests\Unit;
+
+use Computer;
+use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
+use PluginDatainjectionMapping;
+use PluginDatainjectionModel;
+use Session;
+
+final class ModelCrudTest extends AbstractDataInjectionTestCase
+{
+ public function testAddRefusesModelWithoutAName(): void
+ {
+ $model = new PluginDatainjectionModel();
+ $id = $model->add([
+ 'name' => '',
+ 'itemtype' => Computer::class,
+ 'entities_id' => 0,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 1,
+ 'behavior_update' => 0,
+ ]);
+
+ self::assertFalse($id);
+ $this->hasSessionMessages(ERROR, ['Please enter a name for the model']);
+ }
+
+ public function testAddRefusesModelWithNeitherAddNorUpdateBehavior(): void
+ {
+ $model = new PluginDatainjectionModel();
+ $id = $model->add([
+ 'name' => 'Test_Model_Crud_NoBehavior',
+ 'itemtype' => Computer::class,
+ 'entities_id' => 0,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 0,
+ 'behavior_update' => 0,
+ ]);
+
+ self::assertFalse($id);
+ $this->hasSessionMessages(ERROR, ['Your model should allow import and/or update of data']);
+ }
+
+ public function testUpdateRefusesChangingOwnerOfAPrivateModel(): void
+ {
+ $model = $this->createItem(PluginDatainjectionModel::class, [
+ 'name' => 'Test_Model_Crud_Private',
+ 'itemtype' => Computer::class,
+ 'entities_id' => 0,
+ 'is_private' => PluginDatainjectionModel::MODEL_PRIVATE,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 1,
+ 'behavior_update' => 0,
+ ]);
+
+ $success = $model->update([
+ 'id' => $model->getID(),
+ 'is_private' => 1,
+ 'users_id' => Session::getLoginUserID() + 1,
+ ]);
+
+ self::assertFalse($success);
+ $this->hasSessionMessages(ERROR, ['You are not the initial creator of this model']);
+ }
+
+ public function testPurgingAModelDeletesItsMappings(): void
+ {
+ $model = $this->createItem(PluginDatainjectionModel::class, [
+ 'name' => 'Test_Model_Crud_Purge',
+ 'itemtype' => Computer::class,
+ 'entities_id' => 0,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 1,
+ 'behavior_update' => 0,
+ ]);
+
+ $mapping = $this->createItem(PluginDatainjectionMapping::class, [
+ 'models_id' => $model->getID(),
+ 'itemtype' => Computer::class,
+ 'rank' => 0,
+ 'name' => 'Name',
+ 'value' => 'name',
+ 'is_mandatory' => 1,
+ ]);
+
+ $this->deleteItem(PluginDatainjectionModel::class, $model->getID(), true);
+
+ $reloaded_mapping = new PluginDatainjectionMapping();
+ self::assertFalse($reloaded_mapping->getFromDB($mapping->getID()));
+ }
+}
diff --git a/tests/unit/ModelRightsTest.php b/tests/unit/ModelRightsTest.php
new file mode 100644
index 00000000..9f4d0a5d
--- /dev/null
+++ b/tests/unit/ModelRightsTest.php
@@ -0,0 +1,122 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2007-2023 by DataInjection plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/datainjection
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Datainjection\Tests\Unit;
+
+use Computer;
+use Entity;
+use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
+use PluginDatainjectionModel;
+use Session;
+use User;
+
+final class ModelRightsTest extends AbstractDataInjectionTestCase
+{
+ /**
+ * The default test user's active session is scoped to a fixed set of
+ * entities that does not include the root entity, so models under test
+ * need a real entity from that set, not entities_id => 0.
+ */
+ private function createAccessibleEntityId(): int
+ {
+ return (int) $this->createItem(Entity::class, [
+ 'name' => 'Test_Model_Rights_Entity_' . uniqid(),
+ 'entities_id' => 0,
+ ])->getID();
+ }
+
+ private function createModel(array $overrides = []): PluginDatainjectionModel
+ {
+ return $this->createItem(PluginDatainjectionModel::class, array_merge([
+ 'name' => 'Test_Model_Rights_' . uniqid(),
+ 'itemtype' => Computer::class,
+ 'entities_id' => $this->createAccessibleEntityId(),
+ 'is_private' => PluginDatainjectionModel::MODEL_PUBLIC,
+ 'users_id' => Session::getLoginUserID(),
+ 'behavior_add' => 1,
+ 'behavior_update' => 1,
+ ], $overrides));
+ }
+
+ public function testCanCreateItemIsDeniedWhenNativeItemtypeRightIsRemoved(): void
+ {
+ $model = $this->createModel();
+
+ self::assertTrue($model->canCreateItem());
+
+ $_SESSION['glpiactiveprofile']['computer'] = 0;
+ self::assertFalse($model->canCreateItem());
+ }
+
+ public function testCanCreateItemIsAllowedWhenNativeItemtypeRightIsPresent(): void
+ {
+ $model = $this->createModel();
+
+ $_SESSION['glpiactiveprofile']['computer'] = ALLSTANDARDRIGHT;
+ self::assertTrue($model->canCreateItem());
+ }
+
+ public function testCanViewItemHidesPrivateModelOwnedByAnotherUser(): void
+ {
+ $model = $this->createModel([
+ 'is_private' => PluginDatainjectionModel::MODEL_PRIVATE,
+ 'users_id' => getItemByTypeName(User::class, 'tech', true),
+ ]);
+
+ self::assertFalse($model->canViewItem());
+ }
+
+ public function testCanViewItemAllowsPrivateModelOwnedBySelf(): void
+ {
+ $model = $this->createModel([
+ 'is_private' => PluginDatainjectionModel::MODEL_PRIVATE,
+ ]);
+
+ self::assertTrue($model->canViewItem());
+ }
+
+ public function testCanViewItemRespectsEntityRestriction(): void
+ {
+ $entity = $this->createItem(Entity::class, [
+ 'name' => 'Test_Model_Rights_Entity',
+ 'entities_id' => 0,
+ ]);
+
+ $model = $this->createModel([
+ 'entities_id' => $entity->getID(),
+ 'is_recursive' => 0,
+ ]);
+
+ self::assertTrue($model->canViewItem());
+
+ $_SESSION['glpiactiveentities'] = [0];
+ self::assertFalse($model->canViewItem());
+ }
+}
diff --git a/tests/unit/PluginLifecycleTest.php b/tests/unit/PluginLifecycleTest.php
new file mode 100644
index 00000000..ba3f0c57
--- /dev/null
+++ b/tests/unit/PluginLifecycleTest.php
@@ -0,0 +1,137 @@
+.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2007-2023 by DataInjection plugin team.
+ * @license GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link https://github.com/pluginsGLPI/datainjection
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Datainjection\Tests\Unit;
+
+use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
+use Plugin;
+
+final class PluginLifecycleTest extends AbstractDataInjectionTestCase
+{
+ private function getPlugin(): Plugin
+ {
+ $plugin = new Plugin();
+ $plugin->getFromDBbyDir('datainjection');
+
+ return $plugin;
+ }
+
+ public function testPluginIsInstalledAndActivatedByDefault(): void
+ {
+ $plugin = $this->getPlugin();
+
+ self::assertSame(Plugin::ACTIVATED, (int) $plugin->fields['state']);
+ }
+
+ /**
+ * Only the DB-backed `state` field is checked here, not
+ * Plugin::isPluginActive(): it reads a static, process-wide cache that
+ * activate()/unactivate() do not keep reliably in sync (only a full
+ * Plugin::bootPlugins() rescan does), so it is not a trustworthy signal
+ * within a single test run and asserting on it would make this test
+ * order-dependent on unrelated tests.
+ */
+ public function testDeactivateThenActivateTogglesState(): void
+ {
+ $plugin = $this->getPlugin();
+ $id = $plugin->getID();
+
+ $plugin->unactivate($id);
+ self::assertTrue($plugin->getFromDB($id));
+ self::assertSame(Plugin::NOTACTIVATED, (int) $plugin->fields['state']);
+
+ $plugin->activate($id);
+ self::assertTrue($plugin->getFromDB($id));
+ self::assertSame(Plugin::ACTIVATED, (int) $plugin->fields['state']);
+ }
+
+ public function testNeedUpdateOrInstallReportsUpToDateWhenFullyInstalled(): void
+ {
+ self::assertSame(-1, plugin_datainjection_needUpdateOrInstall());
+ }
+
+ public function testUninstallThenReinstallRecreatesSchemaAndDefaultRights(): void
+ {
+ $plugin = $this->getPlugin();
+ $id = $plugin->getID();
+
+ /** @var \DBmysql $DB */
+ global $DB;
+
+ $tables = [
+ 'glpi_plugin_datainjection_models',
+ 'glpi_plugin_datainjection_modelcsvs',
+ 'glpi_plugin_datainjection_mappings',
+ 'glpi_plugin_datainjection_infos',
+ ];
+
+ try {
+ $this->withoutTransaction(static fn() => $plugin->uninstall($id));
+
+ foreach ($tables as $table) {
+ self::assertFalse($DB->tableExists($table), "$table should have been dropped");
+ }
+ self::assertSame(
+ 0,
+ countElementsInTable('glpi_profilerights', ['name' => 'plugin_datainjection_model']),
+ 'Uninstall should remove the plugin rights from every profile',
+ );
+
+ self::assertTrue($plugin->getFromDB($id));
+ self::assertSame(Plugin::NOTINSTALLED, (int) $plugin->fields['state']);
+
+ self::assertSame(0, plugin_datainjection_needUpdateOrInstall());
+
+ $this->withoutTransaction(static fn() => $plugin->install($id));
+
+ foreach ($tables as $table) {
+ self::assertTrue($DB->tableExists($table), "$table should have been recreated");
+ }
+ self::assertTrue($plugin->getFromDB($id));
+ self::assertSame(Plugin::NOTACTIVATED, (int) $plugin->fields['state']);
+ self::assertGreaterThan(
+ 0,
+ countElementsInTable('glpi_profilerights', ['name' => 'plugin_datainjection_model']),
+ 'Install should seed the plugin right for the current profile',
+ );
+ } finally {
+ // Whatever happened above, leave the environment exactly as every
+ // other test in this suite expects it: installed and activated.
+ if (!$DB->tableExists('glpi_plugin_datainjection_models')) {
+ $this->withoutTransaction(static fn() => $plugin->install($id));
+ }
+ $plugin->getFromDB($id);
+ if ((int) $plugin->fields['state'] !== Plugin::ACTIVATED) {
+ $plugin->activate($id);
+ }
+ unset($_SESSION['MESSAGE_AFTER_REDIRECT']);
+ }
+ }
+}
From 886b39b6820d811f43b401a801cee1a37a61ab78 Mon Sep 17 00:00:00 2001
From: RomainLvr
Date: Tue, 1 Sep 2026 14:26:03 +0200
Subject: [PATCH 3/7] Fix Ci
---
inc/commoninjectionlib.class.php | 4 ++--
inc/model.class.php | 12 ++++++------
inc/modelcsv.class.php | 3 +--
inc/profile.class.php | 2 +-
tests/unit/MigrationTest.php | 9 ++++++---
tests/unit/PluginLifecycleTest.php | 11 ++++++++---
6 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/inc/commoninjectionlib.class.php b/inc/commoninjectionlib.class.php
index 79cef7eb..e9bc926d 100644
--- a/inc/commoninjectionlib.class.php
+++ b/inc/commoninjectionlib.class.php
@@ -639,7 +639,7 @@ private function getFieldValue(
'entities_id' => $this->entity,
];
- if ($item->getType() == 'Entity') {
+ if ($item::class == 'Entity') {
// Blocks entity creation. The findID method only searches for direct sub-entities of the root, not deeper levels.
$crit = 'name';
if (strpos($input['completename'], '>')) {
@@ -1868,7 +1868,7 @@ private function effectiveAddOrUpdate($injectionClass, $item, $values, $add = tr
&& !empty($option)
&& isset($option['table'])
&& $option['table'] === getTableForItemType(Group::class)
- && Toolbox::hasTrait($item->getType(), AssignableItem::class)
+ && Toolbox::hasTrait($item::class, AssignableItem::class)
) {
$normalized_value = $toinject[$key];
$group_type = null;
diff --git a/inc/model.class.php b/inc/model.class.php
index 8e4d4ed9..10f2d5fc 100644
--- a/inc/model.class.php
+++ b/inc/model.class.php
@@ -459,7 +459,7 @@ public function rawSearchOptions()
'field' => 'name',
'name' => __('Name'),
'datatype' => 'itemlink',
- 'itemlink_type' => $this->getType(),
+ 'itemlink_type' => static::class,
'autocomplete' => true,
], [
'id' => 2,
@@ -743,17 +743,17 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
$canedit = Session::haveRight(self::$rightname, UPDATE);
if (!$withtemplate && $item instanceof self) {
- $tabs[1] = self::createTabEntry(__('Model'), 0, $item::getType(), self::getIcon());
+ $tabs[1] = self::createTabEntry(__('Model'), 0, $item::class, self::getIcon());
if (!$this->isNewID($item->fields['id'])) {
if ($canedit) {
- $tabs[3] = self::createTabEntry(__('File to inject', 'datainjection'), 0, $item::getType(), 'ti ti-file-download');
+ $tabs[3] = self::createTabEntry(__('File to inject', 'datainjection'), 0, $item::class, 'ti ti-file-download');
}
- $tabs[4] = self::createTabEntry(__('Mappings', 'datainjection'), 0, $item::getType(), 'ti ti-columns');
+ $tabs[4] = self::createTabEntry(__('Mappings', 'datainjection'), 0, $item::class, 'ti ti-columns');
if ($item->fields['step'] > self::MAPPING_STEP) {
- $tabs[5] = self::createTabEntry(__('Additional Information', 'datainjection'), 0, $item::getType(), 'ti ti-code-variable-plus');
+ $tabs[5] = self::createTabEntry(__('Additional Information', 'datainjection'), 0, $item::class, 'ti ti-code-variable-plus');
if ($canedit && $item->fields['step'] != self::READY_TO_USE_STEP) {
- $tabs[6] = self::createTabEntry(__('Validation'), 0, $item::getType(), 'ti ti-checklist');
+ $tabs[6] = self::createTabEntry(__('Validation'), 0, $item::class, 'ti ti-checklist');
}
}
}
diff --git a/inc/modelcsv.class.php b/inc/modelcsv.class.php
index 99d3c75e..b76498b2 100644
--- a/inc/modelcsv.class.php
+++ b/inc/modelcsv.class.php
@@ -62,7 +62,7 @@ class PluginDatainjectionModelcsv extends CommonDBChild
{
public static string $rightname = "plugin_datainjection_model";
- public $specific_fields;
+ public array $specific_fields;
// From CommonDBChild
public static string $itemtype = 'PluginDatainjectionModel';
@@ -71,7 +71,6 @@ class PluginDatainjectionModelcsv extends CommonDBChild
public bool $dohistory = true;
-
public function getEmpty()
{
diff --git a/inc/profile.class.php b/inc/profile.class.php
index 63348195..ac57751b 100644
--- a/inc/profile.class.php
+++ b/inc/profile.class.php
@@ -68,7 +68,7 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
if ($item instanceof Profile) {
if ($item->fields['interface'] == 'central') {
- return self::createTabEntry(__('Data injection', 'datainjection'), 0, $item::getType(), 'ti ti-download');
+ return self::createTabEntry(__('Data injection', 'datainjection'), 0, $item::class, 'ti ti-download');
}
return '';
diff --git a/tests/unit/MigrationTest.php b/tests/unit/MigrationTest.php
index b0c408ee..c5f34dbb 100644
--- a/tests/unit/MigrationTest.php
+++ b/tests/unit/MigrationTest.php
@@ -30,6 +30,7 @@
namespace GlpiPlugin\Datainjection\Tests\Unit;
+use DBmysql;
use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
use Migration;
use Psr\Log\LogLevel;
@@ -39,7 +40,7 @@ final class MigrationTest extends AbstractDataInjectionTestCase
{
public function testMigration2158To2159FixesLegacyNegativeEntityId(): void
{
- /** @var \DBmysql $DB */
+ /** @var DBmysql $DB */
global $DB;
$table = 'glpi_plugin_datainjection_models';
@@ -47,7 +48,7 @@ public function testMigration2158To2159FixesLegacyNegativeEntityId(): void
// Recreate the pre-2158 column shape: signed, defaulting to -1,
// exactly as described in the migration's own comments.
$this->withoutTransaction(static function () use ($DB, $table): void {
- $DB->doQuery("ALTER TABLE `$table` CHANGE `entities_id` `entities_id` int NOT NULL default '-1'");
+ $DB->doQuery(sprintf("ALTER TABLE `%s` CHANGE `entities_id` `entities_id` int NOT NULL default '-1'", $table));
});
// GLPI itself warns on signed keys; expected here since we are
// deliberately recreating the legacy (pre-migration) column shape.
@@ -86,17 +87,19 @@ public function testMigration2158To2159FixesLegacyNegativeEntityId(): void
$column = $field;
}
}
+
self::assertNotNull($column);
self::assertStringContainsString('unsigned', $column['Type']);
} finally {
if ($id !== null) {
$DB->delete($table, ['id' => $id]);
}
+
// Guarantee the column ends up unsigned regardless of whether the
// assertions above passed, matching the schema every other test
// in this suite relies on.
$this->withoutTransaction(static function () use ($DB, $table): void {
- $DB->doQuery("ALTER TABLE `$table` CHANGE `entities_id` `entities_id` int unsigned NOT NULL default '0'");
+ $DB->doQuery(sprintf("ALTER TABLE `%s` CHANGE `entities_id` `entities_id` int unsigned NOT NULL default '0'", $table));
});
}
}
diff --git a/tests/unit/PluginLifecycleTest.php b/tests/unit/PluginLifecycleTest.php
index ba3f0c57..88015b37 100644
--- a/tests/unit/PluginLifecycleTest.php
+++ b/tests/unit/PluginLifecycleTest.php
@@ -30,6 +30,7 @@
namespace GlpiPlugin\Datainjection\Tests\Unit;
+use DBmysql;
use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
use Plugin;
@@ -82,7 +83,7 @@ public function testUninstallThenReinstallRecreatesSchemaAndDefaultRights(): voi
$plugin = $this->getPlugin();
$id = $plugin->getID();
- /** @var \DBmysql $DB */
+ /** @var DBmysql $DB */
global $DB;
$tables = [
@@ -96,8 +97,9 @@ public function testUninstallThenReinstallRecreatesSchemaAndDefaultRights(): voi
$this->withoutTransaction(static fn() => $plugin->uninstall($id));
foreach ($tables as $table) {
- self::assertFalse($DB->tableExists($table), "$table should have been dropped");
+ self::assertFalse($DB->tableExists($table), $table . ' should have been dropped');
}
+
self::assertSame(
0,
countElementsInTable('glpi_profilerights', ['name' => 'plugin_datainjection_model']),
@@ -112,8 +114,9 @@ public function testUninstallThenReinstallRecreatesSchemaAndDefaultRights(): voi
$this->withoutTransaction(static fn() => $plugin->install($id));
foreach ($tables as $table) {
- self::assertTrue($DB->tableExists($table), "$table should have been recreated");
+ self::assertTrue($DB->tableExists($table), $table . ' should have been recreated');
}
+
self::assertTrue($plugin->getFromDB($id));
self::assertSame(Plugin::NOTACTIVATED, (int) $plugin->fields['state']);
self::assertGreaterThan(
@@ -127,10 +130,12 @@ public function testUninstallThenReinstallRecreatesSchemaAndDefaultRights(): voi
if (!$DB->tableExists('glpi_plugin_datainjection_models')) {
$this->withoutTransaction(static fn() => $plugin->install($id));
}
+
$plugin->getFromDB($id);
if ((int) $plugin->fields['state'] !== Plugin::ACTIVATED) {
$plugin->activate($id);
}
+
unset($_SESSION['MESSAGE_AFTER_REDIRECT']);
}
}
From cb72915df36447a79ad7a695d0cc2b205a7f09a9 Mon Sep 17 00:00:00 2001
From: RomainLvr
Date: Tue, 1 Sep 2026 14:42:38 +0200
Subject: [PATCH 4/7] Remove redundant tests
---
tests/unit/PluginLifecycleTest.php | 85 ------------------------------
1 file changed, 85 deletions(-)
diff --git a/tests/unit/PluginLifecycleTest.php b/tests/unit/PluginLifecycleTest.php
index 88015b37..61ef2b85 100644
--- a/tests/unit/PluginLifecycleTest.php
+++ b/tests/unit/PluginLifecycleTest.php
@@ -30,7 +30,6 @@
namespace GlpiPlugin\Datainjection\Tests\Unit;
-use DBmysql;
use GlpiPlugin\Datainjection\Tests\AbstractDataInjectionTestCase;
use Plugin;
@@ -51,92 +50,8 @@ public function testPluginIsInstalledAndActivatedByDefault(): void
self::assertSame(Plugin::ACTIVATED, (int) $plugin->fields['state']);
}
- /**
- * Only the DB-backed `state` field is checked here, not
- * Plugin::isPluginActive(): it reads a static, process-wide cache that
- * activate()/unactivate() do not keep reliably in sync (only a full
- * Plugin::bootPlugins() rescan does), so it is not a trustworthy signal
- * within a single test run and asserting on it would make this test
- * order-dependent on unrelated tests.
- */
- public function testDeactivateThenActivateTogglesState(): void
- {
- $plugin = $this->getPlugin();
- $id = $plugin->getID();
-
- $plugin->unactivate($id);
- self::assertTrue($plugin->getFromDB($id));
- self::assertSame(Plugin::NOTACTIVATED, (int) $plugin->fields['state']);
-
- $plugin->activate($id);
- self::assertTrue($plugin->getFromDB($id));
- self::assertSame(Plugin::ACTIVATED, (int) $plugin->fields['state']);
- }
-
public function testNeedUpdateOrInstallReportsUpToDateWhenFullyInstalled(): void
{
self::assertSame(-1, plugin_datainjection_needUpdateOrInstall());
}
-
- public function testUninstallThenReinstallRecreatesSchemaAndDefaultRights(): void
- {
- $plugin = $this->getPlugin();
- $id = $plugin->getID();
-
- /** @var DBmysql $DB */
- global $DB;
-
- $tables = [
- 'glpi_plugin_datainjection_models',
- 'glpi_plugin_datainjection_modelcsvs',
- 'glpi_plugin_datainjection_mappings',
- 'glpi_plugin_datainjection_infos',
- ];
-
- try {
- $this->withoutTransaction(static fn() => $plugin->uninstall($id));
-
- foreach ($tables as $table) {
- self::assertFalse($DB->tableExists($table), $table . ' should have been dropped');
- }
-
- self::assertSame(
- 0,
- countElementsInTable('glpi_profilerights', ['name' => 'plugin_datainjection_model']),
- 'Uninstall should remove the plugin rights from every profile',
- );
-
- self::assertTrue($plugin->getFromDB($id));
- self::assertSame(Plugin::NOTINSTALLED, (int) $plugin->fields['state']);
-
- self::assertSame(0, plugin_datainjection_needUpdateOrInstall());
-
- $this->withoutTransaction(static fn() => $plugin->install($id));
-
- foreach ($tables as $table) {
- self::assertTrue($DB->tableExists($table), $table . ' should have been recreated');
- }
-
- self::assertTrue($plugin->getFromDB($id));
- self::assertSame(Plugin::NOTACTIVATED, (int) $plugin->fields['state']);
- self::assertGreaterThan(
- 0,
- countElementsInTable('glpi_profilerights', ['name' => 'plugin_datainjection_model']),
- 'Install should seed the plugin right for the current profile',
- );
- } finally {
- // Whatever happened above, leave the environment exactly as every
- // other test in this suite expects it: installed and activated.
- if (!$DB->tableExists('glpi_plugin_datainjection_models')) {
- $this->withoutTransaction(static fn() => $plugin->install($id));
- }
-
- $plugin->getFromDB($id);
- if ((int) $plugin->fields['state'] !== Plugin::ACTIVATED) {
- $plugin->activate($id);
- }
-
- unset($_SESSION['MESSAGE_AFTER_REDIRECT']);
- }
- }
}
From cdd2701022c5ed7fe0f5d3b3348e590eb92a8e08 Mon Sep 17 00:00:00 2001
From: RomainLvr
Date: Fri, 25 Sep 2026 16:27:16 +0200
Subject: [PATCH 5/7] Fix rector
---
front/model.form.php | 8 +---
hook.php | 5 ++-
inc/backendcsv.class.php | 6 +--
inc/commoninjectionlib.class.php | 9 ++--
inc/engine.class.php | 5 +--
inc/entityinjection.class.php | 3 +-
inc/item_operatingsysteminjection.class.php | 3 +-
inc/model.class.php | 49 +++++++++------------
8 files changed, 34 insertions(+), 54 deletions(-)
diff --git a/front/model.form.php b/front/model.form.php
index 95f32e3c..266a47b3 100644
--- a/front/model.form.php
+++ b/front/model.form.php
@@ -30,13 +30,9 @@
Session::checkLoginUser();
-if (!isset($_GET["id"])) {
- $_GET["id"] = "";
-}
+$_GET["id"] ??= "";
-if (!isset($_GET["withtemplate"])) {
- $_GET["withtemplate"] = "";
-}
+$_GET["withtemplate"] ??= "";
$model = new PluginDatainjectionModel();
$model->checkGlobal(READ);
diff --git a/hook.php b/hook.php
index 3d163db7..dddea7c1 100644
--- a/hook.php
+++ b/hook.php
@@ -1993,9 +1993,10 @@ function plugin_datainjection_addDefaultWhere($itemtype)
}
return "`glpi_plugin_datainjection_models`.`id` IN ('" . implode("','", $tab) . "')";
- } else {
- return "1 = 0"; //no model available -> force WHERE clause to get no result
}
+ return "1 = 0";
+ //no model available -> force WHERE clause to get no result
+
// no break
default:
break;
diff --git a/inc/backendcsv.class.php b/inc/backendcsv.class.php
index 2c579b63..4f0f6398 100644
--- a/inc/backendcsv.class.php
+++ b/inc/backendcsv.class.php
@@ -225,16 +225,14 @@ public function getNextLine()
if ($data === false) {
return false;
}
-
- $line = [];
if (
(count($data) > 1)
|| ($data[0] != PluginDatainjectionCommonInjectionLib::EMPTY_VALUE)
) {
- $line = self::parseLine($this->file_handler, $data, $this->encoding);
+ return self::parseLine($this->file_handler, $data, $this->encoding);
}
- return $line;
+ return [];
}
diff --git a/inc/commoninjectionlib.class.php b/inc/commoninjectionlib.class.php
index e9bc926d..e41d5ba3 100644
--- a/inc/commoninjectionlib.class.php
+++ b/inc/commoninjectionlib.class.php
@@ -1506,9 +1506,8 @@ private function checkType($injectionClass, $option, $field_name, $data, $mandat
if ($data == 0 || $data == 1) {
return self::SUCCESS;
- } else {
- return self::TYPE_MISMATCH;
}
+ return self::TYPE_MISMATCH;
// no break
default:
@@ -1606,9 +1605,8 @@ private function lastCheckBeforeProcess($injectionClass)
//Specific reformat action is itemtype needs it
if (method_exists($injectionClass, 'lastCheck')) {
return $injectionClass->lastCheck($this->values);
- } else {
- return true;
}
+ return true;
}
//--------------------------------------------------//
@@ -1975,9 +1973,8 @@ protected function processDictionnariesIfNeeded()
if (method_exists($this->injectionClass, 'processDictionnariesIfNeeded')) {
//Invoke it
return $this->injectionClass->processDictionnariesIfNeeded($this->values);
- } else {
- return true;
}
+ return true;
}
/**
diff --git a/inc/engine.class.php b/inc/engine.class.php
index 810b93f1..fbd8e4c8 100644
--- a/inc/engine.class.php
+++ b/inc/engine.class.php
@@ -161,10 +161,7 @@ public function injectLine($line, $index)
*/
public function addRequiredFields($itemtype, &$fields_toinject = []): void
{
- //Add entity to the primary type
- if (!isset($fields_toinject[$itemtype]['entities_id'])) {
- $fields_toinject[$itemtype]['entities_id'] = $this->entity;
- }
+ $fields_toinject[$itemtype]['entities_id'] ??= $this->entity;
}
diff --git a/inc/entityinjection.class.php b/inc/entityinjection.class.php
index 3834521d..d8d69cfb 100644
--- a/inc/entityinjection.class.php
+++ b/inc/entityinjection.class.php
@@ -139,9 +139,8 @@ public function customimport($input = [], $add = true, $rights = [])
if (count($results)) {
$ent = array_pop($results);
return $this->updateExistingEntity($ent['id'], $input);
- } else {
- return $this->importEntity($input);
}
+ return $this->importEntity($input);
}
public function importEntity($input)
diff --git a/inc/item_operatingsysteminjection.class.php b/inc/item_operatingsysteminjection.class.php
index 34c8078b..07fd9d62 100644
--- a/inc/item_operatingsysteminjection.class.php
+++ b/inc/item_operatingsysteminjection.class.php
@@ -122,9 +122,8 @@ public function customDataAlreadyInDB($injectionClass, $values, $options)
if ($matching_os->count() > 0) {
$item_operatingsystem->getFromResultSet($matching_os->current());
return $item_operatingsystem->fields['id'];
- } else {
- return false;
}
+ return false;
}
diff --git a/inc/model.class.php b/inc/model.class.php
index 10f2d5fc..69f1535b 100644
--- a/inc/model.class.php
+++ b/inc/model.class.php
@@ -986,33 +986,28 @@ public function readUploadedFile($options = [])
return ['status' => ERROR,
'message' => $message,
];
+ }
+ //Initialise a new backend
+ $backend = PluginDatainjectionBackend::getInstance($this->fields['filetype']);
+ //Init backend with needed values
+ $backend->init($unique_filename, $file_encoding);
+ $backend->setHeaderPresent($this->specific_model->fields['is_header_present']);
+ $backend->setDelimiter($this->specific_model->fields['delimiter']);
+ if (!$webservice) {
+ //Read n line from the CSV file if not webservice
+ $injectionData = $backend->read(20);
} else {
- //Initialise a new backend
- $backend = PluginDatainjectionBackend::getInstance($this->fields['filetype']);
- //Init backend with needed values
- $backend->init($unique_filename, $file_encoding);
- $backend->setHeaderPresent($this->specific_model->fields['is_header_present']);
- $backend->setDelimiter($this->specific_model->fields['delimiter']);
-
- if (!$webservice) {
- //Read n line from the CSV file if not webservice
- $injectionData = $backend->read(20);
- } else {
- //Read the whole file
- $injectionData = $backend->read(-1);
- }
-
- //Read the whole file and store the number of lines found
- $backend->storeNumberOfLines();
- $_SESSION['datainjection']['lines'] = serialize($injectionData);
- $_SESSION['datainjection']['nblines'] = $backend->getNumberOfLines();
-
- if ($delete_file) {
- $backend->deleteFile();
- }
-
- $this->backend = $backend;
+ //Read the whole file
+ $injectionData = $backend->read(-1);
+ }
+ //Read the whole file and store the number of lines found
+ $backend->storeNumberOfLines();
+ $_SESSION['datainjection']['lines'] = serialize($injectionData);
+ $_SESSION['datainjection']['nblines'] = $backend->getNumberOfLines();
+ if ($delete_file) {
+ $backend->deleteFile();
}
+ $this->backend = $backend;
$this->injectionData = $injectionData;
return true;
@@ -1457,9 +1452,7 @@ public static function showLogResults($models_id)
// Prépare le résumé
foreach ($logresults as $results) {
foreach ($results as $result) {
- if (!isset($resume[$result['status']][$result['type']])) {
- $resume[$result['status']][$result['type']] = 0;
- }
+ $resume[$result['status']][$result['type']] ??= 0;
$resume[$result['status']][$result['type']]++;
$nblines++;
From c0e0845a5e47381598740ead491b7aced157356c Mon Sep 17 00:00:00 2001
From: RomainLvr
Date: Fri, 25 Sep 2026 16:34:41 +0200
Subject: [PATCH 6/7] Fix rector & tests
---
hook.php | 2 +-
inc/backendcsv.class.php | 1 +
inc/commoninjectionlib.class.php | 4 +++-
inc/entityinjection.class.php | 1 +
inc/item_operatingsysteminjection.class.php | 1 +
inc/model.class.php | 3 +++
tests/unit/EngineInjectLineTest.php | 6 +++---
7 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hook.php b/hook.php
index dddea7c1..8bebc93e 100644
--- a/hook.php
+++ b/hook.php
@@ -1994,10 +1994,10 @@ function plugin_datainjection_addDefaultWhere($itemtype)
return "`glpi_plugin_datainjection_models`.`id` IN ('" . implode("','", $tab) . "')";
}
+
return "1 = 0";
//no model available -> force WHERE clause to get no result
- // no break
default:
break;
}
diff --git a/inc/backendcsv.class.php b/inc/backendcsv.class.php
index 4f0f6398..2ffd2cac 100644
--- a/inc/backendcsv.class.php
+++ b/inc/backendcsv.class.php
@@ -225,6 +225,7 @@ public function getNextLine()
if ($data === false) {
return false;
}
+
if (
(count($data) > 1)
|| ($data[0] != PluginDatainjectionCommonInjectionLib::EMPTY_VALUE)
diff --git a/inc/commoninjectionlib.class.php b/inc/commoninjectionlib.class.php
index e41d5ba3..97d6ceb9 100644
--- a/inc/commoninjectionlib.class.php
+++ b/inc/commoninjectionlib.class.php
@@ -1507,9 +1507,9 @@ private function checkType($injectionClass, $option, $field_name, $data, $mandat
if ($data == 0 || $data == 1) {
return self::SUCCESS;
}
+
return self::TYPE_MISMATCH;
- // no break
default:
//Not a standard check ? Try checks specific to the injection class
//Will return SUCCESS if it's not a specific check
@@ -1606,6 +1606,7 @@ private function lastCheckBeforeProcess($injectionClass)
if (method_exists($injectionClass, 'lastCheck')) {
return $injectionClass->lastCheck($this->values);
}
+
return true;
}
@@ -1974,6 +1975,7 @@ protected function processDictionnariesIfNeeded()
//Invoke it
return $this->injectionClass->processDictionnariesIfNeeded($this->values);
}
+
return true;
}
diff --git a/inc/entityinjection.class.php b/inc/entityinjection.class.php
index d8d69cfb..d295f4f0 100644
--- a/inc/entityinjection.class.php
+++ b/inc/entityinjection.class.php
@@ -140,6 +140,7 @@ public function customimport($input = [], $add = true, $rights = [])
$ent = array_pop($results);
return $this->updateExistingEntity($ent['id'], $input);
}
+
return $this->importEntity($input);
}
diff --git a/inc/item_operatingsysteminjection.class.php b/inc/item_operatingsysteminjection.class.php
index 07fd9d62..48afa520 100644
--- a/inc/item_operatingsysteminjection.class.php
+++ b/inc/item_operatingsysteminjection.class.php
@@ -123,6 +123,7 @@ public function customDataAlreadyInDB($injectionClass, $values, $options)
$item_operatingsystem->getFromResultSet($matching_os->current());
return $item_operatingsystem->fields['id'];
}
+
return false;
}
diff --git a/inc/model.class.php b/inc/model.class.php
index 69f1535b..c5bf44aa 100644
--- a/inc/model.class.php
+++ b/inc/model.class.php
@@ -987,6 +987,7 @@ public function readUploadedFile($options = [])
'message' => $message,
];
}
+
//Initialise a new backend
$backend = PluginDatainjectionBackend::getInstance($this->fields['filetype']);
//Init backend with needed values
@@ -1000,6 +1001,7 @@ public function readUploadedFile($options = [])
//Read the whole file
$injectionData = $backend->read(-1);
}
+
//Read the whole file and store the number of lines found
$backend->storeNumberOfLines();
$_SESSION['datainjection']['lines'] = serialize($injectionData);
@@ -1007,6 +1009,7 @@ public function readUploadedFile($options = [])
if ($delete_file) {
$backend->deleteFile();
}
+
$this->backend = $backend;
$this->injectionData = $injectionData;
diff --git a/tests/unit/EngineInjectLineTest.php b/tests/unit/EngineInjectLineTest.php
index 12e48add..f2172d1a 100644
--- a/tests/unit/EngineInjectLineTest.php
+++ b/tests/unit/EngineInjectLineTest.php
@@ -45,7 +45,7 @@ private function createModelWithMappings(array $model_overrides = []): PluginDat
$model = $this->createItem(PluginDatainjectionModel::class, array_merge([
'name' => 'Test_Engine_Model_' . uniqid(),
'itemtype' => Computer::class,
- 'entities_id' => 0,
+ 'entities_id' => $this->getTestRootEntity(true),
'is_private' => 0,
'users_id' => Session::getLoginUserID(),
'behavior_add' => 1,
@@ -96,7 +96,7 @@ public function testInjectLineUpdatesExistingItemFromMappedCsvRow(): void
$computer = $this->createItem(Computer::class, [
'name' => 'Test_Engine_Computer_Update',
- 'entities_id' => 0,
+ 'entities_id' => $this->getTestRootEntity(true),
'serial' => 'OLD_SERIAL',
]);
@@ -130,7 +130,7 @@ public function testInjectLineRejectsUpdateWhenModelDisallowsUpdate(): void
$computer = $this->createItem(Computer::class, [
'name' => 'Test_Engine_Computer_NoUpdate',
- 'entities_id' => 0,
+ 'entities_id' => $this->getTestRootEntity(true),
'serial' => 'ORIGINAL',
]);
From 92327cbd6ce24603b16ea08b06fce17387ba9456 Mon Sep 17 00:00:00 2001
From: RomainLvr
Date: Mon, 5 Oct 2026 11:23:39 +0200
Subject: [PATCH 7/7] Fix autoload suffix & psalm cache
---
composer.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/composer.json b/composer.json
index 2bac6981..05547d5d 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
"php": ">=8.2"
},
"config": {
+ "autoloader-suffix": "PluginDatainjection",
"optimize-autoloader": true,
"platform": {
"php": "8.2.99"