From d84040b08f2974c3c31dcfb69d490c7ce8a2183b Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Sat, 27 Apr 2024 15:40:04 -0400
Subject: [PATCH 1/6] Clean Device Code

---
 CHANGELOG.md                      |   1 +
 src/CommonDBRelation.php          |   2 +-
 src/CommonDevice.php              | 228 +++++++++++-------------------
 src/DeviceBattery.php             |  23 ++-
 src/DeviceBatteryModel.php        |   1 -
 src/DeviceCamera.php              |  29 ++--
 src/DeviceCase.php                |  29 ++--
 src/DeviceControl.php             |  54 ++++---
 src/DeviceDrive.php               |  39 ++---
 src/DeviceFirmware.php            |  31 ++--
 src/DeviceGeneric.php             |  34 ++---
 src/DeviceGraphicCard.php         |  53 +++----
 src/DeviceHardDrive.php           |  55 +++----
 src/DeviceMemory.php              |  46 +++---
 src/DeviceMotherboard.php         |  30 ++--
 src/DeviceNetworkCard.php         |  69 ++++-----
 src/DevicePci.php                 |  36 ++---
 src/DevicePowerSupply.php         |  25 ++--
 src/DeviceProcessor.php           |  54 +++----
 src/DeviceSensor.php              |  40 +++---
 src/DeviceSimcard.php             |  25 ++--
 src/DeviceSoundCard.php           |  54 ++++---
 src/PCIVendor.php                 |  60 ++++----
 src/RegisteredID.php              |  42 +++---
 src/USBVendor.php                 |  53 ++++---
 templates/dropdown_form.html.twig |   6 +
 26 files changed, 466 insertions(+), 653 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 441b4e5621c..d7adf15062f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -136,6 +136,7 @@ The present file will list all changes made to the project; according to the
 - `Lock::getLocksQueryInfosByItemType()` has been made private.
 - `DBmysql::request()`, `DBmysqlIterator::buildQuery()` and `DBmysqlIterator::execute()` methods signatures changed.
 -  Some values for the `$type` parameters of several `Stat` methods have changed to match English spelling (technicien -> technician).
+- Multiple methods in `CommonDevice` and sub-classes now have return types defined (classes that extends these must match the new method signatures).
 
 #### Deprecated
 - Usage of `MAIL_SMTPSSL` and `MAIL_SMTPTLS` constants.
diff --git a/src/CommonDBRelation.php b/src/CommonDBRelation.php
index fffa2d2c1f7..5a0a1edf6ec 100644
--- a/src/CommonDBRelation.php
+++ b/src/CommonDBRelation.php
@@ -256,7 +256,7 @@ public static function getOppositeItemtype(?string $itemtype): ?string
      *
      * @param $number
      *
-     * @return boolean
+     * @return CommonDBTM|false
      **/
     public function getOnePeer($number)
     {
diff --git a/src/CommonDevice.php b/src/CommonDevice.php
index 4af840a422c..9128bc6dc6d 100644
--- a/src/CommonDevice.php
+++ b/src/CommonDevice.php
@@ -52,20 +52,19 @@ abstract class CommonDevice extends CommonDropdown
     public $second_level_menu = "commondevice";
     public $third_level_menu  = "";
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Component', 'Components', $nb);
     }
 
-
     /**
      * Get all the kind of devices available inside the system.
      *
      * @since 0.85
      *
-     * @return array of the types of CommonDevice available
+     * @return array Array of the types of CommonDevice available
      **/
-    public static function getDeviceTypes()
+    public static function getDeviceTypes(): array
     {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
@@ -73,8 +72,6 @@ public static function getDeviceTypes()
         return $CFG_GLPI['device_types'];
     }
 
-
-
     /**
      * Get the associated item_device associated with this device
      * This method can be overridden, for instance by the plugin
@@ -82,15 +79,14 @@ public static function getDeviceTypes()
      * @since 0.85
      * @since 9.3 added the $devicetype parameter
      *
-     * @param string $devicetype class name of device type, defaults to called class name
+     * @param class-string|null $devicetype class name of device type, defaults to called class name
      *
-     * @return string
+     * @return class-string<Item_Devices>
      **/
