Add phpstan checks, fixes

Fix checker configuration
Update scrutinizer configuration
Clean code

Author: trasher

.composer-require-checker.config.json

@@ -4,7 +4,7 @@
 
     "ctype", "date", "fileinfo", "filter", "iconv", "json", "pcre", "reflection", "session", "simplexml", "spl", "xml",
 
-    "curl", "gd", "intl", "mbstring", "mysqli", "zlib", "pdo", "pgsql", "gettext", "yaml",
+    "curl", "gd", "intl", "mbstring", "mysqli", "zlib", "pdo", "pgsql", "gettext",
 
     "exif", "pcntl"
   ],
@@ -44,6 +44,8 @@
     "GALETTE_X_FORWARDED_FOR_INDEX",
     "_CURRENT_THEME_PATH",
     "GALETTE_URI",
+    "GALETTE_DISPLAY_VERSION",
+    "GALETTE_PHP_MIN",
     "_T",
     "__",
     "_Tn",
@@ -91,7 +93,11 @@
     "// Should not error (not used) but...",
     "mt_rand",
     "rand",
-    "random_int"
+    "random_int",
+
+
+    "// Not detected, do not know why.",
+    "Psr\\Http\\Server\\RequestHandlerInterface"
   ],
   "scan-files": [
     "*.php",

.github/workflows/ci-linux.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '8.1', '8.2' ]
         coverage: [none]
       fail-fast: false
 
@@ -30,51 +30,58 @@ jobs:
           tools: composer
           coverage: ${{ matrix.coverage }}
 
-      - name: Checkout plugin
-        uses: actions/checkout@v2
-
       - name: Checkout Galette core
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: galette/galette
           path: galette-core
           fetch-depth: 1
           ref: develop
 
+      - name: Checkout plugin
+        uses: actions/checkout@v3
+        with:
+          path: galette-core/galette/plugins/plugin-maps
+
       - name: Get composer cache directory
         id: composer-cache
         run: |
-          mv composer.json.checker composer.json
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
 
       - name: Install dependencies
         run: |
+          cd galette-core/galette
           composer install --ignore-platform-reqs
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
-
-      - name: Install CS only
-        run: |
-          composer require squizlabs/php_codesniffer
-        if: ${{ matrix.php-versions== '7.2' || matrix.php-versions== '7.3' }}
 
       - name: CS
         run: |
-          vendor/bin/phpcs -n -p --standard=galette-core/phpcs-rules.xml lib/ ./*.php
+          cd galette-core/galette/plugins/plugin-maps
+          ../../vendor/bin/phpcs -n -p --standard=../../../phpcs-rules.xml lib/ ./*.php
 
       - name: Check missing symbols
         run: |
-          vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json
-        if: ${{ matrix.php-versions!= '7.2' && matrix.php-versions!= '7.3' }}
+          cd galette-core/galette/plugins/plugin-maps
+          composer require maglnet/composer-require-checker -W
+          vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
+
+      - name: PHPStan checks
+        run: |
+          cd galette-core/galette/plugins/plugin-maps
+          ../../vendor/bin/phpstan analyze --ansi --memory-limit=2G --no-interaction --no-progress
+        if: matrix.php-versions == '8.1'
 
-      - uses: actions/setup-node@v1
-      - run: npm install
-      - run: npm run-script build
+      - name: Install Node
+        uses: actions/setup-node@v3
+
+      - name: Build JS
+        run: |
+          cd galette-core/galette/plugins/plugin-maps
+          npm install
+          npm run-script build

.scrutinizer.yml

@@ -14,17 +14,14 @@ build:
         analysis:
             environment:
                 php:
-                    version: 7.4
+                    version: 8.1
 
             project_setup:
                 override:
                     - 'true'
             tests:
                 override:
                     - php-scrutinizer-run
-                    -
-                        command: phpcs-run
-                        use_website_config: true
                     - js-scrutinizer-run
 
     cache:

composer.json.checker

@@ -61,7 +61,7 @@
 class MapsController extends AbstractPluginController
 {
     /**
-     * @var integer
+     * @var array
      */
     #[Inject("Plugin Galette Maps")]
     protected $module_info;
