Merge branch 'release/1.4.0'

galette · Nov 1, 2023 · 7c658b5 · 7c658b5
2 parents b2b7335 + 13d3a68
commit 7c658b5
Show file tree

Hide file tree

Showing 103 changed files with 18,158 additions and 5,551 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -67,3 +67,7 @@ jobs:
       - name: PHPStan checks
         run: |
           vendor/bin/phpstan analyze --ansi --memory-limit=2G --no-interaction --no-progress
+
+      - name: Twig CS
+        run: |
+          vendor/bin/twigcs app/Templates --severity error --display blocking
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,22 @@
-/.vscode/
 /vendor/
-/public/node_modules/
 /data/cache/*
 !/data/cache/.gitkeep
 /data/logs/*.log
 /config.inc.php
 /local.config.inc.php
 /phinx_local.php
-/tests/code-coverage/
 /projects/
 _site/
 .sass-cache/
 .buildpath
 .project
 .settings/
 .idea/
+node_modules/
+public/assets/
+!public/assets/.gitkeep
+
+# Semantic UI
+semantic
+!ui/semantic
+public/ui/
diff --git a/app/Controllers/Reference.php b/app/Controllers/Reference.php
@@ -12,7 +12,6 @@ class Reference extends ControllerAbstract
     public function view(Request $req, Response $res, array $args)
     {
         $get = $req->getQueryParams();
-
         // default session param for this controller
         if (!isset($_SESSION['reference'])) {
             $_SESSION['reference'] = [
@@ -21,17 +20,6 @@ public function view(Request $req, Response $res, array $args)
             ];
         }
 
-        // manage sorting
-        if (isset($get['orderby'])) {
-            if ($_SESSION['reference']['orderby'] == $get['orderby']) {
-               // toggle sort if orderby requested on the same column
-                $_SESSION['reference']['sort'] = ($_SESSION['reference']['sort'] == "desc"
-                                                ? "asc"
-                                                : "desc");
-            }
-            $_SESSION['reference']['orderby'] = $get['orderby'];
-        }
-
         $_SESSION['reference']['pagination'] = 15;
         $order_field = $_SESSION['reference']['orderby'];
         $order_sort  = $_SESSION['reference']['sort'];
@@ -121,7 +109,7 @@ function ($key) use ($join_table) {
             'total'         => ReferenceModel::query()->where('is_displayed', '=', true)->count(),
             'class'         => 'reference',
             'showmodal'     => isset($get['showmodal']),
-            'uuid'          => isset($get['uuid']) ? $get['uuid'] : '',
+            'uuid'          => $get['uuid'] ?? '',
             'references'    => $references,
             'orderby'       => $_SESSION['reference']['orderby'],
             'sort'          => $_SESSION['reference']['sort'],
@@ -207,8 +195,6 @@ public function register(Request $req, Response $res)
 
     public function filter(Request $req, Response $res, array $args)
     {
-        $get = $req->getQueryParams();
-
         // manage sorting
         if ($args['action'] == 'order') {
             if (!isset($args['value'])) {

diff --git a/app/Controllers/Telemetry.php b/app/Controllers/Telemetry.php
@@ -165,6 +165,7 @@ public function view(Request $request, Response $response)
             ->toArray();
         $dashboard['default_languages'] = json_encode([[
             'type'    => 'pie',
+            'hole'   => .4,
             'palette' => 'combo',
             'labels'  => array_column($languages, 'glpi_default_language'),
             'values'  => array_column($languages, 'total')