Drop support of old Event class name

glpi-project · May 13, 2024 · d5e7da6 · d5e7da6
1 parent d4b49de
commit d5e7da6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/install/migrations/update_10.0.x_to_11.0.0/event.php b/install/migrations/update_10.0.x_to_11.0.0/event.php
@@ -33,7 +33,13 @@
  * ---------------------------------------------------------------------
  */
 
+use Glpi\Event;
+
 /**
  * @var array $ADDTODISPLAYPREF
+ * @var \Migration $migration
  */
+
 $ADDTODISPLAYPREF['Glpi\Event'] = [155, 156, 157, 158, 159, 160];
+
+$migration->renameItemtype('Event', Event::class);
diff --git a/src/DbUtils.php b/src/DbUtils.php
@@ -474,11 +474,6 @@ public function getClassForItemtype(string $itemtype): ?string
             return null;
         }
 
-        if ($itemtype === 'Event') {
-           //to avoid issues when pecl-event is installed...
-            $itemtype = 'Glpi\\Event';
-        }
-
         $classname = $this->fixItemtypeCase($itemtype);
 
         if (!is_subclass_of($classname, CommonGLPI::class, true)) {

diff --git a/tests/functional/Transfer.php b/tests/functional/Transfer.php
@@ -66,7 +66,6 @@ public function testTransfer()
                 '/^DB.*/',
                 '/^SlaLevel.*/',
                 '/^OlaLevel.*/',
-                'Event',
                 'Glpi\\Event',
                 'KnowbaseItem',
                 '/SavedSearch.*/',