Revert "Feat(CI): TwigCS (#946)"

akstis-typer · akstis-typer · commit 992b5f6e8558 · 2025-05-23T08:37:12.000+03:00
This reverts commit 3bf9a73.
diff --git a/.twig_cs.dist.php b/.twig_cs.dist.php
diff --git a/composer.json b/composer.json
@@ -5,7 +5,6 @@
     },
     "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",
@@ -21,10 +20,5 @@
         "allow-plugins": {
             "phpstan/extension-installer": true
         }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Glpi\\Tools\\": "../../tools/src/"
-        }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/templates/container_display_conditions.html.twig b/templates/container_display_conditions.html.twig
@@ -32,7 +32,7 @@
 <div id="container{{ rand }}" class="asset">
    <div class="flash-messages">
       <div class="alert alert-info">
-         {{ __('The engine is used for hide block when main object meets condition') }}
+         {{ __('The engine is used for hide block when main object meets condition')}}
       </div>
    </div>
    <div class="d-flex align-items-start mb-3">
diff --git a/templates/fields.html.twig b/templates/fields.html.twig
@@ -48,8 +48,8 @@
     {% set rand = random() %}
 
     {% set field_options = field_options|merge({
-        'readonly': readonly or not canedit,
-        'required': field['mandatory'],
+        'readonly':   readonly or not canedit,
+        'required':   field['mandatory'],
         'full_width': already_wrapped
     }) %}
 
@@ -161,11 +161,11 @@
                 ]) %}
 
                 {# fake label for DOM disposition #}
-                <label class="col-form-label col-xxl-4 text-xxl-end" for="dropdown_items_id_testfield{{ rand }}">
+                <label class="col-form-label col-xxl-4 text-xxl-end" for="dropdown_items_id_testfield{{rand}}">
                 </label>
 
                 <div class="col-xxl-8 field-container">
-                    <span id='results_items_id{{ rand }}' class='col-lg-14'>
+                    <span id='results_items_id{{rand}}' class='col-lg-14'>
                         {% if value.itemtype != '' %}
                             {{ macros.dropdownField(value.itemtype, items_id_prefix ~ name, value.items_id, ' ', field_options|merge({
                                 'entity': value.itemtype == 'User' ? -1 : item.getEntityID(),
diff --git a/templates/forms/container_display_condition.html.twig b/templates/forms/container_display_condition.html.twig
@@ -39,28 +39,30 @@
                   {{ fields.dropdownArrayField('itemtype', container_display_condition.fields['itemtype']|default(null), container_itemtypes, __('Item type'), {'rand': rand, 'display_emptychoice': true}) }}
                   {% do call('Ajax::updateItemOnSelectEvent',
                      [
-                        'dropdown_itemtype' ~ rand,
+                        'dropdown_itemtype'~ rand,
                         'results_fields',
                         get_plugin_web_dir('fields') ~ '/ajax/container_display_condition.php',
                         {
                            'itemtype': '__VALUE__',
                            'action'  : 'get_itemtype_so',
                         }
-                     ]) %}
+                     ])
+                  %}
                   <div id='results_fields' class='form-field row col-12 col-sm-6  mb-2'>
                      {% if not container_display_condition.isNewItem() %}
                         {{ fields.dropdownArrayField('search_option', container_display_condition.fields['search_option']|default(null), search_options, '', {'no_label': true, 'rand': rand, 'display_emptychoice': false}) }}
                         {% do call('Ajax::updateItemOnSelectEvent',
                            [
-                              'dropdown_search_option' ~ rand,
+                              'dropdown_search_option'~ rand,
                               'results_condition',
                               get_plugin_web_dir('fields') ~ '/ajax/container_display_condition.php',
                               {
                                  'search_option_id'  : '__VALUE__',
                                  'itemtype'  : container_display_condition.fields['itemtype'],
                                  'action'     : 'get_condition_switch_so'
                               }
-                           ]) %}
+                           ])
+                        %}
                      {% endif %}
                   </div>
 
diff --git a/templates/status_overrides.html.twig b/templates/status_overrides.html.twig
@@ -36,7 +36,7 @@
       <span class='ms-2'>
          {{ __("Here you can redefine the following options :") }}
          <ul>
-            <li><i>{{ __("Mandatory") }} </i></li>
+            <li><i> {{__("Mandatory") }} </i></li>
             <li><i>{{ __("Read-only") }} </i></li>
          </ul>
          {{ __("for each field, depending on the states of the element attached to the container.") }}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`},`
`6`	`6`	`"require-dev": {`
`7`	`7`	`"friendsofphp/php-cs-fixer": "^3.75",`
`8`		`- "friendsoftwig/twigcs": "^6.1",`
`9`	`8`	`"glpi-project/tools": "^0.7.4",`
`10`	`9`	`"php-parallel-lint/php-parallel-lint": "^1.4",`
`11`	`10`	`"phpstan/extension-installer": "^1.4",`
`@@ -21,10 +20,5 @@`
`21`	`20`	`"allow-plugins": {`
`22`	`21`	`"phpstan/extension-installer": true`
`23`	`22`	`}`
`24`		`- },`
`25`		`- "autoload-dev": {`
`26`		`- "psr-4": {`
`27`		`- "Glpi\\Tools\\": "../../tools/src/"`
`28`		`- }`
`29`	`23`	`}`
`30`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,28 +39,30 @@`
`39`	`39`	`{{ fields.dropdownArrayField('itemtype', container_display_condition.fields['itemtype']\|default(null), container_itemtypes, __('Item type'), {'rand': rand, 'display_emptychoice': true}) }}`
`40`	`40`	`{% do call('Ajax::updateItemOnSelectEvent',`
`41`	`41`	`[`
`42`		`- 'dropdown_itemtype' ~ rand,`
	`42`	`+ 'dropdown_itemtype'~ rand,`
`43`	`43`	`'results_fields',`
`44`	`44`	`get_plugin_web_dir('fields') ~ '/ajax/container_display_condition.php',`
`45`	`45`	`{`
`46`	`46`	`'itemtype': '__VALUE__',`
`47`	`47`	`'action' : 'get_itemtype_so',`
`48`	`48`	`}`
`49`		`- ]) %}`
	`49`	`+ ])`
	`50`	`+ %}`
`50`	`51`	`<div id='results_fields' class='form-field row col-12 col-sm-6 mb-2'>`
`51`	`52`	`{% if not container_display_condition.isNewItem() %}`
`52`	`53`	`{{ fields.dropdownArrayField('search_option', container_display_condition.fields['search_option']\|default(null), search_options, '', {'no_label': true, 'rand': rand, 'display_emptychoice': false}) }}`
`53`	`54`	`{% do call('Ajax::updateItemOnSelectEvent',`
`54`	`55`	`[`
`55`		`- 'dropdown_search_option' ~ rand,`
	`56`	`+ 'dropdown_search_option'~ rand,`
`56`	`57`	`'results_condition',`
`57`	`58`	`get_plugin_web_dir('fields') ~ '/ajax/container_display_condition.php',`
`58`	`59`	`{`
`59`	`60`	`'search_option_id' : '__VALUE__',`
`60`	`61`	`'itemtype' : container_display_condition.fields['itemtype'],`
`61`	`62`	`'action' : 'get_condition_switch_so'`
`62`	`63`	`}`
`63`		`- ]) %}`
	`64`	`+ ])`
	`65`	`+ %}`
`64`	`66`	`{% endif %}`
`65`	`67`	`</div>`
`66`	`68`