Merge branch 'main' into dependabot/composer/symfony-82ad37d7c3

Author: cedric-anne

.github/workflows/continuous-integration.yml

@@ -53,7 +53,7 @@ jobs:
           echo "MAILER_DSN=smtp://127.0.0.1:${{ job.services.mail.ports['1025'] }}" >> .env.test.local
           echo "MAILER_API_URL=http://127.0.0.1:${{ job.services.mail.ports['8025'] }}" >> .env.test.local
       - name: "Setup Node.js"
-        uses: "actions/setup-node@v5"
+        uses: "actions/setup-node@v6"
         with:
           node-version-file: "package.json"
       - name: "Setup PHP"
@@ -114,7 +114,7 @@ jobs:
           symfony server:start --daemon --no-tls
           vendor/bin/phpunit --colors=always
       - name: "Upload `/var` dir artifact"
-        uses: "actions/upload-artifact@v4"
+        uses: "actions/upload-artifact@v5"
         if: "${{ failure() && steps.phpunit.conclusion == 'failure' }}"
         with:
           name: "var"

composer.json

@@ -10,14 +10,14 @@
         "ext-gettext": "*",
         "ext-iconv": "*",
         "ext-pdo_mysql": "*",
-        "doctrine/collections": "^2.3",
+        "doctrine/collections": "^2.4",
         "doctrine/dbal": "^4.3",
         "doctrine/doctrine-bundle": "^2.16",
         "doctrine/doctrine-migrations-bundle": "^3.4",
         "doctrine/orm": "^3.5",
         "doctrine/persistence": "^4.1",
         "mledoze/countries": "^5.1",
-        "opis/json-schema": "^2.4",
+        "opis/json-schema": "^2.6",
         "psr/log": "^3.0",
         "symfony/asset": "^7.3",
         "symfony/cache-contracts": "^3.6",

composer.lock

@@ -13,6 +13,7 @@
         "deepmerge": "^4.3.1",
         "echarts": "^6.0.0",
         "eslint": "^8.57.1",
+        "file-loader": "^6.2.0",
         "flag-icons": "^7.5.0",
         "gridjs": "^6.2.0",
         "sass": "^1.80.6",

package-lock.json

@@ -23,7 +23,7 @@ public function getSqlQuery(): string
             (
                 telemetry.created_at BETWEEN :startDate AND :endDate
                 AND telemetry.glpi_version NOT LIKE '%dev'
-                AND telemetry.glpi_version REGEXP '^(9|10)\.[0-9]+'
+                AND telemetry.glpi_version REGEXP '^(9|10|11)\.[0-9]+'
             )
         SQL;