-    public static function getItem_DeviceType($devicetype = null)
+    public static function getItem_DeviceType($devicetype = null): string
     {
-
         if (null === $devicetype) {
-            $devicetype = get_called_class();
+            $devicetype = static::class;
         }
         if ($plug = isPluginItemType($devicetype)) {
             return 'Plugin' . $plug['plugin'] . 'Item_' . $plug['class'];
@@ -98,15 +94,8 @@ public static function getItem_DeviceType($devicetype = null)
         return "Item_$devicetype";
     }
 
-
-    /**
-     *  @see CommonGLPI::getMenuContent()
-     *
-     *  @since 0.85
-     **/
-    public static function getMenuContent()
+    public static function getMenuContent(): false|array
     {
-
         $menu = [];
         if (self::canView()) {
             $menu['title'] = static::getTypeName(Session::getPluralNumber());
@@ -116,17 +105,18 @@ public static function getMenuContent()
             $dps = Dropdown::getDeviceItemTypes();
 
             foreach ($dps as $tab) {
+                /** @var class-string $key */
                 foreach ($tab as $key => $val) {
                     if ($tmp = getItemForItemtype($key)) {
                         $menu['options'][$key] = [
                             'title' => $val,
-                            'page'  => $tmp->getSearchURL(false),
+                            'page'  => $tmp::getSearchURL(false),
                             'links' => [
-                                'search' => $tmp->getSearchURL(false),
+                                'search' => $tmp::getSearchURL(false),
                             ]
                         ];
-                        if ($tmp->canCreate()) {
-                            $menu['options'][$key]['links']['add'] = $tmp->getFormURL(false);
+                        if ($tmp::canCreate()) {
+                            $menu['options'][$key]['links']['add'] = $tmp::getFormURL(false);
                         }
 
                         if ($itemClass = getItemForItemtype(self::getItem_DeviceType($key))) {
@@ -137,11 +127,11 @@ public static function getMenuContent()
 
                             $listLabel = '<i class="fa fa-list pointer" title="' . $itemTypeName . '"></i>'
                             . '<span class="sr-only">' . $itemTypeName . '</span>';
-                            $menu['options'][$key]['links'][$listLabel] = $itemClass->getSearchURL(false);
+                            $menu['options'][$key]['links'][$listLabel] = $itemClass::getSearchURL(false);
 
                             // item device self links
-                            $item_device_key = $itemClass->getType();
-                            $item_device_search_url = $itemClass->getSearchURL(false);
+                            $item_device_key = $itemClass::class;
+                            $item_device_search_url = $itemClass::getSearchURL(false);
                             $menu['options'][$item_device_key] = [
                                 'title' => $itemTypeName,
                                 'page'  => $item_device_search_url,
@@ -149,8 +139,8 @@ public static function getMenuContent()
                                     'search' => $item_device_search_url,
                                 ],
                             ];
-                            if ($itemClass->canCreate()) {
-                                $menu['options'][$item_device_key]['links']['add'] = $itemClass->getFormURL(false);
+                            if ($itemClass::canCreate()) {
+                                $menu['options'][$item_device_key]['links']['add'] = $itemClass::getFormURL(false);
                             }
                         }
                     }
@@ -163,9 +153,8 @@ public static function getMenuContent()
         return false;
     }
 
-    public function displaySpecificTypeField($ID, $field = [], array $options = [])
+    public function displaySpecificTypeField($ID, $field = [], array $options = []): void
     {
-
         switch ($field['type']) {
             case 'registeredIDChooser':
                 RegisteredID::showChildsForItemForm($this, '_registeredID');
@@ -173,28 +162,18 @@ public function displaySpecificTypeField($ID, $field = [], array $options = [])
         }
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
-        return [['name'  => 'manufacturers_id',
-            'label' => Manufacturer::getTypeName(1),
-            'type'  => 'dropdownValue'
-        ]
+        return [
+            [
+                'name'  => 'manufacturers_id',
+                'label' => Manufacturer::getTypeName(1),
+                'type'  => 'dropdownValue'
+            ]
         ];
     }
 
-    /**
-     * Can I change recursive flag to false
-     * check if there is "linked" object in another entity
-     *
-     * Overloaded from CommonDBTM
-     *
-     * @since 0.85
-     *
-     * @return boolean
-     **/
-    public function canUnrecurs()
+    public function canUnrecurs(): bool
     {
         /** @var \DBmysql $DB */
         global $DB;
@@ -256,8 +235,7 @@ public function canUnrecurs()
         return true;
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = [];
 
@@ -268,7 +246,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '1',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'designation',
             'name'               => __('Name'),
             'datatype'           => 'itemlink',
@@ -277,7 +255,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '2',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'id',
             'name'               => __('ID'),
             'datatype'           => 'number',
@@ -294,7 +272,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '16',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'comment',
             'name'               => __('Comments'),
             'datatype'           => 'text'
@@ -302,7 +280,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '19',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'date_mod',
             'name'               => __('Last update'),
             'datatype'           => 'datetime',
@@ -311,7 +289,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '121',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'date_creation',
             'name'               => __('Creation date'),
             'datatype'           => 'datetime',
@@ -329,46 +307,35 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
-    public function title()
+    public function title(): void
     {
-
         Dropdown::showItemTypeMenu(
             _n('Component', 'Components', Session::getPluralNumber()),
             Dropdown::getDeviceItemTypes(),
-            $this->getSearchURL()
+            self::getSearchURL()
         );
     }
 
-    /**
-     * @since 0.84
-     *
-     * @see CommonDBTM::getNameField
-     *
-     * @return string
-     **/
-    public static function getNameField()
+    public static function getNameField(): string
     {
         return 'designation';
     }
 
-
     /**
-     * @since 0.84
-     * get the HTMLTable Header for the current device according to the type of the item that
-     * is requesting
-     *
-     * @param $itemtype  string   the type of the item
-     * @param $base               HTMLTableBase object:the element on which adding the header
+     * get the HTMLTable Header for the current device according to the type of the item that is requesting
+     * @param string $itemtype The type of the item
+     * @param HTMLTableBase $base The element on which adding the header
      *                            (ie.: HTMLTableMain or HTMLTableGroup)
-     * @param $super              HTMLTableSuperHeader object: the super header
+     * @param HTMLTableSuperHeader|null $super The super header
      *                            (in case of adding to HTMLTableGroup) (default NULL)
-     * @param $father             HTMLTableHeader object: the father of the current headers
+     * @param HTMLTableHeader|null $father The father of the current headers
      *                            (default NULL)
-     * @param $options   array    parameter such as restriction
+     * @param array $options parameter such as restriction
      *
      * @return HTMLTableHeader|void
-     **/
+     * @throws Exception
+     * @since 0.84
+     */
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -376,10 +343,7 @@ public static function getHTMLTableHeader(
         HTMLTableHeader $father = null,
         array $options = []
     ) {
-
-        $this_type = get_called_class();
-
-        if (isset($options['dont_display'][$this_type])) {
+        if (isset($options['dont_display'][static::class])) {
             return $father;
         }
 
@@ -393,7 +357,7 @@ public static function getHTMLTableHeader(
         if (in_array($itemtype, $linktype::itemAffinity()) || in_array('*', $linktype::itemAffinity())) {
             $column = $base->addHeader('device', $content, $super, $father);
             $column->setItemType(
-                $this_type,
+                static::class,
                 isset($options['itemtype_title']) ? $options['itemtype_title'] : ''
             );
         } else {
@@ -403,47 +367,45 @@ public static function getHTMLTableHeader(
         return $column;
     }
 
-
     /**
-     * @since 0.84
-     *
+     * @param HTMLTableRow|null $row object
+     * @param CommonDBTM|null $item object (default NULL)
+     * @param HTMLTableCell|null $father object (default NULL)
+     * @param array $options
+     * @return HTMLTableCell|null
+     * @throws Exception
      * @warning note the difference between getHTMLTableCellForItem and getHTMLTableCellsForItem
-     *
-     * @param $row                HTMLTableRow object
-     * @param $item               CommonDBTM object (default NULL)
-     * @param $father             HTMLTableCell object (default NULL)
-     * @param $options   array
-     **/
+     * @since 0.84
+     */
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
-        $this_type = $this->getType();
+    ): ?HTMLTableCell
+    {
 
-        if (isset($options['dont_display'][$this_type])) {
+        if (isset($options['dont_display'][static::class])) {
             return $father;
         }
 
         if (static::canView()) {
             $content = $this->getLink([
-                'icon' => $this->getIcon()
+                'icon' => self::getIcon()
             ]);
         } else {
             $content = $this->getName([
-                'icon' => $this->getIcon()
+                'icon' => self::getIcon()
             ]);
         }
 
         if ($options['canedit']) {
-            $field_name  = 'quantity_' . $this->getType() . '_' . $this->getID();
+            $field_name  = 'quantity_' . static::class . '_' . $this->getID();
             $content .= "&nbsp;<span class='fa fa-plus pointer' title='" . __s('Add') . "'
                       onClick=\"" . Html::jsShow($field_name) . "\"
                       ><span class='sr-only'>" .  __s('Add') . "</span></span>";
             $content .= "<span id='$field_name' style='display:none'><br>";
-            $content .= __('Add') . "&nbsp;";
+            $content .= __s('Add') . "&nbsp;";
 
             $content  = [$content,
                 ['function'   => 'Dropdown::showNumber',
@@ -458,7 +420,7 @@ public function getHTMLTableCellForItem(
         }
 
         $linktype = static::getItem_DeviceType();
-        if (in_array($item->getType(), $linktype::itemAffinity()) || in_array('*', $linktype::itemAffinity())) {
+        if (in_array($item::class, $linktype::itemAffinity()) || in_array('*', $linktype::itemAffinity())) {
             $cell = $row->addCell(
                 $row->getHeaderByName('common', 'device'),
                 $content,
@@ -472,15 +434,14 @@ public function getHTMLTableCellForItem(
         return $cell;
     }
 
-
     /**
      * Import a device is not exists
      *
-     * @param $input array of datas
+     * @param array $input Array of datas
      *
      * @return integer ID of existing or new Device
      **/
-    public function import(array $input)
+    public function import(array $input): int
     {
         /** @var \DBmysql $DB */
         global $DB;
@@ -488,7 +449,7 @@ public function import(array $input)
         $with_history = $input['with_history'] ?? true;
         unset($input['with_history']);
 
-        if (!isset($input['designation']) || empty($input['designation'])) {
+        if (empty($input['designation'])) {
             return 0;
         }
         $where      = [];
@@ -527,7 +488,7 @@ public function import(array $input)
 
         $iterator = $DB->request([
             'SELECT' => ['id'],
-            'FROM'   => $this->getTable(),
+            'FROM'   => static::getTable(),
             'WHERE'  => $where
         ]);
 
@@ -539,29 +500,21 @@ public function import(array $input)
         return $this->add($input, [], $with_history);
     }
 
-
     /**
      * Criteria used for import function
      *
      * @since 0.84
      **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'      => 'equal',
+        return [
+            'designation'      => 'equal',
             'manufacturers_id' => 'equal'
         ];
     }
 
-
-    /**
-     * @see CommonDropdown::defineTabs()
-     *
-     * @since 0.85
-     */
-    public function defineTabs($options = [])
+    public function defineTabs($options = []): array
     {
-
         $ong = [];
         $this->addDefaultFormTab($ong);
         $this->addImpactTab($ong, $options);
@@ -572,13 +525,11 @@ public function defineTabs($options = [])
         return $ong;
     }
 
-
     /**
      * @since 0.85
      **/
-    public function post_workOnItem()
+    public function post_workOnItem(): void
     {
-
         if (
             (isset($this->input['_registeredID']))
             && (is_array($this->input['_registeredID']))
@@ -615,56 +566,39 @@ public function post_workOnItem()
         }
     }
 
-
-    /**
-     * @since 0.85
-     * @see CommonDBTM::post_addItem()
-     **/
-    public function post_addItem()
+    public function post_addItem(): void
     {
-
         $this->post_workOnItem();
         parent::post_addItem();
     }
 
-
-    /**
-     * @since 0.85
-     * @see CommonDBTM::post_updateItem()
-     **/
-    public function post_updateItem($history = true)
+    public function post_updateItem($history = true): void
     {
-
         $this->post_workOnItem();
         parent::post_updateItem($history);
     }
 
-    public static function getFormURL($full = true)
+    public static function getFormURL($full = true): string
     {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
 
         $dir = ($full ? $CFG_GLPI['root_doc'] : '');
-        $itemtype = get_called_class();
-        $link = "$dir/front/device.form.php?itemtype=$itemtype";
-
-        return $link;
+        $itemtype = static::class;
+        return "$dir/front/device.form.php?itemtype=$itemtype";
     }
 
-    public static function getSearchURL($full = true)
+    public static function getSearchURL($full = true): string
     {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
 
         $dir = ($full ? $CFG_GLPI['root_doc'] : '');
-        $itemtype = get_called_class();
-        $link = "$dir/front/device.php?itemtype=$itemtype";
-
-        return $link;
+        $itemtype = static::class;
+        return "$dir/front/device.php?itemtype=$itemtype";
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-components";
     }
diff --git a/src/DeviceBattery.php b/src/DeviceBattery.php
index 319266bbf1e..358ae98ab58 100644
--- a/src/DeviceBattery.php
+++ b/src/DeviceBattery.php
@@ -37,13 +37,12 @@ class DeviceBattery extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceBattery', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Battery', 'Batteries', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -71,14 +70,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'capacity',
             'name'               => __('Capacity'),
             'datatype'           => 'integer',
@@ -86,7 +84,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'voltage',
             'name'               => __('Voltage'),
             'datatype'           => 'integer',
@@ -128,7 +126,8 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
+    ): ?HTMLTableCell
+    {
 
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
@@ -164,12 +163,11 @@ public function getHTMLTableCellForItem(
                 $father
             );
         }
+        return null;
     }
 
-
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
         return [
             'designation'           => 'equal',
             'devicebatterytypes_id' => 'equal',
@@ -179,8 +177,7 @@ public function getImportCriteria()
         ];
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-battery-2";
     }
diff --git a/src/DeviceBatteryModel.php b/src/DeviceBatteryModel.php
index e632551e347..c530ad5311f 100644
--- a/src/DeviceBatteryModel.php
+++ b/src/DeviceBatteryModel.php
@@ -38,7 +38,6 @@ class DeviceBatteryModel extends CommonDeviceModel
 {
     public $additional_fields_for_dictionnary = ['manufacturer'];
 
-
     public static function getTypeName($nb = 0)
     {
         return _n('Device battery model', 'Device batteries models', $nb);
diff --git a/src/DeviceCamera.php b/src/DeviceCamera.php
index 5803e21686d..a93a763a3f3 100644
--- a/src/DeviceCamera.php
+++ b/src/DeviceCamera.php
@@ -37,14 +37,13 @@ class DeviceCamera extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceCamera', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Camera', 'Cameras', $nb);
     }
 
-    public function defineTabs($options = [])
+    public function defineTabs($options = []): array
     {
-
         $ong = [];
         $this->addDefaultFormTab($ong)
          ->addImpactTab($ong, $options)
@@ -56,7 +55,7 @@ public function defineTabs($options = [])
         return $ong;
     }
 
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -100,7 +99,7 @@ public function getAdditionalFields()
         );
     }
 
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
@@ -114,7 +113,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'flashunit',
             'name'               => __('Flashunit'),
             'datatype'           => 'bool',
@@ -122,7 +121,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'lensfacing',
             'name'               => __('Lensfacing'),
             'datatype'           => 'string',
@@ -130,7 +129,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '13',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'orientation',
             'name'               => __('orientation'),
             'datatype'           => 'string',
@@ -138,7 +137,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '14',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'focallength',
             'name'               => __('Focal length'),
             'datatype'           => 'string',
@@ -146,7 +145,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '15',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'sensorsize',
             'name'               => __('Sensor size'),
             'datatype'           => 'string',
@@ -154,7 +153,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '17',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'support',
             'name'               => __('Support'),
             'datatype'           => 'string',
@@ -192,7 +191,8 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
+    ): ?HTMLTableCell
+    {
 
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
@@ -225,9 +225,10 @@ public function getHTMLTableCellForItem(
                 $father
             );
         }
+        return null;
     }
 
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
         return [
             'designation'           => 'equal',
@@ -236,7 +237,7 @@ public function getImportCriteria()
         ];
     }
 
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-camera";
     }
diff --git a/src/DeviceCase.php b/src/DeviceCase.php
index 3ec57e9bd4f..e2e2320a6f8 100644
--- a/src/DeviceCase.php
+++ b/src/DeviceCase.php
@@ -38,15 +38,13 @@ class DeviceCase extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceCase', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Case', 'Cases', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [['name'  => 'devicecasetypes_id',
@@ -61,8 +59,7 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
@@ -85,7 +82,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -113,8 +109,8 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -126,20 +122,13 @@ public function getHTMLTableCellForItem(
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 break;
         }
+        return null;
     }
 
-
-    /**
-     * Criteria used for import function
-     *
-     * @see CommonDevice::getImportCriteria()
-     *
-     * @since 0.84
-     **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'        => 'equal',
+        return [
+            'designation'        => 'equal',
             'manufacturers_id'   => 'equal',
             'devicecasetypes_id' => 'equal'
         ];
diff --git a/src/DeviceControl.php b/src/DeviceControl.php
index 2b366ba20ae..195220d7e0c 100644
--- a/src/DeviceControl.php
+++ b/src/DeviceControl.php
@@ -40,51 +40,47 @@ class DeviceControl extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceControl', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Controller', 'Controllers', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
-            [['name'  => 'is_raid',
-                'label' => __('RAID'),
-                'type'  => 'bool'
-            ],
-                ['name'  => 'interfacetypes_id',
+            [
+                [
+                    'name'  => 'is_raid',
+                    'label' => __('RAID'),
+                    'type'  => 'bool'
+                ],
+                [
+                    'name'  => 'interfacetypes_id',
                     'label' => __('Interface'),
                     'type'  => 'dropdownValue'
                 ],
-                ['name'  => 'devicecontrolmodels_id',
+                [
+                    'name'  => 'devicecontrolmodels_id',
                     'label' => _n('Model', 'Models', 1),
                     'type'  => 'dropdownValue'
                 ],
-                ['name'  => 'none',
-                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()) .
-                                        RegisteredID::showAddChildButtonForItemForm(
-                                            $this,
-                                            '_registeredID',
-                                            null,
-                                            false
-                                        ),
+                [
+                    'name'  => 'none',
+                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()),
                     'type'  => 'registeredIDChooser'
                 ]
             ]
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'is_raid',
             'name'               => __('RAID'),
             'datatype'           => 'bool'
@@ -109,7 +105,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -125,7 +120,7 @@ public static function getHTMLTableHeader(
         }
 
         switch ($itemtype) {
-            case 'Computer':
+            case Computer::class:
                 Manufacturer::getHTMLTableHeader(__CLASS__, $base, $super, $father, $options);
                 InterfaceType::getHTMLTableHeader(__CLASS__, $base, $super, $father, $options);
 
@@ -133,29 +128,28 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
+        switch ($item::class) {
+            case Computer::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 InterfaceType::getHTMLTableCellsForItem($row, $this, null, $options);
         }
+        return $column;
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-cpu";
     }
diff --git a/src/DeviceDrive.php b/src/DeviceDrive.php
index 78effbce362..c0b2515629a 100644
--- a/src/DeviceDrive.php
+++ b/src/DeviceDrive.php
@@ -38,15 +38,13 @@ class DeviceDrive extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceDrive', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Drive', 'Drives', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [['name'  => 'is_writer',
@@ -69,14 +67,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'is_writer',
             'name'               => __('Writing ability'),
             'datatype'           => 'bool'
@@ -84,7 +81,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '13',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'speed',
             'name'               => __('Speed'),
             'datatype'           => 'string',
@@ -109,7 +106,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -134,21 +130,20 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
+        switch ($item::class) {
             case 'Computer':
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 if ($this->fields["is_writer"]) {
@@ -169,27 +164,19 @@ public function getHTMLTableCellForItem(
 
                 InterfaceType::getHTMLTableCellsForItem($row, $this, null, $options);
         }
+        return null;
     }
 
-
-    /**
-     * Criteria used for import function
-     *
-     * @see CommonDevice::getImportCriteria()
-     *
-     * @since 0.84
-     **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'       => 'equal',
+        return [
+            'designation'       => 'equal',
             'manufacturers_id'  => 'equal',
             'interfacetypes_id' => 'equal'
         ];
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "far fa-hdd";
     }
diff --git a/src/DeviceFirmware.php b/src/DeviceFirmware.php
index b4cd64b27a2..aca2e8787d4 100644
--- a/src/DeviceFirmware.php
+++ b/src/DeviceFirmware.php
@@ -37,15 +37,13 @@ class DeviceFirmware extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceFirmware', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Firmware', 'Firmware', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [
@@ -73,14 +71,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'date',
             'name'               => __('Release date'),
             'datatype'           => 'date'
@@ -112,7 +109,7 @@ public function rawSearchOptions()
         return $tab;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
@@ -160,7 +157,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
             'datatype'           => 'dropdown',
             'joinparams'         => [
                 'beforejoin' => [
-                    'table'      => DeviceFirmware::getTable(),
+                    'table'      => self::getTable(),
                     'joinparams' => [
                         'beforejoin' => [
                             'table'      => Item_DeviceFirmware::getTable(),
@@ -180,7 +177,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
             'datatype'           => 'dropdown',
             'joinparams'         => [
                 'beforejoin' => [
-                    'table'      => DeviceFirmware::getTable(),
+                    'table'      => self::getTable(),
                     'joinparams' => [
                         'beforejoin' => [
                             'table'      => Item_DeviceFirmware::getTable(),
@@ -200,7 +197,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
             'datatype'           => 'dropdown',
             'joinparams'         => [
                 'beforejoin' => [
-                    'table'      => DeviceFirmware::getTable(),
+                    'table'      => self::getTable(),
                     'joinparams' => [
                         'beforejoin' => [
                             'table'      => Item_DeviceFirmware::getTable(),
@@ -267,7 +264,8 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
+    ): ?HTMLTableCell
+    {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
@@ -276,7 +274,7 @@ public function getHTMLTableCellForItem(
             return $father;
         }
 
-        if (in_array($item->getType(), $CFG_GLPI['itemdevicefirmware_types'])) {
+        if (in_array($item::class, $CFG_GLPI['itemdevicefirmware_types'], true)) {
             Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
 
             if ($this->fields["devicefirmwaretypes_id"]) {
@@ -303,11 +301,11 @@ public function getHTMLTableCellForItem(
                 );
             }
         }
+        return null;
     }
 
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
         return [
             'designation'              => 'equal',
             'devicefirmwaretypes_id'   => 'equal',
@@ -316,8 +314,7 @@ public function getImportCriteria()
         ];
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "fas fa-microchip";
     }
diff --git a/src/DeviceGeneric.php b/src/DeviceGeneric.php
index f268756525d..3d82a74d53d 100644
--- a/src/DeviceGeneric.php
+++ b/src/DeviceGeneric.php
@@ -38,15 +38,13 @@ class DeviceGeneric extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceGeneric', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Generic device', 'Generic devices', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [['name'  => 'devicegenerictypes_id',
@@ -57,8 +55,7 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab                 = parent::rawSearchOptions();
 
@@ -73,7 +70,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -96,22 +92,21 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
+        switch ($item::class) {
+            case Computer::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 if ($this->fields["devicegenerictypes_id"]) {
                     $type_name = Dropdown::getDropdownName(
@@ -122,20 +117,13 @@ public function getHTMLTableCellForItem(
                 }
                 break;
         }
+        return null;
     }
 
-
-    /**
-     * Criteria used for import function
-     *
-     * @see CommonDevice::getImportCriteria()
-     *
-     * @since 0.84
-     **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'       => 'equal',
+        return [
+            'designation'       => 'equal',
             'manufacturers_id'  => 'equal',
             'devicecasetypes_id' => 'equal',
             'locations_id'      => 'equal',
diff --git a/src/DeviceGraphicCard.php b/src/DeviceGraphicCard.php
index 86ebcc4a059..b92d7fe2fc5 100644
--- a/src/DeviceGraphicCard.php
+++ b/src/DeviceGraphicCard.php
@@ -38,15 +38,13 @@ class DeviceGraphicCard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceGraphicCard', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Graphics card', 'Graphics cards', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [
@@ -69,8 +67,7 @@ public function getAdditionalFields()
                 ],
                 [
                     'name'  => 'none',
-                    'label' => RegisteredID::getTypeName(Session::getPluralNumber())
-                        . RegisteredID::showAddChildButtonForItemForm($this, '_registeredID', null, false),
+                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()),
                     'type'  => 'registeredIDChooser'
                 ],
                 [
@@ -82,14 +79,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'chipset',
             'name'               => __('Chipset'),
             'datatype'           => 'string',
@@ -97,7 +93,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'memory_default',
             'name'               => __('Memory by default'),
             'datatype'           => 'integer',
@@ -122,16 +118,14 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     /**
      * @since 0.85
-     * @param  $input
+     * @param array $input
      *
-     * @return number
+     * @return array|false
      **/
-    public function prepareInputForAddOrUpdate($input)
+    public function prepareInputForAddOrUpdate($input): array|false
     {
-
         foreach (['memory_default'] as $field) {
             if (isset($input[$field]) && !is_numeric($input[$field])) {
                 $input[$field] = 0;
@@ -140,19 +134,16 @@ public function prepareInputForAddOrUpdate($input)
         return $input;
     }
 
-
-    public function prepareInputForAdd($input)
+    public function prepareInputForAdd($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
-    public function prepareInputForUpdate($input)
+    public function prepareInputForUpdate($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -160,7 +151,6 @@ public static function getHTMLTableHeader(
         HTMLTableHeader $father = null,
         array $options = []
     ) {
-
         $column = parent::getHTMLTableHeader($itemtype, $base, $super, $father, $options);
 
         if ($column == $father) {
@@ -168,7 +158,7 @@ public static function getHTMLTableHeader(
         }
 
         switch ($itemtype) {
-            case 'Computer':
+            case Computer::class:
                 Manufacturer::getHTMLTableHeader(__CLASS__, $base, $super, $father, $options);
                 InterfaceType::getHTMLTableHeader(__CLASS__, $base, $super, $father, $options);
                 $base->addHeader('devicegraphiccard_chipset', __('Chipset'), $super, $father);
@@ -176,27 +166,27 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
+        $cell = null;
+        switch ($item::class) {
+            case Computer::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 InterfaceType::getHTMLTableCellsForItem($row, $this, null, $options);
 
                 if (!empty($this->fields["chipset"])) {
-                    $row->addCell(
+                    $cell = $row->addCell(
                         $row->getHeaderByName('devicegraphiccard_chipset'),
                         $this->fields["chipset"],
                         $father
@@ -204,19 +194,18 @@ public function getHTMLTableCellForItem(
                 }
                 break;
         }
+        return $cell;
     }
 
-
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
         return [
             'designation' => 'equal',
             'chipset'  => 'equal',
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
diff --git a/src/DeviceHardDrive.php b/src/DeviceHardDrive.php
index f9f202c4602..2449a5231fb 100644
--- a/src/DeviceHardDrive.php
+++ b/src/DeviceHardDrive.php
@@ -40,15 +40,13 @@ class DeviceHardDrive extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceHardDrive', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Hard drive', 'Hard drives', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [
@@ -89,14 +87,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'capacity_default',
             'name'               => __('Capacity by default'),
             'datatype'           => 'integer',
@@ -104,7 +101,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'rpm',
             'name'               => __('Rpm'),
             'datatype'           => 'string',
@@ -112,7 +109,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '13',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'cache',
             'name'               => __('Cache'),
             'datatype'           => 'integer',
@@ -145,16 +142,14 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     /**
      * @since 0.85
-     * @param $input
+     * @param array $input
      *
-     * @return number
+     * @return array|false
      **/
-    public function prepareInputForAddOrUpdate($input)
+    public function prepareInputForAddOrUpdate($input): array|false
     {
-
         foreach (['capacity_default'] as $field) {
             if (isset($input[$field]) && !is_numeric($input[$field])) {
                 $input[$field] = 0;
@@ -163,19 +158,16 @@ public function prepareInputForAddOrUpdate($input)
         return $input;
     }
 
-
-    public function prepareInputForAdd($input)
+    public function prepareInputForAdd($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
-    public function prepareInputForUpdate($input)
+    public function prepareInputForUpdate($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -183,7 +175,6 @@ public static function getHTMLTableHeader(
         HTMLTableHeader $father = null,
         array $options = []
     ) {
-
         $column = parent::getHTMLTableHeader($itemtype, $base, $super, $father, $options);
 
         if ($column == $father) {
@@ -201,14 +192,13 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -242,19 +232,11 @@ public function getHTMLTableCellForItem(
                 InterfaceType::getHTMLTableCellsForItem($row, $this, null, $options);
                 break;
         }
+        return null;
     }
 
-
-    /**
-     * Criteria used for import function
-     *
-     * @see CommonDevice::getImportCriteria()
-     *
-     * @since 0.84
-     **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
         return ['designation'       => 'equal',
             'manufacturers_id'  => 'equal',
             'interfacetypes_id' => 'equal',
@@ -262,7 +244,7 @@ public function getImportCriteria()
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
@@ -311,7 +293,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
             'datatype'           => 'dropdown',
             'joinparams'         => [
                 'beforejoin' => [
-                    'table'      => DeviceHardDrive::getTable(),
+                    'table'      => self::getTable(),
                     'joinparams' => [
                         'beforejoin' => [
                             'table'      => Item_DeviceHardDrive::getTable(),
@@ -325,8 +307,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
         return $tab;
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "far fa-hdd";
     }
diff --git a/src/DeviceMemory.php b/src/DeviceMemory.php
index 669bab74503..d62f84153cd 100644
--- a/src/DeviceMemory.php
+++ b/src/DeviceMemory.php
@@ -40,15 +40,13 @@ class DeviceMemory extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceMemory', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Memory', 'Memory', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [
@@ -80,14 +78,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'size_default',
             'name'               => __('Size by default'),
             'datatype'           => 'integer',
@@ -95,7 +92,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'frequence',
             'name'               => sprintf(__('%1$s (%2$s)'), __('Frequency'), __('MHz')),
             'datatype'           => 'integer',
@@ -120,16 +117,14 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     /**
      * @since 0.85
-     * @param $input
+     * @param array $input
      *
-     * @return number
+     * @return array|false
      **/
-    public function prepareInputForAddOrUpdate($input)
+    public function prepareInputForAddOrUpdate($input): array|false
     {
-
         foreach (['size_default'] as $field) {
             if (isset($input[$field]) && !is_numeric($input[$field])) {
                 $input[$field] = 0;
@@ -138,19 +133,16 @@ public function prepareInputForAddOrUpdate($input)
         return $input;
     }
 
-
-    public function prepareInputForAdd($input)
+    public function prepareInputForAdd($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
-    public function prepareInputForUpdate($input)
+    public function prepareInputForUpdate($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -174,14 +166,13 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -211,20 +202,20 @@ public function getHTMLTableCellForItem(
                 }
                 break;
         }
+        return null;
     }
 
-
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'          => 'equal',
+        return [
+            'designation'          => 'equal',
             'devicememorytypes_id' => 'equal',
             'manufacturers_id'     => 'equal',
             'frequence'            => 'delta:10'
         ];
     }
 
-    public static function rawSearchOptionsToAdd($class, $main_joinparams)
+    public static function rawSearchOptionsToAdd($class, $main_joinparams): array
     {
         $tab = [];
 
@@ -267,8 +258,7 @@ public static function rawSearchOptionsToAdd($class, $main_joinparams)
         return $tab;
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "fas fa-memory";
     }
diff --git a/src/DeviceMotherboard.php b/src/DeviceMotherboard.php
index e2b27963e50..c98a13d5aa6 100644
--- a/src/DeviceMotherboard.php
+++ b/src/DeviceMotherboard.php
@@ -38,15 +38,13 @@ class DeviceMotherboard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceMotherboard', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('System board', 'System boards', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [['name'  => 'chipset',
@@ -61,14 +59,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'chipset',
             'name'               => __('Chipset'),
             'datatype'           => 'string',
@@ -85,7 +82,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -107,13 +103,13 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
+    ): ?HTMLTableCell
+    {
 
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
@@ -121,24 +117,24 @@ public function getHTMLTableCellForItem(
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
+        switch ($item::class) {
+            case Computer::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 break;
         }
+        return null;
     }
 
-
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'      => 'equal',
+        return [
+            'designation'      => 'equal',
             'manufacturers_id' => 'equal',
             'chipset'          => 'equal'
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
diff --git a/src/DeviceNetworkCard.php b/src/DeviceNetworkCard.php
index 7c653b0b3fa..b288c0d8407 100644
--- a/src/DeviceNetworkCard.php
+++ b/src/DeviceNetworkCard.php
@@ -40,66 +40,60 @@ class DeviceNetworkCard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceNetworkCard', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Network card', 'Network cards', $nb);
     }
 
-
     /**
      * Criteria used for import function
      *
      * @since 0.84
      **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
         return [
             'designation' => 'equal',
             'bandwidth' => 'equal',
         ];
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
-            [['name'  => 'mac_default',
-                'label' => __('MAC address by default'),
-                'type'  => 'text'
-            ],
-                ['name'  => 'bandwidth',
+            [
+                [
+                    'name'  => 'mac_default',
+                    'label' => __('MAC address by default'),
+                    'type'  => 'text'
+                ],
+                [
+                    'name'  => 'bandwidth',
                     'label' => __('Flow'),
                     'type'  => 'text'
                 ],
-                ['name'  => 'devicenetworkcardmodels_id',
+                [
+                    'name'  => 'devicenetworkcardmodels_id',
                     'label' => _n('Model', 'Models', 1),
                     'type'  => 'dropdownValue'
                 ],
-                ['name'  => 'none',
-                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()) .
-                                        RegisteredID::showAddChildButtonForItemForm(
-                                            $this,
-                                            '_registeredID',
-                                            null,
-                                            false
-                                        ),
+                [
+                    'name'  => 'none',
+                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()),
                     'type'  => 'registeredIDChooser'
                 ]
             ]
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'mac_default',
             'name'               => __('MAC address by default'),
             'datatype'           => 'mac',
@@ -107,7 +101,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'bandwidth',
             'name'               => __('Flow'),
             'datatype'           => 'string',
@@ -124,7 +118,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -139,7 +132,7 @@ public static function getHTMLTableHeader(
             return;
         }
 
-        if (in_array($itemtype, NetworkPort::getNetworkPortInstantiations())) {
+        if (in_array($itemtype, NetworkPort::getNetworkPortInstantiations(), true)) {
             $base->addHeader($column_name, __('Interface'), $super, $father);
         } else {
             $column = parent::getHTMLTableHeader($itemtype, $base, $super, $father, $options);
@@ -151,7 +144,6 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public static function getHTMLTableCellsForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
@@ -165,14 +157,14 @@ public static function getHTMLTableCellsForItem(
             return;
         }
 
-        if (empty($item)) {
-            if (empty($father)) {
+        if ($item === null) {
+            if ($father === null) {
                 return;
             }
             $item = $father->getItem();
         }
 
-        if (in_array($item->getType(), NetworkPort::getNetworkPortInstantiations())) {
+        if (in_array($item::class, NetworkPort::getNetworkPortInstantiations())) {
             $link = new Item_DeviceNetworkCard();
             if ($link->getFromDB($item->fields['items_devicenetworkcards_id'])) {
                 $device = $link->getOnePeer(1);
@@ -183,25 +175,25 @@ public static function getHTMLTableCellsForItem(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
+        $cell = null;
+        switch ($item::class) {
+            case Computer::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 if ($this->fields["bandwidth"]) {
-                    $row->addCell(
+                    $cell = $row->addCell(
                         $row->getHeaderByName('devicenetworkcard_bandwidth'),
                         $this->fields["bandwidth"],
                         $father
@@ -209,6 +201,7 @@ public function getHTMLTableCellForItem(
                 }
                 break;
         }
+        return $cell;
     }
 
     public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
@@ -246,7 +239,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     }
 
 
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "fas fa-network-wired";
     }
diff --git a/src/DevicePci.php b/src/DevicePci.php
index 6da91cc1173..0d3e1c3034a 100644
--- a/src/DevicePci.php
+++ b/src/DevicePci.php
@@ -40,32 +40,23 @@ class DevicePci extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DevicePci', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('PCI device', 'PCI devices', $nb);
     }
 
-
-    /**
-     * @see CommonDevice::getAdditionalFields()
-     * @since 0.85
-     */
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
-            [['name'  => 'none',
-                'label' => RegisteredID::getTypeName(Session::getPluralNumber()) .
-                                        RegisteredID::showAddChildButtonForItemForm(
-                                            $this,
-                                            '_registeredID',
-                                            null,
-                                            false
-                                        ),
-                'type'  => 'registeredIDChooser'
-            ],
-                ['name'  => 'devicepcimodels_id',
+            [
+                [
+                    'name'  => 'none',
+                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()),
+                    'type'  => 'registeredIDChooser'
+                ],
+                [
+                    'name'  => 'devicepcimodels_id',
                     'label' => _n('Model', 'Models', 1),
                     'type'  => 'dropdownValue'
                 ]
@@ -73,9 +64,8 @@ public function getAdditionalFields()
         );
     }
 
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
-
         $tab                 = parent::rawSearchOptions();
 
         $tab[] = [
@@ -89,13 +79,13 @@ public function rawSearchOptions()
         return $tab;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
         $tab[] = [
             'id'                 => '95',
-            'table'              => 'glpi_devicepcis',
+            'table'              => static::getTable(),
             'field'              => 'designation',
             'name'               => __('Other component'),
             'forcegroupby'       => true,
diff --git a/src/DevicePowerSupply.php b/src/DevicePowerSupply.php
index d742083446c..e4689fcabe2 100644
--- a/src/DevicePowerSupply.php
+++ b/src/DevicePowerSupply.php
@@ -38,13 +38,12 @@ class DevicePowerSupply extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DevicePowerSupply', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Power supply', 'Power supplies', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
 
         return array_merge(
@@ -65,14 +64,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'is_atx',
             'name'               => __('ATX'),
             'datatype'           => 'bool'
@@ -80,7 +78,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'power',
             'name'               => __('Power'),
             'datatype'           => 'string',
@@ -97,7 +95,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -105,7 +102,6 @@ public static function getHTMLTableHeader(
         HTMLTableHeader $father = null,
         array $options = []
     ) {
-
         $column = parent::getHTMLTableHeader($itemtype, $base, $super, $father, $options);
 
         if ($column == $father) {
@@ -120,14 +116,13 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -141,9 +136,10 @@ public function getHTMLTableCellForItem(
                     $row->addCell($row->getHeaderByName('power'), $this->fields["power"]);
                 }
         }
+        return null;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
@@ -167,8 +163,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
         return $tab;
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-bolt";
     }
diff --git a/src/DeviceProcessor.php b/src/DeviceProcessor.php
index 9ee08779529..6d4b3fbcfdf 100644
--- a/src/DeviceProcessor.php
+++ b/src/DeviceProcessor.php
@@ -41,15 +41,13 @@ class DeviceProcessor extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceProcessor', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Processor', 'Processors', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [
@@ -88,14 +86,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'frequency_default',
             'name'               => sprintf(__('%1$s (%2$s)'), __('Frequency by default'), __('MHz')),
             'datatype'           => 'integer',
@@ -103,7 +100,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'frequence',
             'name'               => sprintf(__('%1$s (%2$s)'), __('Frequency'), __('MHz')),
             'datatype'           => 'integer',
@@ -111,7 +108,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '13',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'nbcores_default',
             'name'               => __('Number of cores'),
             'datatype'           => 'integer'
@@ -119,7 +116,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '14',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'nbthreads_default',
             'name'               => __('Number of threads'),
             'datatype'           => 'integer'
@@ -136,16 +133,14 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     /**
      * @since 0.85
-     * @param $input
+     * @param array $input
      *
-     * @return number
+     * @return array|false
      **/
-    public function prepareInputForAddOrUpdate($input)
+    public function prepareInputForAddOrUpdate($input): array|false
     {
-
         foreach (
             ['frequence', 'frequency_default', 'nbcores_default',
                 'nbthreads_default'
@@ -158,19 +153,16 @@ public function prepareInputForAddOrUpdate($input)
         return $input;
     }
 
-
-    public function prepareInputForAdd($input)
+    public function prepareInputForAdd($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
-    public function prepareInputForUpdate($input)
+    public function prepareInputForUpdate($input): array|false
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -192,38 +184,37 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
+        switch ($item::class) {
+            case Computer::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 break;
         }
+        return null;
     }
 
-
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'          => 'equal',
+        return [
+            'designation'          => 'equal',
             'manufacturers_id'     => 'equal',
             'frequence'            => 'delta:10'
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
@@ -299,8 +290,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
         return $tab;
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-cpu";
     }
diff --git a/src/DeviceSensor.php b/src/DeviceSensor.php
index 1a62b0da270..89dc8d95a08 100644
--- a/src/DeviceSensor.php
+++ b/src/DeviceSensor.php
@@ -40,27 +40,26 @@ class DeviceSensor extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceSensor', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Sensor', 'Sensors', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
-            [['name'  => 'devicesensortypes_id',
-                'label' => _n('Type', 'Types', 1),
-                'type'  => 'dropdownValue'
-            ]
+            [
+                [
+                    'name'  => 'devicesensortypes_id',
+                    'label' => _n('Type', 'Types', 1),
+                    'type'  => 'dropdownValue'
+                ]
             ]
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab                 = parent::rawSearchOptions();
 
@@ -74,7 +73,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -82,7 +80,6 @@ public static function getHTMLTableHeader(
         HTMLTableHeader $father = null,
         array $options = []
     ) {
-
         $column = parent::getHTMLTableHeader($itemtype, $base, $super, $father, $options);
 
         if ($column == $father) {
@@ -98,36 +95,35 @@ public static function getHTMLTableHeader(
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
-            case 'Computer':
-            case 'Peripheral':
+        switch ($item::class) {
+            case Computer::class:
+            case Peripheral::class:
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 break;
         }
+        return null;
     }
 
-
     /**
      * Criteria used for import function
      */
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
-        return ['designation'          => 'equal',
+        return [
+            'designation'          => 'equal',
             'manufacturers_id'     => 'equal',
             'devicesensortypes_id' => 'equal',
             'locations_id'         => 'equal'
diff --git a/src/DeviceSimcard.php b/src/DeviceSimcard.php
index 5b77599a702..811cc252815 100644
--- a/src/DeviceSimcard.php
+++ b/src/DeviceSimcard.php
@@ -38,14 +38,13 @@ class DeviceSimcard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceSimcard', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Simcard', 'Simcards', $nb);
     }
 
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
             [
@@ -70,13 +69,13 @@ public function getAdditionalFields()
         );
     }
 
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'voltage',
             'name'               => __('Voltage'),
             'datatype'           => 'integer',
@@ -92,7 +91,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '14',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'allow_voip',
             'name'               => __('Allow VOIP'),
             'datatype'           => 'bool'
@@ -101,16 +100,8 @@ public function rawSearchOptions()
         return $tab;
     }
 
-    /**
-     * Criteria used for import function
-     *
-     * @see CommonDevice::getImportCriteria()
-     *
-     * @since 9.2
-     **/
-    public function getImportCriteria()
+    public function getImportCriteria(): array
     {
-
         return [
             'designation'             => 'equal',
             'manufacturers_id'        => 'equal',
@@ -118,12 +109,12 @@ public function getImportCriteria()
         ];
     }
 
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "fas fa-sim-card";
     }
 
-    public function getRights($interface = 'central')
+    public function getRights($interface = 'central'): array
     {
         $rights = parent::getRights($interface);
         // Update labels to match other assets
diff --git a/src/DeviceSoundCard.php b/src/DeviceSoundCard.php
index 9f5f6381c3f..7e3e2d9e703 100644
--- a/src/DeviceSoundCard.php
+++ b/src/DeviceSoundCard.php
@@ -40,32 +40,28 @@ class DeviceSoundCard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceSoundCard', 'Infocom'];
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Soundcard', 'Soundcards', $nb);
     }
 
-
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
-
         return array_merge(
             parent::getAdditionalFields(),
-            [['name'  => 'type',
-                'label' => _n('Type', 'Types', 1),
-                'type'  => 'text'
-            ],
-                ['name'  => 'none',
-                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()) .
-                                        RegisteredID::showAddChildButtonForItemForm(
-                                            $this,
-                                            '_registeredID',
-                                            null,
-                                            false
-                                        ),
+            [
+                [
+                    'name'  => 'type',
+                    'label' => _n('Type', 'Types', 1),
+                    'type'  => 'text'
+                ],
+                [
+                    'name'  => 'none',
+                    'label' => RegisteredID::getTypeName(Session::getPluralNumber()),
                     'type'  => 'registeredIDChooser'
                 ],
-                ['name'  => 'devicesoundcardmodels_id',
+                [
+                    'name'  => 'devicesoundcardmodels_id',
                     'label' => _n('Model', 'Models', 1),
                     'type'  => 'dropdownValue'
                 ]
@@ -73,14 +69,13 @@ public function getAdditionalFields()
         );
     }
 
-
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '12',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'type',
             'name'               => _n('Type', 'Types', 1),
             'datatype'           => 'string',
@@ -97,7 +92,6 @@ public function rawSearchOptions()
         return $tab;
     }
 
-
     public static function getHTMLTableHeader(
         $itemtype,
         HTMLTableBase $base,
@@ -113,41 +107,42 @@ public static function getHTMLTableHeader(
         }
 
         switch ($itemtype) {
-            case 'Computer':
+            case Computer::class:
                 Manufacturer::getHTMLTableHeader(__CLASS__, $base, $super, $father, $options);
                 $base->addHeader('devicesoundcard_type', _n('Type', 'Types', 1), $super, $father);
                 break;
         }
     }
 
-
     public function getHTMLTableCellForItem(
         HTMLTableRow $row = null,
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ) {
-
+    ): ?HTMLTableCell
+    {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
             return $father;
         }
 
-        switch ($item->getType()) {
+        $cell = null;
+        switch ($item::class) {
             case 'Computer':
                 Manufacturer::getHTMLTableCellsForItem($row, $this, null, $options);
                 if ($this->fields["type"]) {
-                    $row->addCell(
+                    $cell = $row->addCell(
                         $row->getHeaderByName('devicesoundcard_type'),
                         $this->fields["type"],
                         $father
                     );
                 }
         }
+        return $cell;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
     {
         $tab = [];
 
@@ -170,8 +165,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
         return $tab;
     }
 
-
-    public static function getIcon()
+    public static function getIcon(): string
     {
         return "ti ti-volume-2";
     }
diff --git a/src/PCIVendor.php b/src/PCIVendor.php
index bef99d65c4d..0648e5f81ac 100644
--- a/src/PCIVendor.php
+++ b/src/PCIVendor.php
@@ -35,18 +35,21 @@
 
 use Glpi\Features\CacheableListInterface;
 use Glpi\Inventory\FilesToJSON;
+use Psr\SimpleCache\CacheInterface;
 
-/// Class PCIVendor
+/**
+ * PCIVendor class
+ */
 class PCIVendor extends CommonDropdown implements CacheableListInterface
 {
-    public $cache_key = 'glpi_pcivendors';
+    public string $cache_key = 'glpi_pcivendors';
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('PCI vendor', 'PCI vendors', $nb);
     }
 
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
         return [
             [
@@ -61,13 +64,13 @@ public function getAdditionalFields()
         ];
     }
 
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '10',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'vendorid',
             'name'               => __('Vendor ID'),
             'datatype'           => 'string'
@@ -75,7 +78,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'deviceid',
             'name'               => __('Device ID'),
             'datatype'           => 'string'
@@ -91,19 +94,27 @@ public function rawSearchOptions()
      */
     public static function getList(): array
     {
-        /** @var \Psr\SimpleCache\CacheInterface $GLPI_CACHE */
+        /** @var CacheInterface $GLPI_CACHE */
         global $GLPI_CACHE;
 
         $vendors = new PCIVendor();
-        if (($pciids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
-            return $pciids;
+        try {
+            if (($pciids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
+                return $pciids;
+            }
+        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
+            trigger_error($e->getMessage(), E_USER_WARNING);
         }
 
         $jsonfile = new FilesToJSON();
-        $file_pciids = json_decode(file_get_contents($jsonfile->getJsonFilePath('pciid')), true);
+        $file_pciids = json_decode(file_get_contents($jsonfile->getJsonFilePath('pciid')), true) ?? [];
         $db_pciids = $vendors->getDbList();
         $pciids = $db_pciids + $file_pciids;
-        $GLPI_CACHE->set($vendors->cache_key, $pciids);
+        try {
+            $GLPI_CACHE->set($vendors->cache_key, $pciids);
+        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
+            trigger_error($e->getMessage(), E_USER_WARNING);
+        }
 
         return $pciids;
     }
@@ -119,7 +130,7 @@ private function getDbList(): array
         global $DB;
 
         $list = [];
-        $iterator = $DB->request(['FROM' => $this->getTable()]);
+        $iterator = $DB->request(['FROM' => static::getTable()]);
         foreach ($iterator as $row) {
             $row_key = $row['vendorid'];
             if (!empty($row['deviceid'])) {
@@ -140,10 +151,11 @@ public function getListCacheKey(): string
      * Clean cache
      *
      * @return void
+     * @throws \Psr\SimpleCache\InvalidArgumentException
      */
     public function invalidateListCache(): void
     {
-        /** @var \Psr\SimpleCache\CacheInterface $GLPI_CACHE */
+        /** @var CacheInterface $GLPI_CACHE */
         global $GLPI_CACHE;
 
         $GLPI_CACHE->delete($this->cache_key);
@@ -156,15 +168,11 @@ public function invalidateListCache(): void
      *
      * @return string|false
      */
-    public function getManufacturer($vendorid)
+    public function getManufacturer($vendorid): false|string
     {
-        $pciids = $this->getList();
+        $pciids = self::getList();
 
-        if (isset($pciids[$vendorid])) {
-            return $pciids[$vendorid];
-        }
-
-        return false;
+        return $pciids[$vendorid] ?? false;
     }
 
     /**
@@ -175,15 +183,11 @@ public function getManufacturer($vendorid)
      *
      * @return string|false
      */
-    public function getProductName($vendorid, $deviceid)
+    public function getProductName($vendorid, $deviceid): false|string
     {
-        $pciids = $this->getList();
-
-        if (isset($pciids[$vendorid . '::' . $deviceid])) {
-            return $pciids[$vendorid . '::' . $deviceid];
-        }
+        $pciids = self::getList();
 
-        return false;
+        return $pciids[$vendorid . '::' . $deviceid] ?? false;
     }
 
     public static function getIcon()
diff --git a/src/RegisteredID.php b/src/RegisteredID.php
index b8d94ffa35b..43eb3afb4d1 100644
--- a/src/RegisteredID.php
+++ b/src/RegisteredID.php
@@ -33,48 +33,48 @@
  * ---------------------------------------------------------------------
  */
 
+use Glpi\Application\View\TemplateRenderer;
+
 /**
  * RegisteredID class
  * @since 0.85
  **/
 class RegisteredID extends CommonDBChild
 {
-   // From CommonDBTM
+    // From CommonDBTM
     public $auto_message_on_action = false;
 
-   // From CommonDBChild
+    // From CommonDBChild
     public static $itemtype        = 'itemtype';
     public static $items_id        = 'items_id';
     public $dohistory              = true;
 
-
-    public static function getRegisteredIDTypes()
+    public static function getRegisteredIDTypes(): array
     {
-
-        return ['PCI' => __('PCI'),
+        return [
+            'PCI' => __('PCI'),
             'USB' => __('USB')
         ];
     }
 
-
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('Registered ID (issued by PCI-SIG)', 'Registered IDs (issued by PCI-SIG)', $nb);
     }
 
-
     /**
-     * @param $field_name
-     * @param $child_count_js_var
+     * @param string $field_name
+     * @param string $child_count_js_var
      *
      * @return string
      **/
-    public static function getJSCodeToAddForItemChild($field_name, $child_count_js_var)
+    public static function getJSCodeToAddForItemChild($field_name, $child_count_js_var): string
     {
-
         $result  = "<select name=\'" . $field_name . "_type[-'+$child_count_js_var+']\'>";
         $result .= "<option value=\'\'>" . Dropdown::EMPTY_VALUE . "</option>";
         foreach (self::getRegisteredIDTypes() as $name => $label) {
+            $name = htmlspecialchars($name);
+            $label = htmlspecialchars($label);
             $result .= "<option value=\'$name\'>$label</option>";
         }
         $result .= "</select> : ";
@@ -83,18 +83,14 @@ public static function getJSCodeToAddForItemChild($field_name, $child_count_js_v
         return $result;
     }
 
-
-    /**
-     * @see CommonDBChild::showChildForItemForm()
-     **/
     public function showChildForItemForm($canedit, $field_name, $id, bool $display = true)
     {
-
-        if ($this->isNewID($this->getID())) {
+        if (self::isNewID($this->getID())) {
             $value = '';
         } else {
             $value = $this->getName();
         }
+        $value             = htmlspecialchars($value);
         $result            = "";
         $main_field        = $field_name . "[$id]";
         $type_field        = $field_name . "_type[$id]";
@@ -104,8 +100,10 @@ public function showChildForItemForm($canedit, $field_name, $id, bool $display =
             $result .= "<select name='$type_field'>";
             $result .= "<option value=''>" . Dropdown::EMPTY_VALUE . "</option>";
             foreach ($registeredIDTypes as $name => $label) {
+                $name = htmlspecialchars($name);
+                $label = htmlspecialchars($label);
                 $result .= "<option value='$name'";
-                if ($this->fields['device_type'] == $name) {
+                if ($this->fields['device_type'] === $name) {
                     $result .= " selected";
                 }
                 $result .= ">$label</option>";
@@ -115,8 +113,8 @@ public function showChildForItemForm($canedit, $field_name, $id, bool $display =
             $result .= "<input type='hidden' name='$main_field' value='$value'>";
             if (!empty($this->fields['device_type'])) {
                 $result .= sprintf(
-                    __('%1$s: %2$s'),
-                    $registeredIDTypes[$this->fields['device_type']],
+                    __s('%1$s: %2$s'),
+                    htmlspecialchars($registeredIDTypes[$this->fields['device_type']]),
                     $value
                 );
             } else {
diff --git a/src/USBVendor.php b/src/USBVendor.php
index a94766cdb63..6c47c4611f4 100644
--- a/src/USBVendor.php
+++ b/src/USBVendor.php
@@ -35,18 +35,21 @@
 
 use Glpi\Features\CacheableListInterface;
 use Glpi\Inventory\FilesToJSON;
+use Psr\SimpleCache\CacheInterface;
 
-/// Class USBVendor
+/**
+ * USBVendor class
+ */
 class USBVendor extends CommonDropdown implements CacheableListInterface
 {
-    public $cache_key = 'glpi_usbvendors';
+    public string $cache_key = 'glpi_usbvendors';
 
-    public static function getTypeName($nb = 0)
+    public static function getTypeName($nb = 0): string
     {
         return _n('USB vendor', 'USB vendors', $nb);
     }
 
-    public function getAdditionalFields()
+    public function getAdditionalFields(): array
     {
         return [
             [
@@ -61,13 +64,13 @@ public function getAdditionalFields()
         ];
     }
 
-    public function rawSearchOptions()
+    public function rawSearchOptions(): array
     {
         $tab = parent::rawSearchOptions();
 
         $tab[] = [
             'id'                 => '10',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'vendorid',
             'name'               => __('Vendor ID'),
             'datatype'           => 'string'
@@ -75,7 +78,7 @@ public function rawSearchOptions()
 
         $tab[] = [
             'id'                 => '11',
-            'table'              => $this->getTable(),
+            'table'              => static::getTable(),
             'field'              => 'deviceid',
             'name'               => __('Device ID'),
             'datatype'           => 'string'
@@ -91,20 +94,28 @@ public function rawSearchOptions()
      */
     public static function getList(): array
     {
-        /** @var \Psr\SimpleCache\CacheInterface $GLPI_CACHE */
+        /** @var CacheInterface $GLPI_CACHE */
         global $GLPI_CACHE;
 
         $vendors = new USBVendor();
-        if (($usbids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
-            return $usbids;
+        try {
+            if (($usbids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
+                return $usbids;
+            }
+        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
+            trigger_error($e->getMessage(), E_USER_WARNING);
         }
 
         $jsonfile = new FilesToJSON();
-        $file_usbids = json_decode(file_get_contents($jsonfile->getJsonFilePath('usbid')), true);
+        $file_usbids = json_decode(file_get_contents($jsonfile->getJsonFilePath('usbid')), true) ?? [];
         $db_usbids = $vendors->getDbList();
         $usbids = $db_usbids + $file_usbids;
         $usbids = array_change_key_case($usbids, CASE_LOWER);
-        $GLPI_CACHE->set($vendors->cache_key, $usbids);
+        try {
+            $GLPI_CACHE->set($vendors->cache_key, $usbids);
+        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
+            trigger_error($e->getMessage(), E_USER_WARNING);
+        }
 
         return $usbids;
     }
@@ -120,7 +131,7 @@ private function getDbList(): array
         global $DB;
 
         $list = [];
-        $iterator = $DB->request(['FROM' => $this->getTable()]);
+        $iterator = $DB->request(['FROM' => static::getTable()]);
         foreach ($iterator as $row) {
             $row_key = $row['vendorid'];
             if (!empty($row['deviceid'])) {
@@ -141,10 +152,11 @@ public function getListCacheKey(): string
      * Clean cache
      *
      * @return void
+     * @throws \Psr\SimpleCache\InvalidArgumentException
      */
     public function invalidateListCache(): void
     {
-        /** @var \Psr\SimpleCache\CacheInterface $GLPI_CACHE */
+        /** @var CacheInterface $GLPI_CACHE */
         global $GLPI_CACHE;
 
         $GLPI_CACHE->delete($this->cache_key);
@@ -157,9 +169,9 @@ public function invalidateListCache(): void
      *
      * @return string|false
      */
-    public function getManufacturer($vendorid)
+    public function getManufacturer($vendorid): false|string
     {
-        $usbids = $this->getList();
+        $usbids = self::getList();
 
         $vendorid = strtolower($vendorid);
 
@@ -181,15 +193,16 @@ public function getManufacturer($vendorid)
      *
      * @return string|false
      */
-    public function getProductName($vendorid, $deviceid)
+    public function getProductName($vendorid, $deviceid): false|string
     {
-        $usbids = $this->getList();
+        $usbids = self::getList();
 
         $vendorid = strtolower($vendorid);
         $deviceid = strtolower($deviceid);
 
-        if (isset($usbids[$vendorid . '::' . $deviceid])) {
-            $usb_product = preg_replace('/&(?!\w+;)/', '&amp;', $usbids[$vendorid . '::' . $deviceid]);
+        $combined_id = $vendorid . '::' . $deviceid;
+        if (isset($usbids[$combined_id])) {
+            $usb_product = preg_replace('/&(?!\w+;)/', '&amp;', $usbids[$combined_id]);
             if (!empty($usb_product)) {
                 return $usb_product;
             }
diff --git a/templates/dropdown_form.html.twig b/templates/dropdown_form.html.twig
index d2ee6f4cbc3..88c06b37364 100644
--- a/templates/dropdown_form.html.twig
+++ b/templates/dropdown_form.html.twig
@@ -193,6 +193,12 @@
                             {% set fields_params = fields_params|merge({'types': config(field['itemtype_list'])}) %}
                         {% endif %}
                         {{ fields.dropdownItemTypes(field['name'], item.fields[field['name']], field['label'], fields_params) }}
+                    {% elseif type == 'registeredIDChooser' %}
+                        {% set chooser_field %}
+                            {{ call('RegisteredID::showAddChildButtonForItemForm', [item, '_registeredID', null, false])|raw }}
+                            {{ item.displaySpecificTypeField(item.fields['id'], field, fields_params) }}
+                        {% endset %}
+                        {{ fields.field('', chooser_field, field['label']) }}
                     {% else %}
                         {% set field_value %}
                             {{ item.displaySpecificTypeField(item.fields['id'], field, fields_params) }}

From 18e55eea770bbe00f956d463dcbdbfc20eb515cc Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Mon, 29 Apr 2024 10:46:12 -0400
Subject: [PATCH 2/6] cs

---
 src/CommonDevice.php      | 3 +--
 src/DeviceBattery.php     | 4 +---
 src/DeviceCamera.php      | 4 +---
 src/DeviceCase.php        | 3 +--
 src/DeviceControl.php     | 3 +--
 src/DeviceDrive.php       | 3 +--
 src/DeviceFirmware.php    | 3 +--
 src/DeviceGeneric.php     | 3 +--
 src/DeviceGraphicCard.php | 3 +--
 src/DeviceHardDrive.php   | 3 +--
 src/DeviceMemory.php      | 3 +--
 src/DeviceMotherboard.php | 3 +--
 src/DeviceNetworkCard.php | 3 +--
 src/DevicePowerSupply.php | 3 +--
 src/DeviceProcessor.php   | 3 +--
 src/DeviceSensor.php      | 3 +--
 src/DeviceSoundCard.php   | 3 +--
 17 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/src/CommonDevice.php b/src/CommonDevice.php
index 9128bc6dc6d..346a49acc3d 100644
--- a/src/CommonDevice.php
+++ b/src/CommonDevice.php
@@ -382,8 +382,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
 
         if (isset($options['dont_display'][static::class])) {
             return $father;
diff --git a/src/DeviceBattery.php b/src/DeviceBattery.php
index 358ae98ab58..0137ad431aa 100644
--- a/src/DeviceBattery.php
+++ b/src/DeviceBattery.php
@@ -126,9 +126,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
-
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceCamera.php b/src/DeviceCamera.php
index a93a763a3f3..4aa68a865bd 100644
--- a/src/DeviceCamera.php
+++ b/src/DeviceCamera.php
@@ -191,9 +191,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
-
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceCase.php b/src/DeviceCase.php
index e2e2320a6f8..de7e99a0203 100644
--- a/src/DeviceCase.php
+++ b/src/DeviceCase.php
@@ -109,8 +109,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceControl.php b/src/DeviceControl.php
index 195220d7e0c..dc22fb739c2 100644
--- a/src/DeviceControl.php
+++ b/src/DeviceControl.php
@@ -133,8 +133,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceDrive.php b/src/DeviceDrive.php
index c0b2515629a..562b380af44 100644
--- a/src/DeviceDrive.php
+++ b/src/DeviceDrive.php
@@ -135,8 +135,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceFirmware.php b/src/DeviceFirmware.php
index aca2e8787d4..b231ca8234c 100644
--- a/src/DeviceFirmware.php
+++ b/src/DeviceFirmware.php
@@ -264,8 +264,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
diff --git a/src/DeviceGeneric.php b/src/DeviceGeneric.php
index 3d82a74d53d..8659ac2f841 100644
--- a/src/DeviceGeneric.php
+++ b/src/DeviceGeneric.php
@@ -97,8 +97,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceGraphicCard.php b/src/DeviceGraphicCard.php
index b92d7fe2fc5..d5974a5eb16 100644
--- a/src/DeviceGraphicCard.php
+++ b/src/DeviceGraphicCard.php
@@ -171,8 +171,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceHardDrive.php b/src/DeviceHardDrive.php
index 2449a5231fb..8a4fefc67d0 100644
--- a/src/DeviceHardDrive.php
+++ b/src/DeviceHardDrive.php
@@ -197,8 +197,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceMemory.php b/src/DeviceMemory.php
index d62f84153cd..aa0aff0f7f2 100644
--- a/src/DeviceMemory.php
+++ b/src/DeviceMemory.php
@@ -171,8 +171,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceMotherboard.php b/src/DeviceMotherboard.php
index c98a13d5aa6..b1b310756e1 100644
--- a/src/DeviceMotherboard.php
+++ b/src/DeviceMotherboard.php
@@ -108,8 +108,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
 
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
diff --git a/src/DeviceNetworkCard.php b/src/DeviceNetworkCard.php
index b288c0d8407..be91e0d83ef 100644
--- a/src/DeviceNetworkCard.php
+++ b/src/DeviceNetworkCard.php
@@ -180,8 +180,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DevicePowerSupply.php b/src/DevicePowerSupply.php
index e4689fcabe2..36a5f90fb76 100644
--- a/src/DevicePowerSupply.php
+++ b/src/DevicePowerSupply.php
@@ -121,8 +121,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceProcessor.php b/src/DeviceProcessor.php
index 6d4b3fbcfdf..f07be26b54f 100644
--- a/src/DeviceProcessor.php
+++ b/src/DeviceProcessor.php
@@ -189,8 +189,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceSensor.php b/src/DeviceSensor.php
index 89dc8d95a08..1145cd78073 100644
--- a/src/DeviceSensor.php
+++ b/src/DeviceSensor.php
@@ -100,8 +100,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
diff --git a/src/DeviceSoundCard.php b/src/DeviceSoundCard.php
index 7e3e2d9e703..5188af9bb6d 100644
--- a/src/DeviceSoundCard.php
+++ b/src/DeviceSoundCard.php
@@ -119,8 +119,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell
-    {
+    ): ?HTMLTableCell {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {

From 536239cd6a71fa625ef6f58b79f6792230271031 Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Tue, 30 Apr 2024 05:29:42 -0400
Subject: [PATCH 3/6] make cache failures fatal again

---
 src/PCIVendor.php | 14 +++-----------
 src/USBVendor.php | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/PCIVendor.php b/src/PCIVendor.php
index 0648e5f81ac..ed59514eab2 100644
--- a/src/PCIVendor.php
+++ b/src/PCIVendor.php
@@ -98,23 +98,15 @@ public static function getList(): array
         global $GLPI_CACHE;
 
         $vendors = new PCIVendor();
-        try {
-            if (($pciids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
-                return $pciids;
-            }
-        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
+        if (($pciids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
+            return $pciids;
         }
 
         $jsonfile = new FilesToJSON();
         $file_pciids = json_decode(file_get_contents($jsonfile->getJsonFilePath('pciid')), true) ?? [];
         $db_pciids = $vendors->getDbList();
         $pciids = $db_pciids + $file_pciids;
-        try {
-            $GLPI_CACHE->set($vendors->cache_key, $pciids);
-        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-        }
+        $GLPI_CACHE->set($vendors->cache_key, $pciids);
 
         return $pciids;
     }
diff --git a/src/USBVendor.php b/src/USBVendor.php
index 6c47c4611f4..365c4b24649 100644
--- a/src/USBVendor.php
+++ b/src/USBVendor.php
@@ -98,12 +98,8 @@ public static function getList(): array
         global $GLPI_CACHE;
 
         $vendors = new USBVendor();
-        try {
-            if (($usbids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
-                return $usbids;
-            }
-        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
+        if (($usbids = $GLPI_CACHE->get($vendors->cache_key)) !== null) {
+            return $usbids;
         }
 
         $jsonfile = new FilesToJSON();
@@ -111,11 +107,7 @@ public static function getList(): array
         $db_usbids = $vendors->getDbList();
         $usbids = $db_usbids + $file_usbids;
         $usbids = array_change_key_case($usbids, CASE_LOWER);
-        try {
-            $GLPI_CACHE->set($vendors->cache_key, $usbids);
-        } catch (Psr\SimpleCache\InvalidArgumentException $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-        }
+        $GLPI_CACHE->set($vendors->cache_key, $usbids);
 
         return $usbids;
     }

From 8277a4060489dab8a3ea8c0ae4a9179982af9319 Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Wed, 8 May 2024 20:00:59 -0400
Subject: [PATCH 4/6] revert return type changes

---
 src/CommonDevice.php      | 40 +++++++++++++++++++--------------------
 src/DeviceBattery.php     | 12 ++++++------
 src/DeviceCamera.php      | 14 +++++++-------
 src/DeviceCase.php        | 10 +++++-----
 src/DeviceControl.php     | 10 +++++-----
 src/DeviceDrive.php       | 12 ++++++------
 src/DeviceFirmware.php    | 14 +++++++-------
 src/DeviceGeneric.php     | 10 +++++-----
 src/DeviceGraphicCard.php | 20 ++++++++++----------
 src/DeviceHardDrive.php   | 22 ++++++++++-----------
 src/DeviceMemory.php      | 22 ++++++++++-----------
 src/DeviceMotherboard.php | 12 ++++++------
 src/DeviceNetworkCard.php | 12 ++++++------
 src/DevicePci.php         |  8 ++++----
 src/DevicePowerSupply.php | 12 ++++++------
 src/DeviceProcessor.php   | 22 ++++++++++-----------
 src/DeviceSensor.php      | 10 +++++-----
 src/DeviceSimcard.php     | 12 ++++++------
 src/DeviceSoundCard.php   | 12 ++++++------
 19 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/src/CommonDevice.php b/src/CommonDevice.php
index 346a49acc3d..2d76a0ede91 100644
--- a/src/CommonDevice.php
+++ b/src/CommonDevice.php
@@ -52,7 +52,7 @@ abstract class CommonDevice extends CommonDropdown
     public $second_level_menu = "commondevice";
     public $third_level_menu  = "";
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Component', 'Components', $nb);
     }
@@ -64,7 +64,7 @@ public static function getTypeName($nb = 0): string
      *
      * @return array Array of the types of CommonDevice available
      **/
-    public static function getDeviceTypes(): array
+    public static function getDeviceTypes()
     {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
@@ -83,7 +83,7 @@ public static function getDeviceTypes(): array
      *
      * @return class-string<Item_Devices>
      **/
-    public static function getItem_DeviceType($devicetype = null): string
+    public static function getItem_DeviceType($devicetype = null)
     {
         if (null === $devicetype) {
             $devicetype = static::class;
@@ -94,7 +94,7 @@ public static function getItem_DeviceType($devicetype = null): string
         return "Item_$devicetype";
     }
 
-    public static function getMenuContent(): false|array
+    public static function getMenuContent()
     {
         $menu = [];
         if (self::canView()) {
@@ -153,7 +153,7 @@ public static function getMenuContent(): false|array
         return false;
     }
 
-    public function displaySpecificTypeField($ID, $field = [], array $options = []): void
+    public function displaySpecificTypeField($ID, $field = [], array $options = [])
     {
         switch ($field['type']) {
             case 'registeredIDChooser':
@@ -162,7 +162,7 @@ public function displaySpecificTypeField($ID, $field = [], array $options = []):
         }
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return [
             [
@@ -173,7 +173,7 @@ public function getAdditionalFields(): array
         ];
     }
 
-    public function canUnrecurs(): bool
+    public function canUnrecurs()
     {
         /** @var \DBmysql $DB */
         global $DB;
@@ -235,7 +235,7 @@ public function canUnrecurs(): bool
         return true;
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = [];
 
@@ -307,7 +307,7 @@ public function rawSearchOptions(): array
         return $tab;
     }
 
-    public function title(): void
+    public function title()
     {
         Dropdown::showItemTypeMenu(
             _n('Component', 'Components', Session::getPluralNumber()),
@@ -316,7 +316,7 @@ public function title(): void
         );
     }
 
-    public static function getNameField(): string
+    public static function getNameField()
     {
         return 'designation';
     }
@@ -382,7 +382,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
 
         if (isset($options['dont_display'][static::class])) {
             return $father;
@@ -440,7 +440,7 @@ public function getHTMLTableCellForItem(
      *
      * @return integer ID of existing or new Device
      **/
-    public function import(array $input): int
+    public function import(array $input)
     {
         /** @var \DBmysql $DB */
         global $DB;
@@ -504,7 +504,7 @@ public function import(array $input): int
      *
      * @since 0.84
      **/
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'      => 'equal',
@@ -512,7 +512,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public function defineTabs($options = []): array
+    public function defineTabs($options = [])
     {
         $ong = [];
         $this->addDefaultFormTab($ong);
@@ -527,7 +527,7 @@ public function defineTabs($options = []): array
     /**
      * @since 0.85
      **/
-    public function post_workOnItem(): void
+    public function post_workOnItem()
     {
         if (
             (isset($this->input['_registeredID']))
@@ -565,19 +565,19 @@ public function post_workOnItem(): void
         }
     }
 
-    public function post_addItem(): void
+    public function post_addItem()
     {
         $this->post_workOnItem();
         parent::post_addItem();
     }
 
-    public function post_updateItem($history = true): void
+    public function post_updateItem($history = true)
     {
         $this->post_workOnItem();
         parent::post_updateItem($history);
     }
 
-    public static function getFormURL($full = true): string
+    public static function getFormURL($full = true)
     {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
@@ -587,7 +587,7 @@ public static function getFormURL($full = true): string
         return "$dir/front/device.form.php?itemtype=$itemtype";
     }
 
-    public static function getSearchURL($full = true): string
+    public static function getSearchURL($full = true)
     {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
@@ -597,7 +597,7 @@ public static function getSearchURL($full = true): string
         return "$dir/front/device.php?itemtype=$itemtype";
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-components";
     }
diff --git a/src/DeviceBattery.php b/src/DeviceBattery.php
index 0137ad431aa..abca9b4b5b9 100644
--- a/src/DeviceBattery.php
+++ b/src/DeviceBattery.php
@@ -37,12 +37,12 @@ class DeviceBattery extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceBattery', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Battery', 'Batteries', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -70,7 +70,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -126,7 +126,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -164,7 +164,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'           => 'equal',
@@ -175,7 +175,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-battery-2";
     }
diff --git a/src/DeviceCamera.php b/src/DeviceCamera.php
index 4aa68a865bd..481fd3f300b 100644
--- a/src/DeviceCamera.php
+++ b/src/DeviceCamera.php
@@ -37,12 +37,12 @@ class DeviceCamera extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceCamera', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Camera', 'Cameras', $nb);
     }
 
-    public function defineTabs($options = []): array
+    public function defineTabs($options = [])
     {
         $ong = [];
         $this->addDefaultFormTab($ong)
@@ -55,7 +55,7 @@ public function defineTabs($options = []): array
         return $ong;
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -99,7 +99,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -191,7 +191,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -226,7 +226,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'           => 'equal',
@@ -235,7 +235,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-camera";
     }
diff --git a/src/DeviceCase.php b/src/DeviceCase.php
index de7e99a0203..b3402c62e33 100644
--- a/src/DeviceCase.php
+++ b/src/DeviceCase.php
@@ -38,12 +38,12 @@ class DeviceCase extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceCase', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Case', 'Cases', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -59,7 +59,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -109,7 +109,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -124,7 +124,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'        => 'equal',
diff --git a/src/DeviceControl.php b/src/DeviceControl.php
index dc22fb739c2..9fa08f0f148 100644
--- a/src/DeviceControl.php
+++ b/src/DeviceControl.php
@@ -40,12 +40,12 @@ class DeviceControl extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceControl', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Controller', 'Controllers', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -74,7 +74,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -133,7 +133,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -148,7 +148,7 @@ public function getHTMLTableCellForItem(
         return $column;
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-cpu";
     }
diff --git a/src/DeviceDrive.php b/src/DeviceDrive.php
index 562b380af44..4f08c187748 100644
--- a/src/DeviceDrive.php
+++ b/src/DeviceDrive.php
@@ -38,12 +38,12 @@ class DeviceDrive extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceDrive', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Drive', 'Drives', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -67,7 +67,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -135,7 +135,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -166,7 +166,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'       => 'equal',
@@ -175,7 +175,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "far fa-hdd";
     }
diff --git a/src/DeviceFirmware.php b/src/DeviceFirmware.php
index b231ca8234c..dbb43955d3e 100644
--- a/src/DeviceFirmware.php
+++ b/src/DeviceFirmware.php
@@ -37,12 +37,12 @@ class DeviceFirmware extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceFirmware', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Firmware', 'Firmware', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -71,7 +71,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -109,7 +109,7 @@ public function rawSearchOptions(): array
         return $tab;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
@@ -264,7 +264,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
@@ -303,7 +303,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'              => 'equal',
@@ -313,7 +313,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "fas fa-microchip";
     }
diff --git a/src/DeviceGeneric.php b/src/DeviceGeneric.php
index 8659ac2f841..b8706dac7f3 100644
--- a/src/DeviceGeneric.php
+++ b/src/DeviceGeneric.php
@@ -38,12 +38,12 @@ class DeviceGeneric extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceGeneric', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Generic device', 'Generic devices', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -55,7 +55,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab                 = parent::rawSearchOptions();
 
@@ -97,7 +97,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -119,7 +119,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'       => 'equal',
diff --git a/src/DeviceGraphicCard.php b/src/DeviceGraphicCard.php
index d5974a5eb16..1b313ac29d6 100644
--- a/src/DeviceGraphicCard.php
+++ b/src/DeviceGraphicCard.php
@@ -38,12 +38,12 @@ class DeviceGraphicCard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceGraphicCard', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Graphics card', 'Graphics cards', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -79,7 +79,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -122,9 +122,9 @@ public function rawSearchOptions(): array
      * @since 0.85
      * @param array $input
      *
-     * @return array|false
+     * @return array
      **/
-    public function prepareInputForAddOrUpdate($input): array|false
+    public function prepareInputForAddOrUpdate($input)
     {
         foreach (['memory_default'] as $field) {
             if (isset($input[$field]) && !is_numeric($input[$field])) {
@@ -134,12 +134,12 @@ public function prepareInputForAddOrUpdate($input): array|false
         return $input;
     }
 
-    public function prepareInputForAdd($input): array|false
+    public function prepareInputForAdd($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-    public function prepareInputForUpdate($input): array|false
+    public function prepareInputForUpdate($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
@@ -171,7 +171,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -196,7 +196,7 @@ public function getHTMLTableCellForItem(
         return $cell;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation' => 'equal',
@@ -204,7 +204,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
diff --git a/src/DeviceHardDrive.php b/src/DeviceHardDrive.php
index 8a4fefc67d0..a26fcddd6b5 100644
--- a/src/DeviceHardDrive.php
+++ b/src/DeviceHardDrive.php
@@ -40,12 +40,12 @@ class DeviceHardDrive extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceHardDrive', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Hard drive', 'Hard drives', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -87,7 +87,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -146,9 +146,9 @@ public function rawSearchOptions(): array
      * @since 0.85
      * @param array $input
      *
-     * @return array|false
+     * @return array
      **/
-    public function prepareInputForAddOrUpdate($input): array|false
+    public function prepareInputForAddOrUpdate($input)
     {
         foreach (['capacity_default'] as $field) {
             if (isset($input[$field]) && !is_numeric($input[$field])) {
@@ -158,12 +158,12 @@ public function prepareInputForAddOrUpdate($input): array|false
         return $input;
     }
 
-    public function prepareInputForAdd($input): array|false
+    public function prepareInputForAdd($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-    public function prepareInputForUpdate($input): array|false
+    public function prepareInputForUpdate($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
@@ -197,7 +197,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -234,7 +234,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return ['designation'       => 'equal',
             'manufacturers_id'  => 'equal',
@@ -243,7 +243,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
@@ -306,7 +306,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
         return $tab;
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "far fa-hdd";
     }
diff --git a/src/DeviceMemory.php b/src/DeviceMemory.php
index aa0aff0f7f2..e9c3fc81f3e 100644
--- a/src/DeviceMemory.php
+++ b/src/DeviceMemory.php
@@ -40,12 +40,12 @@ class DeviceMemory extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceMemory', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Memory', 'Memory', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -78,7 +78,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -121,9 +121,9 @@ public function rawSearchOptions(): array
      * @since 0.85
      * @param array $input
      *
-     * @return array|false
+     * @return array
      **/
-    public function prepareInputForAddOrUpdate($input): array|false
+    public function prepareInputForAddOrUpdate($input)
     {
         foreach (['size_default'] as $field) {
             if (isset($input[$field]) && !is_numeric($input[$field])) {
@@ -133,12 +133,12 @@ public function prepareInputForAddOrUpdate($input): array|false
         return $input;
     }
 
-    public function prepareInputForAdd($input): array|false
+    public function prepareInputForAdd($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-    public function prepareInputForUpdate($input): array|false
+    public function prepareInputForUpdate($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
@@ -171,7 +171,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -204,7 +204,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'          => 'equal',
@@ -214,7 +214,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function rawSearchOptionsToAdd($class, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($class, $main_joinparams)
     {
         $tab = [];
 
@@ -257,7 +257,7 @@ public static function rawSearchOptionsToAdd($class, $main_joinparams): array
         return $tab;
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "fas fa-memory";
     }
diff --git a/src/DeviceMotherboard.php b/src/DeviceMotherboard.php
index b1b310756e1..90e53fdb030 100644
--- a/src/DeviceMotherboard.php
+++ b/src/DeviceMotherboard.php
@@ -38,12 +38,12 @@ class DeviceMotherboard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceMotherboard', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('System board', 'System boards', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -59,7 +59,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -108,7 +108,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
 
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
@@ -124,7 +124,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'      => 'equal',
@@ -133,7 +133,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
diff --git a/src/DeviceNetworkCard.php b/src/DeviceNetworkCard.php
index be91e0d83ef..c0b0a64f238 100644
--- a/src/DeviceNetworkCard.php
+++ b/src/DeviceNetworkCard.php
@@ -40,7 +40,7 @@ class DeviceNetworkCard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceNetworkCard', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Network card', 'Network cards', $nb);
     }
@@ -50,7 +50,7 @@ public static function getTypeName($nb = 0): string
      *
      * @since 0.84
      **/
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation' => 'equal',
@@ -58,7 +58,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -87,7 +87,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -180,7 +180,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -238,7 +238,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     }
 
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "fas fa-network-wired";
     }
diff --git a/src/DevicePci.php b/src/DevicePci.php
index 0d3e1c3034a..eff97558d98 100644
--- a/src/DevicePci.php
+++ b/src/DevicePci.php
@@ -40,12 +40,12 @@ class DevicePci extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DevicePci', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('PCI device', 'PCI devices', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -64,7 +64,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab                 = parent::rawSearchOptions();
 
@@ -79,7 +79,7 @@ public function rawSearchOptions(): array
         return $tab;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
diff --git a/src/DevicePowerSupply.php b/src/DevicePowerSupply.php
index 36a5f90fb76..7865a690947 100644
--- a/src/DevicePowerSupply.php
+++ b/src/DevicePowerSupply.php
@@ -38,12 +38,12 @@ class DevicePowerSupply extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DevicePowerSupply', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Power supply', 'Power supplies', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
 
         return array_merge(
@@ -64,7 +64,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -121,7 +121,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -138,7 +138,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
@@ -162,7 +162,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
         return $tab;
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-bolt";
     }
diff --git a/src/DeviceProcessor.php b/src/DeviceProcessor.php
index f07be26b54f..201fb09dbdd 100644
--- a/src/DeviceProcessor.php
+++ b/src/DeviceProcessor.php
@@ -41,12 +41,12 @@ class DeviceProcessor extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceProcessor', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Processor', 'Processors', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -86,7 +86,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -137,9 +137,9 @@ public function rawSearchOptions(): array
      * @since 0.85
      * @param array $input
      *
-     * @return array|false
+     * @return array
      **/
-    public function prepareInputForAddOrUpdate($input): array|false
+    public function prepareInputForAddOrUpdate($input)
     {
         foreach (
             ['frequence', 'frequency_default', 'nbcores_default',
@@ -153,12 +153,12 @@ public function prepareInputForAddOrUpdate($input): array|false
         return $input;
     }
 
-    public function prepareInputForAdd($input): array|false
+    public function prepareInputForAdd($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
 
-    public function prepareInputForUpdate($input): array|false
+    public function prepareInputForUpdate($input)
     {
         return $this->prepareInputForAddOrUpdate($input);
     }
@@ -189,7 +189,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -204,7 +204,7 @@ public function getHTMLTableCellForItem(
         return null;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'          => 'equal',
@@ -213,7 +213,7 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
@@ -289,7 +289,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
         return $tab;
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-cpu";
     }
diff --git a/src/DeviceSensor.php b/src/DeviceSensor.php
index 1145cd78073..d158be29776 100644
--- a/src/DeviceSensor.php
+++ b/src/DeviceSensor.php
@@ -40,12 +40,12 @@ class DeviceSensor extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceSensor', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Sensor', 'Sensors', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -59,7 +59,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab                 = parent::rawSearchOptions();
 
@@ -100,7 +100,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -119,7 +119,7 @@ public function getHTMLTableCellForItem(
     /**
      * Criteria used for import function
      */
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'          => 'equal',
diff --git a/src/DeviceSimcard.php b/src/DeviceSimcard.php
index 811cc252815..8946ac92625 100644
--- a/src/DeviceSimcard.php
+++ b/src/DeviceSimcard.php
@@ -38,12 +38,12 @@ class DeviceSimcard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceSimcard', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Simcard', 'Simcards', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -69,7 +69,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -100,7 +100,7 @@ public function rawSearchOptions(): array
         return $tab;
     }
 
-    public function getImportCriteria(): array
+    public function getImportCriteria()
     {
         return [
             'designation'             => 'equal',
@@ -109,12 +109,12 @@ public function getImportCriteria(): array
         ];
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "fas fa-sim-card";
     }
 
-    public function getRights($interface = 'central'): array
+    public function getRights($interface = 'central')
     {
         $rights = parent::getRights($interface);
         // Update labels to match other assets
diff --git a/src/DeviceSoundCard.php b/src/DeviceSoundCard.php
index 5188af9bb6d..05d90e44b59 100644
--- a/src/DeviceSoundCard.php
+++ b/src/DeviceSoundCard.php
@@ -40,12 +40,12 @@ class DeviceSoundCard extends CommonDevice
 {
     protected static $forward_entity_to = ['Item_DeviceSoundCard', 'Infocom'];
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Soundcard', 'Soundcards', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return array_merge(
             parent::getAdditionalFields(),
@@ -69,7 +69,7 @@ public function getAdditionalFields(): array
         );
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
@@ -119,7 +119,7 @@ public function getHTMLTableCellForItem(
         CommonDBTM $item = null,
         HTMLTableCell $father = null,
         array $options = []
-    ): ?HTMLTableCell {
+    ) {
         $column = parent::getHTMLTableCellForItem($row, $item, $father, $options);
 
         if ($column == $father) {
@@ -141,7 +141,7 @@ public function getHTMLTableCellForItem(
         return $cell;
     }
 
-    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
+    public static function rawSearchOptionsToAdd($itemtype, $main_joinparams)
     {
         $tab = [];
 
@@ -164,7 +164,7 @@ public static function rawSearchOptionsToAdd($itemtype, $main_joinparams): array
         return $tab;
     }
 
-    public static function getIcon(): string
+    public static function getIcon()
     {
         return "ti ti-volume-2";
     }

From 5d05e39f15a43e2ae16c1457780563757d047cbf Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Wed, 8 May 2024 20:24:29 -0400
Subject: [PATCH 5/6] revert return type changes

---
 src/PCIVendor.php    | 6 +++---
 src/RegisteredID.php | 2 +-
 src/USBVendor.php    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/PCIVendor.php b/src/PCIVendor.php
index ed59514eab2..44dffdd1a18 100644
--- a/src/PCIVendor.php
+++ b/src/PCIVendor.php
@@ -44,12 +44,12 @@ class PCIVendor extends CommonDropdown implements CacheableListInterface
 {
     public string $cache_key = 'glpi_pcivendors';
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('PCI vendor', 'PCI vendors', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return [
             [
@@ -64,7 +64,7 @@ public function getAdditionalFields(): array
         ];
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 
diff --git a/src/RegisteredID.php b/src/RegisteredID.php
index 43eb3afb4d1..a64bc829de1 100644
--- a/src/RegisteredID.php
+++ b/src/RegisteredID.php
@@ -57,7 +57,7 @@ public static function getRegisteredIDTypes(): array
         ];
     }
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('Registered ID (issued by PCI-SIG)', 'Registered IDs (issued by PCI-SIG)', $nb);
     }
diff --git a/src/USBVendor.php b/src/USBVendor.php
index 365c4b24649..274727db98f 100644
--- a/src/USBVendor.php
+++ b/src/USBVendor.php
@@ -44,12 +44,12 @@ class USBVendor extends CommonDropdown implements CacheableListInterface
 {
     public string $cache_key = 'glpi_usbvendors';
 
-    public static function getTypeName($nb = 0): string
+    public static function getTypeName($nb = 0)
     {
         return _n('USB vendor', 'USB vendors', $nb);
     }
 
-    public function getAdditionalFields(): array
+    public function getAdditionalFields()
     {
         return [
             [
@@ -64,7 +64,7 @@ public function getAdditionalFields(): array
         ];
     }
 
-    public function rawSearchOptions(): array
+    public function rawSearchOptions()
     {
         $tab = parent::rawSearchOptions();
 

From b2dab8bd9e05b864ad1d28918c4fd22c29e4eaff Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Tue, 14 May 2024 05:12:15 -0400
Subject: [PATCH 6/6] handle in displaySpecificTypeField

---
 src/CommonDevice.php              | 1 +
 templates/dropdown_form.html.twig | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/CommonDevice.php b/src/CommonDevice.php
index 2d76a0ede91..15d2dd9d997 100644
--- a/src/CommonDevice.php
+++ b/src/CommonDevice.php
@@ -157,6 +157,7 @@ public function displaySpecificTypeField($ID, $field = [], array $options = [])
     {
         switch ($field['type']) {
             case 'registeredIDChooser':
+                RegisteredID::showAddChildButtonForItemForm($this, '_registeredID');
                 RegisteredID::showChildsForItemForm($this, '_registeredID');
                 break;
         }
diff --git a/templates/dropdown_form.html.twig b/templates/dropdown_form.html.twig
index 88c06b37364..d2ee6f4cbc3 100644
--- a/templates/dropdown_form.html.twig
+++ b/templates/dropdown_form.html.twig
@@ -193,12 +193,6 @@
                             {% set fields_params = fields_params|merge({'types': config(field['itemtype_list'])}) %}
                         {% endif %}
                         {{ fields.dropdownItemTypes(field['name'], item.fields[field['name']], field['label'], fields_params) }}
-                    {% elseif type == 'registeredIDChooser' %}
-                        {% set chooser_field %}
-                            {{ call('RegisteredID::showAddChildButtonForItemForm', [item, '_registeredID', null, false])|raw }}
-                            {{ item.displaySpecificTypeField(item.fields['id'], field, fields_params) }}
-                        {% endset %}
-                        {{ fields.field('', chooser_field, field['label']) }}
                     {% else %}
                         {% set field_value %}
                             {{ item.displaySpecificTypeField(item.fields['id'], field, fields_params) }}