phpstan lvl 1

.github/workflows/continuous-integration.yml

@@ -19,6 +19,9 @@ jobs:
       matrix:
         include:
           - {php-version: "7.4"}
+          - {php-version: "8.1"}
+          - {php-version: "8.2"}
+          - {php-version: "8.3-rc"}
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -51,13 +54,14 @@ jobs:
           vendor/bin/licence-headers-check --ansi --no-interaction
 
   tests:
-    name: "Test on GLPI ${{ matrix.glpi-version }}"
+    name: "Test on GLPI ${{ matrix.glpi-version }} with PHP ${{ matrix.php-version }}"
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
       matrix:
         include:
           - {glpi-version: "10.0", php-version: "7.4", db-image: "mysql:8.0"}
+          - {glpi-version: "10.0", php-version: "8.2", db-image: "mysql:8.0"}
     services:
       app:
         image: "ghcr.io/glpi-project/githubactions-php:${{ matrix.php-version }}"
@@ -95,3 +99,5 @@ jobs:
           docker exec ${{ job.services.app.id }} bin/console glpi:database:install --ansi --no-interaction --db-name=glpi --db-host=db --db-user=root --strict-configuration
           docker exec ${{ job.services.app.id }} bin/console glpi:plugin:install --ansi --no-interaction --username=glpi oauthimap
           docker exec ${{ job.services.app.id }} bin/console glpi:plugin:activate --ansi --no-interaction oauthimap
+      - name: "PHPStan checks"
+        run: docker exec ${{ job.services.app.id }} bash -c "cd plugins/oauthimap && php vendor/bin/phpstan analyze --ansi --memory-limit=1G --no-interaction --no-progress"

composer.json

@@ -3,8 +3,11 @@
         "php": ">=7.4"
     },
     "require-dev": {
-        "glpi-project/tools": "^0.6",
+        "glpi-project/tools": "^0.7.1",
         "php-parallel-lint/php-parallel-lint": "^1.3",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-deprecation-rules": "^1.1",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "provide": {
@@ -15,6 +18,9 @@
         "platform": {
             "php": "7.4.0"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
 }

front/application.form.php

@@ -30,6 +30,9 @@
 
 include('../../../inc/includes.php');
 
+/** @var array */
+global $_UPOST;
+
 $dropdown = new PluginOauthimapApplication();
 
 if (isset($_POST['id']) && isset($_POST['request_authorization'])) {
@@ -38,7 +41,7 @@
 } else {
     Html::requireJs('clipboard');
 
-    if (array_key_exists('client_secret', $_POST)) {
+    if (array_key_exists('client_secret', $_POST) && array_key_exists('client_secret', $_UPOST)) {
         // Client secret must not be altered.
         $_POST['client_secret'] = $_UPOST['client_secret'];
     }

inc/mailcollectorfeature.class.php

@@ -58,7 +58,6 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
                 }
 
                 return CommonGLPI::createTabEntry(MailCollector::getTypeName(Session::getPluralNumber()), $count);
-            break;
         }
 
         return '';
@@ -68,7 +67,7 @@ public static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $
     {
         switch ($item->getType()) {
             case PluginOauthimapApplication::class:
-                MailCollectorFeature::showMailCollectorsForApplication($item, $tabnum);
+                MailCollectorFeature::showMailCollectorsForApplication($item);
                 break;
         }
 
@@ -297,9 +296,10 @@ public static function updateMailCollectorOnAuthorizationCallback(
         PluginOauthimapAuthorization $authorization,
         array $params = []
     ): void {
+        $mailcollector = new MailCollector();
+        $redirect = $mailcollector->getSearchURL();
         if ($success) {
            // Store authorized email into MailCollector
-            $mailcollector = new MailCollector();
             $mailcollector_id = $params[$mailcollector->getForeignKeyField()] ?? null;
             if ($mailcollector_id !== null && $mailcollector->getFromDB($mailcollector_id)) {
                 $mailcollector->update(
@@ -308,10 +308,11 @@ public static function updateMailCollectorOnAuthorizationCallback(
                         'login' => $authorization->fields['email'],
                     ]
                 );
+                $redirect = $mailcollector->getLinkURL();
             }
         }
 
-        Html::redirect($mailcollector->getLinkURL());
+        Html::redirect($redirect);
     }
 
     /**
@@ -412,7 +413,7 @@ private static function deactivateMailCollectors(string $protocol_type, ?string
      * @param string $login
      * @param bool   $only_active
      *
-     * @return void
+     * @return array
      */
     private static function getAssociatedMailCollectors(
         string $protocol_type,

phpstan.neon

@@ -0,0 +1,19 @@
+parameters:
+    parallel:
+        maximumNumberOfProcesses: 2
+    level: 1
+    bootstrapFiles:
+        - ../../inc/based_config.php
+        - setup.php
+    paths:
+        - inc
+        - front
+        - ajax
+        - hook.php
+    scanDirectories:
+        - ../../inc
+        - ../../src
+    stubFiles:
+        - ../../stubs/glpi_constants.php
+rules:
+    - GlpiProject\Tools\PHPStan\Rules\GlobalVarTypeRule