Cosmetic

Author: ddebin

.github/workflows/main.yml

@@ -9,32 +9,34 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     name: PHP ${{ matrix.php }}
     steps:
-      -   uses: actions/checkout@v4
+      -   uses: actions/checkout@v6
           with:
               fetch-depth: 5
-      # see https://github.com/shivammathur/setup-php
       -   uses: shivammathur/setup-php@v2
           with:
             php-version: ${{ matrix.php }}
+            tools: composer:2
             coverage: none
       -   run: composer install --no-progress
+      -   run: composer php-cs-fixer-dry-run
       -   run: composer phpstan
       -   run: composer phpunit
 
   tests_lowest_dependencies:
     runs-on: ubuntu-24.04
     steps:
-      -   uses: actions/checkout@v4
+      -   uses: actions/checkout@v6
           with:
             fetch-depth: 5
-      # see https://github.com/shivammathur/setup-php
       -   uses: shivammathur/setup-php@v2
           with:
             php-version: '7.1'
+            tools: composer:2
             coverage: none
       -   run: composer update --no-progress --prefer-lowest
+      -   run: composer php-cs-fixer-dry-run
       -   run: composer phpstan
       -   run: composer phpunit

lib/MC/Google/Visualization.php

@@ -28,7 +28,7 @@
  *     field?: string,
  *     fields?: string[],
  *     callback?: callable,
- *     extra?: mixed[],
+ *     extra?: array,
  *     sort_field?: string,
  *     join?: string
  * }
@@ -488,7 +488,7 @@ public function setDefaultEntity(?string $default = null): void
      * @param array $row  the row values as an array
      * @param array $meta the metadata for the query (use generateMetadata())
      *
-     * @return string the string fragment to include in the results back to the javascript client
+     * @return string the string fragment to include in the results back to the JavaScript client
      *
      * @throws Visualization_Error
      */
@@ -1007,7 +1007,6 @@ protected function generateSQL(array &$meta): string
             $stmt = $this->db->query($pivotSql);
             assert(false !== $stmt);
             $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-            assert(false !== $rows);
             foreach ($rows as $row) {
                 // Create a version of all function-ed fields for each unique combination of pivot values
                 foreach ($funcFields as $field) {

lib/MC/Parser/Def.php

@@ -46,7 +46,9 @@ public function parsePart(string $str, int $loc): array
     {
         [$loc, $tok] = $this->_parse($str, $loc);
 
-        for (; ($loc < strlen($str)) && Parser::isWhitespace($str[$loc]); ++$loc);
+        while (($loc < strlen($str)) && Parser::isWhitespace($str[$loc])) {
+            ++$loc;
+        }
 
         return [$loc, $tok];
     }

lib/MC/Parser/Def/Set.php

@@ -5,6 +5,7 @@
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
+use MC\Parser\ParseError;
 
 /**
  * Verify that the string matches a series of subexpressions in the specified order.
@@ -25,6 +26,8 @@ public function __construct(array $exprs = [])
     /**
      * @param string $str the string to parse
      * @param int    $loc the index to start parsing
+     *
+     * @throws ParseError
      */
     public function _parse(string $str, int $loc): array
     {

phpstan.neon

@@ -3,6 +3,8 @@ includes:
     - vendor/phpstan/phpstan-phpunit/rules.neon
     - vendor/phpstan/phpstan-strict-rules/rules.neon
 parameters:
-    checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: true
-    treatPhpDocTypesAsCertain: false
+    treatPhpDocTypesAsCertain: false
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue