Bump minimum PHP to 7.4

Author: ddebin

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     name: PHP ${{ matrix.php }}
     steps:
       -   uses: actions/checkout@v6
@@ -32,7 +32,7 @@ jobs:
             fetch-depth: 5
       -   uses: shivammathur/setup-php@v2
           with:
-            php-version: '7.3'
+            php-version: '7.4'
             tools: composer:2
             coverage: none
       -   run: composer update --no-progress --prefer-lowest

.php-cs-fixer.php

@@ -2,27 +2,34 @@
 
 use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 
 $finder = Finder::create()
     ->exclude('vendor')
     ->in(__DIR__)
 ;
 
 $config = new Config();
-return $config->setRules([
+return $config
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
     '@PSR12' => true,
     '@PSR12:risky' => true,
     '@PhpCsFixer' => true,
     '@PhpCsFixer:risky' => true,
     '@PHP71Migration' => true,
     '@PHP71Migration:risky' => true,
     '@PHP73Migration' => true,
+    '@PHP74Migration' => true,
+    '@PHP74Migration:risky' => true,
     '@PHPUnit75Migration:risky' => true,
     '@PHPUnit7x5Migration:risky' => true,
     '@PHPUnit84Migration:risky' => true,
     '@PHPUnit8x4Migration:risky' => true,
     '@PHPUnit91Migration:risky' => true,
     '@PHPUnit9x1Migration:risky' => true,
+    '@PHPUnit100Migration:risky' => true,
+    '@PHPUnit10x0Migration:risky' => true,
     'array_syntax' => ['syntax' => 'short'],
     'php_unit_test_class_requires_covers' => false,
     'backtick_to_shell_exec' => true,

composer.json

@@ -22,16 +22,16 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "ext-pdo": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^9.1 || ^10.0"
+        "friendsofphp/php-cs-fixer": "^3.57",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
+        "phpunit/phpunit": "^9.0 || ^10.0"
     },
     "config": {
         "sort-packages": true
@@ -47,7 +47,7 @@
         }
     },
     "scripts": {
-        "phpstan": "@php phpstan analyse -l max -c phpstan.neon lib tests examples .php-cs-fixer.php",
+        "phpstan": "@php phpstan analyse -l 8 -c phpstan.neon lib tests examples .php-cs-fixer.php",
         "php-cs-fixer": "@php php-cs-fixer fix --allow-risky=yes",
         "php-cs-fixer-dry-run": "@php php-cs-fixer fix --dry-run --allow-risky=yes",
         "phpunit": "@php phpunit",

lib/MC/Google/Visualization.php

@@ -55,40 +55,34 @@ class Visualization
     /**
      * The default entity that will be used if the "from" part of a query is left out. Setting this to null
      * will make a "from" clause required.
-     *
-     * @var null|string
      */
-    protected $defaultEntity;
+    protected ?string $defaultEntity = null;
 
     /**
      * The entity schema that defines which tables are exposed to visualization clients, along with their fields, joins, and callbacks.
      *
      * @var array<string, Entity>
      */
-    protected $entities = [];
+    protected array $entities = [];
 
     /**
      * If pivots are being used or MC_Google_Visualization is handling the whole request, this must be a PDO
      * connection to your database.
-     *
-     * @var null|PDO
      */
-    protected $db;
+    protected ?PDO $db;
 
     /**
      * The SQL dialect to use when auto-generating SQL statements from the parsed query tokens
      * defaults to "mysql".  Allowed values are "mysql", "postgres", or "sqlite".  Patches are welcome for the rest.
-     *
-     * @var string
      */
-    protected $sqlDialect = 'mysql';
+    protected string $sqlDialect = 'mysql';
 
     /**
      * If a format string is not provided by the query, these will be used to format values by default.
      *
      * @var array<string, string>
      */
-    protected $defaultFormat = [
+    protected array $defaultFormat = [
         'date' => 'm/d/Y',
         'datetime' => 'm/d/Y h:ia',
         'time' => 'h:ia',
@@ -98,10 +92,8 @@ class Visualization
 
     /**
      * The current supported version of the Data Source protocol.
-     *
-     * @var float
      */
-    protected $version = 0.5;
+    protected float $version = 0.5;
 
     /**
      * Create a new instance.  This must be done before the library can be used.  Pass in a PDO connection and
@@ -769,7 +761,7 @@ public function parseQuery(string $str): array
                     $groupby = $token->getValues();
                     array_shift($groupby);
                     array_shift($groupby);
-                    $query['groupby'] = array_filter($groupby);
+                    $query['groupby'] = array_filter($groupby, static fn (?string $s): bool => null !== $s && '' !== $s);
 
                     break;
 
@@ -779,7 +771,7 @@ public function parseQuery(string $str): array
                     }
                     $pivot = $token->getValues();
                     array_shift($pivot);
-                    $query['pivot'] = array_filter($pivot);
+                    $query['pivot'] = array_filter($pivot, static fn (?string $s): bool => null !== $s && '' !== $s);
 
                     break;
 
@@ -1007,7 +999,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) {
@@ -1353,6 +1344,8 @@ protected function addDependantCallbackFields(array $fieldSpec, array $entity, a
      *
      * @param Token      $token  the token or token group to recursively parse
      * @param null|array $fields the collector array reference to receive the flattened select field values
+     *
+     * @param-out array $fields
      */
     protected function parseFieldTokens(Token $token, ?array &$fields = null): void
     {
@@ -1385,6 +1378,8 @@ protected function parseFieldTokens(Token $token, ?array &$fields = null): void
      *
      * @param Token                                          $token the token or token group to parse
      * @param null|array<array{type: string, value: string}> $where the collector array of tokens that make up the where clause
+     *
+     * @param-out array $where
      */
     protected function parseWhereTokens(Token $token, ?array &$where = null): void
     {

lib/MC/Google/Visualization_Error.php

@@ -8,9 +8,7 @@
 
 class Visualization_Error extends Exception
 {
-    /** @var string */
-    public $type = 'server_error';
+    public string $type = 'server_error';
 
-    /** @var string */
-    public $summary = 'Server Error';
+    public string $summary = 'Server Error';
 }

lib/MC/Google/Visualization_QueryError.php

@@ -6,9 +6,7 @@
 
 class Visualization_QueryError extends Visualization_Error
 {
-    /** @var string */
-    public $type = 'invalid_query';
+    public string $type = 'invalid_query';
 
-    /** @var string */
-    public $summary = 'Invalid Query';
+    public string $summary = 'Invalid Query';
 }

lib/MC/Parser.php

@@ -25,10 +25,8 @@ class Parser
 {
     /**
      * By default, the parser ignores these characters when they occur between tokens.
-     *
-     * @var string
      */
-    public static $whitespace = " \t\n\r";
+    public static string $whitespace = " \t\n\r";
 
     /**
      * Return a Set with the function arguments as the subexpressions.

lib/MC/Parser/Def.php

@@ -12,11 +12,9 @@
  */
 abstract class Def
 {
-    /** @var null|string */
-    public $name;
+    public ?string $name = null;
 
-    /** @var bool */
-    public $suppress = false;
+    public bool $suppress = false;
 
     /**
      * Parse a string, and return the result or throw a parser exception.

lib/MC/Parser/Def/IsEmpty.php

@@ -11,8 +11,7 @@
  */
 class IsEmpty extends Def
 {
-    /** @var bool */
-    public $suppress = true;
+    public bool $suppress = true;
 
     public function _parse(string $str, int $loc): array
     {

lib/MC/Parser/Def/Literal.php

@@ -10,25 +10,22 @@
 
 class Literal extends Def
 {
-    /** @var string */
-    public $search;
+    public string $search;
 
-    /** @var bool */
-    public $caseless = false;
+    public bool $caseless = false;
 
-    /** @var bool */
-    public $fullword = true;
+    public bool $fullword = true;
 
     /**
      * Match against an exact set of characters in the string.
      *
-     * @param string $str      the search string
+     * @param string $search   the search string
      * @param bool   $caseless set to true to ignore case
      * @param bool   $fullword set to false to allow a literal followed by a non-whitespace character
      */
-    public function __construct(string $str, bool $caseless = false, bool $fullword = true)
+    public function __construct(string $search, bool $caseless = false, bool $fullword = true)
     {
-        $this->search = $str;
+        $this->search = $search;
         $this->caseless = $caseless;
         $this->fullword = $fullword;
     }