@@ -81,7 +81,7 @@ public function map(Request $request, Response $response): Response
             //public pages are not actives
             return $response
                 ->withStatus(301)
-                ->withHeader('Location', $this->router->urlFor('slash'));
+                ->withHeader('Location', $this->routeparser->urlFor('slash'));
         }
 
         $coords = new Coordinates();
@@ -156,15 +156,14 @@ public function localizeMember(Request $request, Response $response, int $id = n
                 //in member
                 //FIXME: silent fallback is maybe not the best to do
                 $member->load($this->login->id);
-                $id = $this->login->id;
             }
         }
 
         $coords = new Coordinates();
         $mcoords = $coords->getCoords($member->id);
 
         $towns = false;
-        if ($mcoords === false || count($mcoords) === 0) {
+        if (count($mcoords) === 0) {
             if ($member->town != '') {
                 $t = new NominatimTowns($this->preferences);
                 $towns = $t->search(
@@ -188,13 +187,6 @@ public function localizeMember(Request $request, Response $response, int $id = n
 
         if ($towns !== false) {
             $params['towns'] = $towns;
-        }
-
-        if ($mcoords === false) {
-            $this->flash->addMessage(
-                'error_detected',
-                _T('Coordinates has not been loaded. Maybe plugin tables does not exists in the database?', 'maps')
-            );
         } elseif (count($mcoords) > 0) {
             $params['town'] = $mcoords;
         }

lib/GaletteMaps/Controllers/MapsController.php

@@ -90,15 +90,14 @@ public function getCoords($id)
                     'Maps coordinates table does not exists',
                     Analog::WARNING
                 );
-                return false;
             } else {
                 Analog::log(
                     'Unable to retrieve members coordinates for "' .
                     $id  . '". | ' . $e->getMessage(),
                     Analog::WARNING
                 );
             }
-            return false;
+            throw $e;
         }
     }
 
@@ -207,7 +206,7 @@ public function listCoords()
                     Analog::WARNING
                 );
             }
-            return false;
+            throw $e;
         }
     }
 
@@ -225,7 +224,6 @@ public function setCoords($id, $latitude, $longitude)
         global $zdb;
 
         try {
-            $res = null;
             $coords = $this->getCoords($id);
             if (count($coords) === 0) {
                 //cordinates does not exists yet
@@ -254,8 +252,7 @@ public function setCoords($id, $latitude, $longitude)
             return ($results->count() > 0);
         } catch (\Exception $e) {
             Analog::log(
-                'Unable to set coordinatates for member ' .
-                $id_adh . ' | ' . $e->getMessage(),
+                'Unable to set coordinates | ' . $e->getMessage(),
                 Analog::ERROR
             );
             return false;

lib/GaletteMaps/Coordinates.php

@@ -119,8 +119,6 @@ public function search($town, $country = null)
         //get request infos
         $infos = curl_getinfo($ch);
         if ($infos['http_code'] !== 200) {
-            $trace = debug_backtrace();
-            $caller = $trace[1];
             //At this point, core has been created, but is failing
             //to load in solr.
             throw new \RuntimeException(

lib/GaletteMaps/NominatimTowns.php

@@ -37,6 +37,7 @@
 
 namespace GaletteMaps;
 
+use Galette\Core\Login;
 use Galette\Entity\Adherent;
 use Galette\Core\GalettePlugin;
 

lib/GaletteMaps/PluginGaletteMaps.php

@@ -0,0 +1,14 @@
+parameters:
+    parallel:
+        maximumNumberOfProcesses: 2
+    level: 3
+    paths:
+        - lib/
+    scanFiles:
+        - _config.inc.php
+        - ../../config/paths.inc.php
+        - ../../config/config.inc.php.dist
+        - ../../config/galette_tcpdf_config.php
+    scanDirectories:
+        - ../../includes/
+        - ../../lib/