Apply suggestions

Author: RomainLvr

composer.json

@@ -6,6 +6,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.75",
         "friendsoftwig/twigcs": "^6.1",
+        "glpi-project/phpstan-glpi": "^1.0",
         "glpi-project/tools": "^0.7.5",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.4",

composer.lock

@@ -1163,7 +1163,7 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
                         if (!$item->isEntityAssign() || in_array($item->fields['entities_id'], $entities)) {
                             $display_condition = new PluginFieldsContainerDisplayCondition();
                             if ($display_condition->computeDisplayContainer($item, $data['id'])) {
-                                $tabs_entries[$tab_name] = $data['label'];
+                                $tabs_entries[$tab_name] = self::createTabEntry($data['label'], 0, null, PluginFieldsContainer::getIcon());
                             }
                         }
                     }

inc/container.class.php

@@ -16,5 +16,4 @@ parameters:
         - ../../src
     stubFiles:
         - ../../stubs/glpi_constants.php
-rules:
-    - GlpiProject\Tools\PHPStan\Rules\GlobalVarTypeRule
+

phpstan.neon

@@ -31,7 +31,7 @@
 /** @var array $CFG_GLPI */
 global $CFG_GLPI;
 
-define('PLUGIN_FIELDS_VERSION', '1.21.22');
+define('PLUGIN_FIELDS_VERSION', '1.22.0-beta1');
 
 // Minimal GLPI version, inclusive
 define('PLUGIN_FIELDS_MIN_GLPI', '11.0.0');
@@ -136,10 +136,10 @@ function plugin_init_fields()
             //include js and css
             $debug = (isset($_SESSION['glpi_use_mode'])
                    && $_SESSION['glpi_use_mode'] == Session::DEBUG_MODE ? true : false);
-            if (!$debug && file_exists(__DIR__ . '/css/fields.min.css')) {
-                $PLUGIN_HOOKS['add_css']['fields'][] = 'css/fields.min.css';
+            if (!$debug && file_exists(__DIR__ . '/public/css/fields.min.css')) {
+                $PLUGIN_HOOKS['add_css']['fields'][] = 'public/css/fields.min.css';
             } else {
-                $PLUGIN_HOOKS['add_css']['fields'][] = 'css/fields.css';
+                $PLUGIN_HOOKS['add_css']['fields'][] = 'public/css/fields.css';
             }
 
             // Add/delete profiles to automaticaly to container
@@ -151,11 +151,11 @@ function plugin_init_fields()
             if (
                 plugin_fields_script_endswith('container.form.php')
             ) {
-                $PLUGIN_HOOKS['add_javascript']['fields'][] = 'lib/redips-drag-min.js';
-                if (!$debug && file_exists(__DIR__ . '/js/drag-field-row.min.js')) {
-                    $PLUGIN_HOOKS['add_javascript']['fields'][] = 'js/drag-field-row.min.js';
+                $PLUGIN_HOOKS['add_javascript']['fields'][] = 'public/lib/redips-drag-min.js';
+                if (!$debug && file_exists(__DIR__ . '/public/js/drag-field-row.min.js')) {
+                    $PLUGIN_HOOKS['add_javascript']['fields'][] = 'public/js/drag-field-row.min.js';
                 } else {
-                    $PLUGIN_HOOKS['add_javascript']['fields'][] = 'js/drag-field-row.js';
+                    $PLUGIN_HOOKS['add_javascript']['fields'][] = 'public/js/drag-field-row.js';
                 }
             }
         }