Feat(CI): TwigCS (#49)

Author: Rom1-B

.twig_cs.dist.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use FriendsOfTwig\Twigcs;
+
+$finder = Twigcs\Finder\TemplateFinder::create()
+    ->in(__DIR__ . '/templates')
+    ->name('*.html.twig')
+    ->ignoreVCSIgnored(true);
+
+return Twigcs\Config\Config::create()
+    ->setFinder($finder)
+    ->setRuleSet(\Glpi\Tools\GlpiTwigRuleset::class)
+;

composer.json

@@ -4,6 +4,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.75",
+        "friendsoftwig/twigcs": "^6.1",
         "glpi-project/tools": "^0.7.4",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.4",
@@ -19,5 +20,10 @@
         "allow-plugins": {
             "phpstan/extension-installer": true
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Glpi\\Tools\\": "../../tools/src/"
+        }
     }
 }

composer.lock

@@ -60,7 +60,7 @@
                 {{ fields.hiddenField(
                     'plugin_databaseinventory_computergroups_id',
                     item.getID(),
-                )}}
+                ) }}
             </div>
         </form>
     {% endif %}
@@ -103,7 +103,7 @@
                                         {% if checked %}checked="checked"{% endif %}>
                                 </td>
                             {% endif %}
-                            <td><a href = {{computer['link']}}> {{ computer['name'] }}</a></td>
+                            <td><a href = {{ computer['link'] }}> {{ computer['name'] }}</a></td>
                             {% if computer['is_dynamic'] == 1 %}
                                 {% set is_dynamic = __('Yes') %}
                             {% else %}

templates/computergroupstatic.html.twig

@@ -26,8 +26,6 @@
  # -------------------------------------------------------------------------
  #}
 
-{% import "components/form/fields_macros.html.twig" as fields %}
-
 {% block more_fields %}
     {% if canread %}
         {% if contactlogs is not empty %}
@@ -46,11 +44,11 @@
                 {{ tableheader }}
                 {% for contactlog in contactlogs %}
                     <tr>
-                        <td><a href = {{contactlog['linkcred']}}> {{ contactlog['credname'] }}</a></td>
+                        <td><a href = {{ contactlog['linkcred'] }}> {{ contactlog['credname'] }}</a></td>
                         {% if itemtype == 'Agent' %}
-                            <td><a href = {{contactlog['linkdbparam']}}> {{ contactlog['dbparamname'] }}</a></td>
+                            <td><a href = {{ contactlog['linkdbparam'] }}> {{ contactlog['dbparamname'] }}</a></td>
                         {% else %}
-                            <td><a href = {{contactlog['linkagent']}}> {{ contactlog['agentname'] }}</a></td>
+                            <td><a href = {{ contactlog['linkagent'] }}> {{ contactlog['agentname'] }}</a></td>
                         {% endif %}
                         <td>{{ contactlog['date_creation']|formatted_datetime }}</td>
                     </tr>

templates/contactlog.html.twig

@@ -36,27 +36,24 @@
         item.fields['port'],
         __('Port', 'databaseinventory'),
         {'min' : 0, 'max' : 99999, 'step' : 1}
-    )}}
+    ) }}
 
     {{ fields.textField(
-      'login',
-      item.fields['login'],
-      __('Login', 'databaseinventory'),
-      )
-   }}
+        'login',
+        item.fields['login'],
+        __('Login', 'databaseinventory'),
+    ) }}
 
-   {{ fields.passwordField(
-      'password',
-      item.fields['password'],
-      __('Password', 'databaseinventory'),
-      {'clearable': true, 'is_disclosable' : false}
-      )
-   }}
-   {{ fields.textField(
-      'socket',
-      item.fields['socket'],
-      __('Socket', 'databaseinventory'),
-      )
-   }}
+    {{ fields.passwordField(
+        'password',
+        item.fields['password'],
+        __('Password', 'databaseinventory'),
+        {'clearable': true, 'is_disclosable' : false}
+    ) }}
+    {{ fields.textField(
+        'socket',
+        item.fields['socket'],
+        __('Socket', 'databaseinventory'),
+    ) }}
 
 {% endblock %}

templates/credential.html.twig

@@ -35,14 +35,13 @@
         'partial_inventory',
         item.fields['partial_inventory'],
         __('Execution frequency for partial inventory', 'databaseinventory'),
-    )
-    }}
+    ) }}
 
     {{ fields.dropdownNumberField(
         'execution_delay',
         item.fields['execution_delay'],
         __('Execution delay', 'databaseinventory'),
         {'min' : 0, 'max' : 24, 'step' : 1, 'unit' : 'hour'}
-    )}}
+    ) }}
 
 {% endblock %}

templates/databaseparam.html.twig

@@ -47,7 +47,7 @@
                 {% set btn_add %}
                     <button class="btn btn-primary" type="submit" name="add_computergroup" value="1">
                         <i class="fas fa-plus"></i>
-                        <span>{{_x('button', 'Add') }}</span>
+                        <span>{{ _x('button', 'Add') }}</span>
                     </button>
                 {% endset %}
 
@@ -60,7 +60,7 @@
                 {{ fields.hiddenField(
                     'plugin_databaseinventory_databaseparams_id',
                     item.getID(),
-                )}}
+                ) }}
             </div>
         </form>
     {% endif %}
@@ -102,7 +102,7 @@
                                         {% if checked %}checked="checked"{% endif %}>
                                 </td>
                             {% endif %}
-                            <td><a href = {{compgroup['link']}}> {{ compgroup['name'] }}</a></td>
+                            <td><a href = {{ compgroup['link'] }}> {{ compgroup['name'] }}</a></td>
                             <td>{{ compgroup['comment'] }}</td>
                             <td>{{ compgroup['nbdynamicitems'] }}</td>
                             <td>{{ compgroup['nbstaticitems'] }}</td>

templates/databaseparam_computergroup.html.twig

@@ -60,7 +60,7 @@
                 {{ fields.hiddenField(
                     'plugin_databaseinventory_databaseparams_id',
                     item.getID(),
-                )}}
+                ) }}
             </div>
         </form>
     {% endif %}
@@ -102,7 +102,7 @@
                                         {% if checked %}checked="checked"{% endif %}>
                                  </td>
                             {% endif %}
-                            <td><a href = {{credential['link']}}> {{ credential['name'] }}</a></td>
+                            <td><a href = {{ credential['link'] }}> {{ credential['name'] }}</a></td>
                             <td>{{ credential['login'] }}</td>
                             <td>{{ credential['port'] }}</td>
                             <td>{{ credential['socket'] }}</td>