From 009d4c42644887ae937950611402c816241155f5 Mon Sep 17 00:00:00 2001
From: Damien Debin <damien.debin@gmail.com>
Date: Thu, 20 Aug 2020 15:42:43 +0200
Subject: [PATCH] More CS fixes.

---
 .github/workflows/main.yml                 |   4 +-
 .idea/mc-google-visualization.iml          |   1 +
 .idea/php.xml                              |   1 +
 .php_cs                                    |  34 ++++-
 composer.json                              |   6 +-
 examples/callback_fields.php               |   9 +-
 examples/complete.php                      |  10 +-
 examples/index.php                         |   4 +-
 examples/joins.php                         |  10 +-
 examples/simple.php                        |   6 +-
 lib/MC/Google/Visualization.php            | 152 +++++++++++----------
 lib/MC/Google/Visualization_Error.php      |   2 +
 lib/MC/Google/Visualization_QueryError.php |   2 +
 lib/MC/Parser.php                          |  66 ++-------
 lib/MC/Parser/Def.php                      |  27 +---
 lib/MC/Parser/Def/IsEmpty.php              |  11 +-
 lib/MC/Parser/Def/Literal.php              |  14 +-
 lib/MC/Parser/Def/NOrMore.php              |  12 +-
 lib/MC/Parser/Def/OneOf.php                |   7 +-
 lib/MC/Parser/Def/Recursive.php            |  12 +-
 lib/MC/Parser/Def/Regex.php                |  33 ++---
 lib/MC/Parser/Def/Set.php                  |   9 +-
 lib/MC/Parser/Def/Word.php                 |   8 +-
 lib/MC/Parser/DefError.php                 |   2 +
 lib/MC/Parser/Error.php                    |   2 +
 lib/MC/Parser/ParseError.php               |   2 +
 lib/MC/Parser/Token.php                    |   5 +-
 lib/MC/Parser/Token/Group.php              |  12 +-
 phpstan.neon                               |   3 +
 tests/ExampleTest.php                      |   8 +-
 tests/ParserTest.php                       |  53 +++----
 tests/VisualizationTest.php                |  42 +++---
 32 files changed, 265 insertions(+), 304 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d00c597..257a784 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-16.04
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4']
     name: PHP ${{ matrix.php }} tests
     steps:
       -   uses: actions/checkout@v2
diff --git a/.idea/mc-google-visualization.iml b/.idea/mc-google-visualization.iml
index d2e6df0..2c56724 100644
--- a/.idea/mc-google-visualization.iml
+++ b/.idea/mc-google-visualization.iml
@@ -28,6 +28,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpstan/phpdoc-parser" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpstan/phpstan" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpstan/phpstan-phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpstan/phpstan-strict-rules" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
diff --git a/.idea/php.xml b/.idea/php.xml
index d89811f..c622d21 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -57,6 +57,7 @@
       <path value="$PROJECT_DIR$/vendor/symfony/console" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
       <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan-strict-rules" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7" />
diff --git a/.php_cs b/.php_cs
index 0edcd51..0e24561 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,19 +1,41 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->name('.php_cs')
     ->exclude('vendor')
     ->in(__DIR__)
 ;
 
-return PhpCsFixer\Config::create()
+return Config::create()
     ->setRules([
-        '@PSR1' => true,
-        '@PSR2' => true,
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'php_unit_test_class_requires_covers' => false,
+        '@DoctrineAnnotation' => true,
+        '@PHP70Migration:risky' => true,
+        '@PHPUnit75Migration:risky' => true,
+        'backtick_to_shell_exec' => true,
+        'blank_line_before_statement' => [
+            'statements' => ['declare', 'return', 'case'],
+        ],
+        'comment_to_phpdoc' => false,
+        'declare_equal_normalize' => ['space' => 'single'],
+        'doctrine_annotation_array_assignment' => ['operator' => '='],
+        'doctrine_annotation_spaces' => [
+            'after_array_assignments_equals' => false,
+            'before_array_assignments_equals' => false
+        ],
+        'final_static_access' => true,
+        'global_namespace_import' => true,
+        'linebreak_after_opening_tag' => true,
+        'mb_str_functions' => true,
         'native_function_invocation' => false,
+        'no_unset_on_property' => false,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'phpdoc_to_comment' => false,
+        'self_static_accessor' => true,
     ])
     ->setFinder($finder)
     ;
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 92355a7..caefc1d 100644
--- a/composer.json
+++ b/composer.json
@@ -24,12 +24,14 @@
     "require": {
         "php": "^7.0",
         "ext-json": "*",
-        "ext-pdo": "*"
+        "ext-pdo": "*",
+        "symfony/polyfill-php74": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0|^7.0",
         "phpstan/phpstan": "^0.9|^0.10|^0.11",
-        "phpstan/phpstan-phpunit": "^0.9|^0.10|^0.11"
+        "phpstan/phpstan-phpunit": "^0.9|^0.10|^0.11",
+        "phpstan/phpstan-strict-rules": "^0.9|^0.10|^0.11"
     },
     "autoload": {
         "psr-4": {
diff --git a/examples/callback_fields.php b/examples/callback_fields.php
index 307ba8f..1c2d287 100644
--- a/examples/callback_fields.php
+++ b/examples/callback_fields.php
@@ -2,13 +2,16 @@
 
 /** @noinspection PhpUnhandledExceptionInspection */
 
+declare(strict_types = 1);
+
 use MC\Google\Visualization;
 
 require_once __DIR__.'/../vendor/autoload.php';
 
 /**
  * @param mixed $row
- * @return string|null
+ *
+ * @return null|string
  */
 function most_common($row)
 {
@@ -60,13 +63,13 @@ function most_common($row)
     <script type="text/javascript">
         google.load('visualization', '1', {'packages': ['table']});
         google.setOnLoadCallback(function() {
-            var query = new google.visualization.Query('callback_fields.php');
+            const query = new google.visualization.Query('callback_fields.php');
             query.setQuery('select country, most_common from birth_control order by country label country "Country", most_common "Most Common Method"');
             query.send(function(res) {
                 if(res.isError()) {
                     alert(res.getDetailedMessage());
                 } else {
-                    var table = new google.visualization.Table(document.getElementById('table-div'));
+                    const table = new google.visualization.Table(document.getElementById('table-div'));
                     table.draw(res.getDataTable());
                 }
             });
diff --git a/examples/complete.php b/examples/complete.php
index a1f2a71..7542b1f 100644
--- a/examples/complete.php
+++ b/examples/complete.php
@@ -2,6 +2,8 @@
 
 /** @noinspection PhpUnhandledExceptionInspection */
 
+declare(strict_types = 1);
+
 use MC\Google\Visualization;
 
 require_once __DIR__.'/../vendor/autoload.php';
@@ -45,13 +47,13 @@
         motion_chart = null;
 
         function loadChart() {
-            var metric1 = document.getElementById('metric-1').value;
-            var metric2 = document.getElementById('metric-2').value;
+            const metric1 = document.getElementById('metric-1').value;
+            const metric2 = document.getElementById('metric-2').value;
             if (metric1 === metric2) return;
 
-            var str = 'select country, year, ' + metric1 + ', ' + metric2 + ' where ' + metric1 + '!=0 AND ' + metric2 + '!=0 group by country, year label country "Country", year "Year", birth_control "Birth Control Penetration", gdp_us "Per-capita GDP (US Dollars)", savings_rate "Savings Rate", investment_rate "Investment Rate", infant_mort "Infant Mortality", life_expect "Life Expectancy" format year "%d"';
+            const str = 'select country, year, ' + metric1 + ', ' + metric2 + ' where ' + metric1 + '!=0 AND ' + metric2 + '!=0 group by country, year label country "Country", year "Year", birth_control "Birth Control Penetration", gdp_us "Per-capita GDP (US Dollars)", savings_rate "Savings Rate", investment_rate "Investment Rate", infant_mort "Infant Mortality", life_expect "Life Expectancy" format year "%d"';
 
-            var query = new google.visualization.Query('complete.php');
+            const query = new google.visualization.Query('complete.php');
             query.setQuery(str);
             query.send(function(res) {
                 if (res.isError()) {
diff --git a/examples/index.php b/examples/index.php
index 406126b..0510252 100644
--- a/examples/index.php
+++ b/examples/index.php
@@ -7,8 +7,8 @@
 <ul id="example-list">
     <?php
     foreach (new DirectoryIterator(__DIR__) as $file) {
-        if ($file->isFile() && '.php' === substr($file->getFilename(), -4) && !in_array($file->getFilename(), ['index.php', 'init.php'], true)) {
-            echo '<li><a href="'.$file->getFilename().'">'.ucwords(str_replace('_', ' ', substr($file->getFilename(), 0, -4))).'</a></li>';
+        if ($file->isFile() && '.php' === mb_substr($file->getFilename(), -4) && !in_array($file->getFilename(), ['index.php', 'init.php'], true)) {
+            echo '<li><a href="'.$file->getFilename().'">'.ucwords(str_replace('_', ' ', mb_substr($file->getFilename(), 0, -4))).'</a></li>';
         }
     }
     ?>
diff --git a/examples/joins.php b/examples/joins.php
index 8acaf03..a06c5e9 100644
--- a/examples/joins.php
+++ b/examples/joins.php
@@ -2,6 +2,8 @@
 
 /** @noinspection PhpUnhandledExceptionInspection */
 
+declare(strict_types = 1);
+
 use MC\Google\Visualization;
 
 require_once __DIR__.'/../vendor/autoload.php';
@@ -39,23 +41,23 @@
     <script type="text/javascript">
         google.charts.load('current', {'packages': ['columnchart', 'linechart']});
         window.addEventListener('DOMContentLoaded', function() { google.charts.setOnLoadCallback(function() {
-            var query = new google.visualization.Query('joins.php');
+            const query = new google.visualization.Query('joins.php');
             query.setQuery('select avg(life_male), avg(life_female), avg(life_both) from countries label life_male "Life Expectancy (Male)", life_female "Life Expectancy (Female)", life_both "Life Expectancy (Combined)" format life_male "%.2f years", life_female "%.2f years", life_both "%.2f years"');
             query.send(function(res) {
                 if(res.isError()) {
                     alert(res.getDetailedMessage());
                 } else {
-                    var table = new google.visualization.ColumnChart(document.getElementById('chart-div'));
+                    const table = new google.visualization.ColumnChart(document.getElementById('chart-div'));
                     table.draw(res.getDataTable(), {'height': 500});
                 }
 
-                var query2 = new google.visualization.Query('joins.php');
+                const query2 = new google.visualization.Query('joins.php');
                 query2.setQuery('select gdp_year, sum(gdp_us) from countries group by gdp_year label gdp_us "Per-capita GDP (US Dollars)"');
                 query2.send(function(res) {
                     if(res.isError()) {
                         alert(res.getDetailedMessage());
                     } else {
-                        var table = new google.visualization.LineChart(document.getElementById('chart2-div'));
+                        const table = new google.visualization.LineChart(document.getElementById('chart2-div'));
                         table.draw(res.getDataTable(), {'height': 400});
                     }
                 });
diff --git a/examples/simple.php b/examples/simple.php
index 7186877..f34fc93 100644
--- a/examples/simple.php
+++ b/examples/simple.php
@@ -2,6 +2,8 @@
 
 /** @noinspection PhpUnhandledExceptionInspection */
 
+declare(strict_types = 1);
+
 use MC\Google\Visualization;
 
 require_once __DIR__.'/../vendor/autoload.php';
@@ -29,13 +31,13 @@
     <script type="text/javascript">
         google.charts.load('current', {'packages': ['table']});
         window.addEventListener('DOMContentLoaded', function() { google.charts.setOnLoadCallback(function() {
-            var query = new google.visualization.Query('simple.php');
+            const query = new google.visualization.Query('simple.php');
             query.setQuery('select id, name from countries order by name label id "ID", name "Name"');
             query.send(function(res) {
                 if(res.isError()) {
                     alert(res.getDetailedMessage());
                 } else {
-                    var table = new google.visualization.Table(document.getElementById('table-div'));
+                    const table = new google.visualization.Table(document.getElementById('table-div'));
                     table.draw(res.getDataTable(), {'page': 'enable', 'pageSize': 20});
                 }
             });
diff --git a/lib/MC/Google/Visualization.php b/lib/MC/Google/Visualization.php
index 7947555..ca66021 100644
--- a/lib/MC/Google/Visualization.php
+++ b/lib/MC/Google/Visualization.php
@@ -2,6 +2,8 @@
 
 /** @noinspection SlowArrayOperationsInLoopInspection */
 
+declare(strict_types = 1);
+
 namespace MC\Google;
 
 use Exception;
@@ -26,7 +28,7 @@ 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 string|null
+     * @var null|string
      */
     protected $defaultEntity;
 
@@ -41,7 +43,7 @@ class Visualization
      * If pivots are being used or MC_Google_Visualization is handling the whole request, this must be a PDO
      * connection to your database.
      *
-     * @var PDO|null
+     * @var null|PDO
      */
     protected $db;
 
@@ -77,8 +79,8 @@ class Visualization
      * Create a new instance.  This must be done before the library can be used.  Pass in a PDO connection and
      * dialect if MC_Google_Visualization will handle the entire request cycle.
      *
-     * @param PDO|null    $db      the database connection to use
-     * @param string $dialect the SQL dialect to use - one of "mysql", "postgres", or "sqlite"
+     * @param null|PDO $db      the database connection to use
+     * @param string   $dialect the SQL dialect to use - one of "mysql", "postgres", or "sqlite"
      *
      * @throws Visualization_Error
      */
@@ -135,7 +137,7 @@ public function setDefaultFormat(string $type, string $format)
         if (!isset($this->defaultFormat[$type])) {
             throw new Visualization_Error('Unknown or unformattable type: "'.$type.'"');
         }
-        if ('boolean' === $type && false === strpos($format, ':')) {
+        if ('boolean' === $type && false === mb_strpos($format, ':')) {
             throw new Visualization_Error('Invalid boolean format string: "'.$format.'"');
         }
         $this->defaultFormat[$type] = $format;
@@ -145,8 +147,8 @@ public function setDefaultFormat(string $type, string $format)
      * Handle the entire request, pulling the query from the $_GET variables and printing the results directly
      * if not specified otherwise.
      *
-     * @param bool  $echo         print response and set header
-     * @param array|null $queryParams query parameters
+     * @param bool       $echo        print response and set header
+     * @param null|array $queryParams query parameters
      *
      * @throws Visualization_Error
      *
@@ -212,7 +214,7 @@ public function handleQuery(string $query, array $params): string
             $meta['req_params'] = $params;
 
             $stmt = $this->db->query($sql);
-            assert($stmt !== false);
+            assert(false !== $stmt);
             //If we got here, there's no errors
             $response .= $this->getSuccessInit($meta);
             $first = true;
@@ -503,11 +505,11 @@ public function getRowValues(array $row, array $meta): string
                 case 'text':
                     $val = json_encode((string) $val);
                     $formatted = null;
-
                     break;
+
                 case 'number':
                     $val = (float) $val;
-                    if (preg_match('#^num:(\d+)(.*)$#i', $format, $matches)) {
+                    if (1 === preg_match('#^num:(\d+)(.*)$#i', $format, $matches)) {
                         $digits = (int) $matches[1];
                         $extras = $matches[2];
                         if (is_array($extras) && (2 === count($extras))) {
@@ -523,34 +525,34 @@ public function getRowValues(array $row, array $meta): string
                         $formatted = sprintf($format, $val);
                     }
                     $val = json_encode($val);
-
                     break;
+
                 case 'boolean':
                     $val = (bool) $val;
                     list($formatFalse, $formatTrue) = explode(':', $format, 2);
                     $formatted = $val ? $formatTrue : $formatFalse;
                     $val = json_encode($val);
-
                     break;
+
                 case 'date':
-                    if (!is_numeric($val) || (is_string($val) && (6 !== strlen($val)))) {
+                    if (!is_numeric($val) || (is_string($val) && (6 !== mb_strlen($val)))) {
                         $time = strtotime($val);
                         list($year, $month, $day) = explode('-', date('Y-m-d', $time));
                         $formatted = date($format, $time);
                     } else {
                         assert(is_string($val));
-                        $year = substr($val, 0, 4);
-                        $week = substr($val, -2);
+                        $year = mb_substr($val, 0, 4);
+                        $week = mb_substr($val, -2);
                         $time = strtotime($year.'0104 +'.$week.' weeks');
-                        assert($time !== false);
+                        assert(false !== $time);
                         $monday = strtotime('-'.((int) date('w', $time) - 1).' days', $time);
-                        assert($monday !== false);
+                        assert(false !== $monday);
                         list($year, $month, $day) = explode('-', date('Y-m-d', $monday));
                         $formatted = date($format, $monday);
                     }
                     $val = 'new Date('.(int) $year.','.((int) $month - 1).','.(int) $day.')';
-
                     break;
+
                 case 'datetime':
                 case 'timestamp':
                     $time = strtotime($val);
@@ -558,20 +560,19 @@ public function getRowValues(array $row, array $meta): string
                     // MALC - Force us to consider the date as UTC...
                     $val = 'new Date(Date.UTC('.(int) $year.','.((int) $month - 1).','.(int) $day.','.(int) $hour.','.(int) $minute.','.(int) $second.'))';
                     $formatted = date($format, $time);
-
                     break;
+
                 case 'time':
                     $time = strtotime($val);
                     list($hour, $minute, $second) = explode('-', date('H-i-s', $time));
                     $val = '['.(int) $hour.','.(int) $minute.','.(int) $second.',0]';
                     $formatted = date($format, $time);
-
                     break;
+
                 case 'binary':
                     $formatted = '0x'.current(unpack('H*', $val));
                     $val = '0x'.current(unpack('H*', $val));
                     $val = json_encode($val);
-
                     break;
                 default:
                     throw new Visualization_Error('Unknown field type "'.$type.'"');
@@ -710,11 +711,13 @@ public function parseQuery(string $str): array
                     $query['select'] = $fields;
 
                     break;
+
                 case 'from':
                     $vals = $token->getValues();
                     $query['from'] = $vals[1];
 
                     break;
+
                 case 'where':
                     $whereTokens = $token->getChildren();
                     $whereTokens = $whereTokens[1];
@@ -722,6 +725,7 @@ public function parseQuery(string $str): array
                     $query['where'] = $where;
 
                     break;
+
                 case 'groupby':
                     $groupby = $token->getValues();
                     array_shift($groupby);
@@ -729,6 +733,7 @@ public function parseQuery(string $str): array
                     $query['groupby'] = $groupby;
 
                     break;
+
                 case 'pivot':
                     if (null === $this->db) {
                         throw new Visualization_QueryError('Pivots require a PDO database connection');
@@ -738,6 +743,7 @@ public function parseQuery(string $str): array
                     $query['pivot'] = $pivot;
 
                     break;
+
                 case 'orderby':
                     $orderby = $token->getValues();
                     array_shift($orderby);
@@ -748,7 +754,7 @@ public function parseQuery(string $str): array
                         $field = $orderby[$i];
                         $dir = 'asc';
                         if (isset($orderby[$i + 1])) {
-                            $dir = strtolower($orderby[$i + 1]);
+                            $dir = mb_strtolower($orderby[$i + 1]);
                             if ('asc' === $dir || 'desc' === $dir) {
                                 ++$i;
                             } else {
@@ -760,18 +766,21 @@ public function parseQuery(string $str): array
                     $query['orderby'] = $fieldDir;
 
                     break;
+
                 case 'limit':
                     $limit = $token->getValues();
                     $limit = $limit[1];
                     $query['limit'] = $limit;
 
                     break;
+
                 case 'offset':
                     $offset = $token->getValues();
                     $offset = $offset[1];
                     $query['offset'] = $offset;
 
                     break;
+
                 case 'label':
                     $labels = $token->getValues();
                     array_shift($labels);
@@ -786,6 +795,7 @@ public function parseQuery(string $str): array
                     $query['labels'] = $queryLabels;
 
                     break;
+
                 case 'format':
                     $formats = $token->getValues();
                     array_shift($formats);
@@ -799,6 +809,7 @@ public function parseQuery(string $str): array
                     $query['formats'] = $queryFormats;
 
                     break;
+
                 case 'options':
                     $qoptions = $token->getValues();
                     array_shift($qoptions);
@@ -820,11 +831,10 @@ public function parseQuery(string $str): array
     /**
      * Return the response appropriate to tell the visualization client that an error has occurred.
      *
-     * @param int    $reqid       the request ID that caused the error
-     * @param string $detailMsg  the detailed message to send along with the error
-     * @param string $handler
-     * @param string $code        the code for the error (like "error", "server_error", "invalid_query", "access_denied", etc.)
-     * @param string|null $summaryMsg a short description of the error, appropriate to show to end users
+     * @param int         $reqid      the request ID that caused the error
+     * @param string      $detailMsg  the detailed message to send along with the error
+     * @param string      $code       the code for the error (like "error", "server_error", "invalid_query", "access_denied", etc.)
+     * @param null|string $summaryMsg a short description of the error, appropriate to show to end users
      *
      * @return string the string to output that will cause the visualization client to detect an error
      */
@@ -933,7 +943,7 @@ protected function generateSQL(array &$meta): string
             }
 
             $pivotSql = 'SELECT '.implode(', ', $pivotFields).' FROM '.$meta['table'];
-            if (!empty($pivotJoins)) {
+            if (count($pivotJoins) > 0) {
                 $pivotSql .= ' '.implode(' ', $pivotJoins);
             }
             $pivotSql .= ' GROUP BY '.implode(', ', $pivotGroup);
@@ -949,9 +959,9 @@ protected function generateSQL(array &$meta): string
             }
             $meta['query_fields'] = $newFields;
 
-            assert($this->db !== null);
+            assert(null !== $this->db);
             $stmt = $this->db->query($pivotSql);
-            assert($stmt !== false);
+            assert(false !== $stmt);
             $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
             assert(is_array($rows));
             foreach ($rows as $row) {
@@ -988,25 +998,24 @@ protected function generateSQL(array &$meta): string
                 switch ($wherePart['type']) {
                     case 'where_field':
                         $wherePart['value'] = $this->getFieldSQL($wherePart['value'], $meta['field_spec'][$wherePart['value']]);
-
                         break;
+
                     case 'datetime':
                     case 'timestamp':
                         $wherePart['value'] = $this->convertDateTime(trim($wherePart['value'][1], '\'"'));
-
                         break;
+
                     case 'timeofday':
                         $wherePart['value'] = $this->convertTime(trim($wherePart['value'][1], '\'"'));
-
                         break;
+
                     case 'date':
                         $wherePart['value'] = $this->convertDate(trim($wherePart['value'][1], '\'"'));
-
                         break;
+
                     case 'null':
                     case 'notnull':
-                        $wherePart['value'] = strtoupper(implode(' ', $wherePart['value']));
-
+                        $wherePart['value'] = mb_strtoupper(implode(' ', $wherePart['value']));
                         break;
                 }
 
@@ -1018,18 +1027,20 @@ protected function generateSQL(array &$meta): string
         }
 
         $sql = 'SELECT '.implode(', ', $querySql).' FROM '.$meta['table'];
-        if (!empty($joinSql)) {
+        if (count($joinSql) > 0) {
             $sql .= ' '.implode(' ', $joinSql);
         }
 
-        if ($whereStr || isset($meta['global_where'])) {
-            if (!$whereStr) {
-                $whereStr = '1=1';
-            }
-            $sql .= ' WHERE ('.$whereStr.')';
-            if (isset($meta['global_where'])) {
-                $sql .= ' AND '.$meta['global_where'];
-            }
+        $wheres = [];
+        if (('' !== $whereStr) && (null !== $whereStr)) {
+            $wheres[] = "({$whereStr})";
+        }
+        if (isset($meta['global_where'])) {
+            $wheres[] = $meta['global_where'];
+        }
+
+        if (count($wheres) > 0) {
+            $sql .= ' WHERE '.implode(' AND ', $wheres);
         }
 
         if (isset($meta['groupby'])) {
@@ -1053,7 +1064,7 @@ protected function generateSQL(array &$meta): string
                     $sql .= ',';
                 }
 
-                $sql .= ' '.$this->getFieldSQL($field, $spec).' '.strtoupper($dir);
+                $sql .= ' '.$this->getFieldSQL($field, $spec).' '.mb_strtoupper($dir);
                 $first = false;
             }
         }
@@ -1088,8 +1099,6 @@ protected function getSuccessInit(array $meta): string
      * @param array $meta the metadata for the query - generally generated by MC_Google_Visualization::generateMetadata
      *
      * @throws Visualization_Error
-     *
-     * @return string
      */
     protected function getTableInit(array $meta): string
     {
@@ -1114,28 +1123,27 @@ protected function getTableInit(array $meta): string
                 case 'text':
                 case 'binary':
                     $rtype = 'string';
-
                     break;
+
                 case 'number':
                     $rtype = 'number';
-
                     break;
+
                 case 'boolean':
                     $rtype = 'boolean';
-
                     break;
+
                 case 'date':
                     $rtype = 'date';
-
                     break;
+
                 case 'datetime':
                 case 'timestamp':
                     $rtype = 'datetime';
-
                     break;
+
                 case 'time':
                     $rtype = 'time';
-
                     break;
                 default:
                     throw new Visualization_Error('Unknown field type "'.$type.'"');
@@ -1215,7 +1223,7 @@ protected function convertLimit($limit, $offset): string
      */
     protected function getFieldQuote(): string
     {
-        if ($this->sqlDialect === 'postgres') {
+        if ('postgres' === $this->sqlDialect) {
             return '"';
         }
 
@@ -1225,11 +1233,11 @@ protected function getFieldQuote(): string
     /**
      * Helper function to generate the SQL for a given entity field.
      *
-     * @param string      $name         the name of the field to generate SQL for
-     * @param array       $spec         the entity spec array for the field
-     * @param bool        $alias        whether to also generate an "AS" alias for the field - defaults to false
-     * @param null|string $func         the function to call against the field (count, avg, sum, max, min)
-     * @param null|array  $pivot        if there was a pivot for this query, this should be an array of values that uniquely identify this field
+     * @param string      $name        the name of the field to generate SQL for
+     * @param array       $spec        the entity spec array for the field
+     * @param bool        $alias       whether to also generate an "AS" alias for the field - defaults to false
+     * @param null|string $func        the function to call against the field (count, avg, sum, max, min)
+     * @param null|array  $pivot       if there was a pivot for this query, this should be an array of values that uniquely identify this field
      * @param null|array  $pivotFields if there was a pivot for this query, this should be an array of the specs for the pivoted fields
      *
      * @return string the SQL string for this field, with an op
@@ -1240,19 +1248,19 @@ protected function getFieldSQL(string $name, array $spec, bool $alias = false, s
         $q = $this->getFieldQuote();
         if (null !== $func) {
             if (null === $pivot) {
-                $sql = strtoupper($func).'('.$sql.')';
+                $sql = mb_strtoupper($func).'('.$sql.')';
                 if ($alias) {
                     $sql .= ' AS '.$q.$func.'-'.$name.$q;
                 }
             } else {
-                assert($pivotFields !== null);
+                assert(null !== $this->db);
+                assert(null !== $pivotFields);
                 $casewhen = [];
                 foreach ($pivot as $key => $val) {
                     $pivotField = $pivotFields[$key];
-                    assert($this->db !== null);
                     $casewhen[] = $pivotField['field'].'='.$this->db->quote($val);
                 }
-                $sql = strtoupper($func).'(CASE WHEN '.implode(' AND ', $casewhen).' THEN '.$sql.' ELSE NULL END)';
+                $sql = mb_strtoupper($func).'(CASE WHEN '.implode(' AND ', $casewhen).' THEN '.$sql.' ELSE NULL END)';
                 if ($alias) {
                     $sql .= ' AS '.$q.implode(',', $pivot).' '.$func.'-'.$name.$q;
                 }
@@ -1312,7 +1320,7 @@ protected function parseFieldTokens(Token $token, array &$fields = null)
         if ($token->hasChildren()) {
             if ('function' === $token->name) {
                 $field = $token->getValues();
-                $field[0] = strtolower($field[0]);
+                $field[0] = mb_strtolower($field[0]);
                 $fields[] = $field;
             } else {
                 foreach ($token->getChildren() as $field) {
@@ -1335,16 +1343,12 @@ protected function parseWhereTokens(Token $token, array &$where = null)
         if (!is_array($where)) {
             $where = [];
         }
-        if ($token->hasChildren()) {
-            if ($token->name) {
-                $where[] = ['type' => $token->name, 'value' => $token->getValues()];
-            } else {
-                foreach ($token->getChildren() as $child) {
-                    $this->parseWhereTokens($child, $where);
-                }
+        if (null !== $token->name) {
+            $where[] = ['type' => $token->name, 'value' => $token->hasChildren() ? $token->getValues() : $token->value];
+        } else {
+            foreach ($token->getChildren() as $child) {
+                $this->parseWhereTokens($child, $where);
             }
-        } elseif ($token->name) {
-            $where[] = ['type' => $token->name, 'value' => $token->value];
         }
     }
 }
diff --git a/lib/MC/Google/Visualization_Error.php b/lib/MC/Google/Visualization_Error.php
index 82dccaa..cad3157 100644
--- a/lib/MC/Google/Visualization_Error.php
+++ b/lib/MC/Google/Visualization_Error.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Google;
 
 use Exception;
diff --git a/lib/MC/Google/Visualization_QueryError.php b/lib/MC/Google/Visualization_QueryError.php
index e62068b..14b216e 100644
--- a/lib/MC/Google/Visualization_QueryError.php
+++ b/lib/MC/Google/Visualization_QueryError.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Google;
 
 class Visualization_QueryError extends Visualization_Error
diff --git a/lib/MC/Parser.php b/lib/MC/Parser.php
index 43e4f97..0d54b66 100644
--- a/lib/MC/Parser.php
+++ b/lib/MC/Parser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC;
 
 use MC\Parser\Def;
@@ -29,8 +31,6 @@ class Parser
 
     /**
      * Return a Set with the function arguments as the subexpressions.
-     *
-     * @return Set
      */
     public function set(): Set
     {
@@ -39,8 +39,6 @@ public function set(): Set
 
     /**
      * Return a OneOf with the function arguments as the possible expressions.
-     *
-     * @return OneOf
      */
     public function oneOf(): OneOf
     {
@@ -49,13 +47,8 @@ public function oneOf(): OneOf
 
     /**
      * Return a Word that matches a set of possible characters not separated by whitespace.
-     *
-     * @param string      $firstChars
-     * @param null|string $restChars
-     *
-     * @return Word
      */
-    public function word(string $firstChars, $restChars = null): Word
+    public function word(string $firstChars, string $restChars = null): Word
     {
         return new Word($firstChars, $restChars);
     }
@@ -63,28 +56,24 @@ public function word(string $firstChars, $restChars = null): Word
     /**
      * Return a Regex that matches a typical optionally-escaped quoted string.
      *
-     * @param string $quoteChars
-     * @param string $escChar
-     *
      * @throws DefError
-     *
-     * @return Regex
      */
     public function quotedString(string $quoteChars = '\'"', string $escChar = '\\'): Regex
     {
         $quoteChars = trim($quoteChars);
-        if ($quoteChars === '') {
-            throw new DefError('$quoteChars cannot be an empty string');
-        }
-        if (strlen($escChar) > 1) {
+        if (mb_strlen($escChar) > 1) {
             throw new DefError('Only one $escChar can be defined');
         }
-
-        $quoteCharsArray = str_split($quoteChars);
-        if ($escChar !== '') {
+        if ('' !== $escChar) {
             $escChar = preg_quote($escChar, Regex::DELIMITER);
         }
 
+        if ('' === $quoteChars) {
+            throw new DefError('$quoteChars cannot be an empty string');
+        }
+        $quoteCharsArray = mb_str_split($quoteChars);
+        assert(is_array($quoteCharsArray));
+
         $tpl = '(?:Q(?:[^Q\n\rE]|(?:QQ)|(?:Ex[0-9a-fA-F]+)|(?:E.))*Q)';
         $pats = [];
         foreach ($quoteCharsArray as $quote) {
@@ -99,8 +88,6 @@ public function quotedString(string $quoteChars = '\'"', string $escChar = '\\')
 
     /**
      * wrapper around Regex that matches numerical values (like 7, 3.5, and -42).
-     *
-     * @return Regex
      */
     public function number(): Regex
     {
@@ -118,18 +105,19 @@ public function hexNumber(): Regex
      * @param string $case which case is supported, one of "upper", "lower", "first", or "mixed"
      *
      * @throws DefError
-     *
-     * @return OneOf
      */
     public function boolean(string $case = 'mixed'): OneOf
     {
         switch ($case) {
             case 'lower':
                 return $this->oneOf($this->keyword('true'), $this->keyword('false'));
+
             case 'upper':
                 return $this->oneOf($this->keyword('TRUE'), $this->keyword('FALSE'));
+
             case 'first':
                 return $this->oneOf($this->keyword('True'), $this->keyword('False'));
+
             case 'mixed':
                 return $this->oneOf($this->keyword('true', true), $this->keyword('false', true));
             default:
@@ -143,8 +131,6 @@ public function boolean(string $case = 'mixed'): OneOf
      * @param string $str      the exact string to match
      * @param bool   $caseless flag for triggering case-insensitive searching
      * @param bool   $fullword for triggering literals that can be followed by non-whitespace characters
-     *
-     * @return Literal
      */
     public function literal(string $str, bool $caseless = false, bool $fullword = false): Literal
     {
@@ -157,8 +143,6 @@ public function literal(string $str, bool $caseless = false, bool $fullword = fa
      * @param string $str      the exact string to match
      * @param bool   $caseless flag for triggering case-insensitive searching
      * @param bool   $fullword for triggering literals that can be followed by non-whitespace characters
-     *
-     * @return Literal
      */
     public function keyword(string $str, bool $caseless = false, bool $fullword = true): Literal
     {
@@ -170,8 +154,6 @@ public function keyword(string $str, bool $caseless = false, bool $fullword = tr
      *
      * @param Def    $expr  the expression that is delimited
      * @param string $delim the delimiting literal - defaults to ,
-     *
-     * @return Set
      */
     public function delimitedList(Def $expr, string $delim = ','): Set
     {
@@ -182,8 +164,6 @@ public function delimitedList(Def $expr, string $delim = ','): Set
      * Returns a NOrMore that matches zero or more expressions.
      *
      * @param Def $expr the expression to match zero or more of
-     *
-     * @return NOrMore
      */
     public function zeroOrMore(Def $expr): NOrMore
     {
@@ -194,8 +174,6 @@ public function zeroOrMore(Def $expr): NOrMore
      * Returns a NOrMore that matches one or more expressions.
      *
      * @param Def $expr the expression to match one or more of
-     *
-     * @return NOrMore
      */
     public function oneOrMore(Def $expr): NOrMore
     {
@@ -204,8 +182,6 @@ public function oneOrMore(Def $expr): NOrMore
 
     /**
      * Returns a Recursive placeholder def that can be used to create recursive grammars.
-     *
-     * @return Recursive
      */
     public function recursive(): Recursive
     {
@@ -214,10 +190,6 @@ public function recursive(): Recursive
 
     /**
      * Returns a OneOf that matches zero or one expressions.
-     *
-     * @param Def $expr
-     *
-     * @return OneOf
      */
     public function optional(Def $expr): OneOf
     {
@@ -228,8 +200,6 @@ public function optional(Def $expr): OneOf
 
     /**
      * Helper function returning a regex range of all the characters in the english alphabet.
-     *
-     * @return string
      */
     public function alphas(): string
     {
@@ -238,8 +208,6 @@ public function alphas(): string
 
     /**
      * Helper function returning a string of all alphabet and digit characters.
-     *
-     * @return string
      */
     public function alphanums(): string
     {
@@ -248,8 +216,6 @@ public function alphanums(): string
 
     /**
      * Helper function returning a regex range of all digit characters.
-     *
-     * @return string
      */
     public function nums(): string
     {
@@ -260,11 +226,9 @@ public function nums(): string
      * Simple test for whether a character is a whitespace character.
      *
      * @param mixed $test
-     *
-     * @return bool
      */
     public static function isWhitespace($test): bool
     {
-        return false !== strpos(self::$whitespace, $test);
+        return false !== mb_strpos(self::$whitespace, $test);
     }
 }
diff --git a/lib/MC/Parser/Def.php b/lib/MC/Parser/Def.php
index 047baa4..b35dab4 100644
--- a/lib/MC/Parser/Def.php
+++ b/lib/MC/Parser/Def.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser;
 
 use MC\Parser;
@@ -10,7 +12,7 @@
  */
 abstract class Def
 {
-    /** @var string|null */
+    /** @var null|string */
     public $name;
 
     /** @var bool */
@@ -19,19 +21,15 @@ abstract class Def
     /**
      * Parse a string, and return the result or throw a parser exception.
      *
-     * @param string $str
-     *
      * @throws ParseError
-     *
-     * @return Token
      */
     public function parse(string $str): Token
     {
         $str = ltrim($str);
 
         list($loc, $tok) = $this->parsePart($str, 0);
-        if ($loc !== strlen($str)) {
-            throw new ParseError('An error occurred: "'.substr($str, $loc).'"', $str, $loc);
+        if ($loc !== mb_strlen($str)) {
+            throw new ParseError('An error occurred: "'.mb_substr($str, $loc).'"', $str, $loc);
         }
 
         return $tok;
@@ -40,9 +38,6 @@ public function parse(string $str): Token
     /**
      * Parse a string, cleaning up whitespace when we're done.
      *
-     * @param string $str
-     * @param int    $loc
-     *
      * @throws ParseError
      *
      * @return array A two-item array of the string location where parsing stopped, and the MC_Token instance that matches the grammar conditions
@@ -52,7 +47,7 @@ public function parsePart(string $str, int $loc): array
         list($loc, $tok) = $this->_parse($str, $loc);
 
         $char = @$str[$loc++];
-        while ($char && Parser::isWhitespace($char)) {
+        while (('' !== $char) && Parser::isWhitespace($char)) {
             $char = @$str[$loc++];
         }
         --$loc;
@@ -74,8 +69,6 @@ abstract public function _parse(string $str, int $loc): array;
 
     /**
      * Each definition type should have some way of giving itself a name if the user didn't provide one.
-     *
-     * @return string
      */
     abstract public function _name(): string;
 
@@ -93,10 +86,6 @@ public function getName(): string
 
     /**
      * Give this grammar def a name in the results.
-     *
-     * @param string $name
-     *
-     * @return self - chainable method
      */
     public function name(string $name): self
     {
@@ -107,8 +96,6 @@ public function name(string $name): self
 
     /**
      * Toggle suppressing the token from the results.
-     *
-     * @return self - chainable method
      */
     public function suppress(): self
     {
@@ -136,8 +123,6 @@ public function token($value)
     /**
      * Return a token group (a token that can contain subtokens), copying over this Def's name
      * token groups cannot be suppressed.
-     *
-     * @return Group
      */
     public function tokenGroup(): Group
     {
diff --git a/lib/MC/Parser/Def/IsEmpty.php b/lib/MC/Parser/Def/IsEmpty.php
index b5d36a9..c6d745a 100644
--- a/lib/MC/Parser/Def/IsEmpty.php
+++ b/lib/MC/Parser/Def/IsEmpty.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
@@ -12,20 +14,11 @@ class IsEmpty extends Def
     /** @var bool */
     public $suppress = true;
 
-    /**
-     * @param string $str
-     * @param int    $loc
-     *
-     * @return array
-     */
     public function _parse(string $str, int $loc): array
     {
         return [$loc, $this->token(null)];
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         return 'empty string';
diff --git a/lib/MC/Parser/Def/Literal.php b/lib/MC/Parser/Def/Literal.php
index 2ad1974..48b2455 100644
--- a/lib/MC/Parser/Def/Literal.php
+++ b/lib/MC/Parser/Def/Literal.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser;
@@ -32,33 +34,27 @@ public function __construct(string $str, bool $caseless = false, bool $fullword
     }
 
     /**
-     * @param string $str
-     * @param int $loc
-     *
      * @throws ParseError
      *
      * @return mixed[]
      */
     public function _parse(string $str, int $loc): array
     {
-        $match = !$this->caseless ? strpos($str, $this->search, $loc) : stripos($str, $this->search, $loc);
+        $match = !$this->caseless ? mb_strpos($str, $this->search, $loc) : mb_stripos($str, $this->search, $loc);
 
         if ($match !== $loc) {
             throw new ParseError('Expected: '.$this->search, $str, $loc);
         }
 
-        $loc += strlen($this->search);
+        $loc += mb_strlen($this->search);
 
-        if ($this->fullword && $loc < strlen($str) && !Parser::isWhitespace($str[$loc])) {
+        if ($this->fullword && $loc < mb_strlen($str) && !Parser::isWhitespace($str[$loc])) {
             throw new ParseError('Expected: '.$this->search, $str, $loc);
         }
 
         return [$loc, $this->token($this->search)];
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         return $this->search;
diff --git a/lib/MC/Parser/Def/NOrMore.php b/lib/MC/Parser/Def/NOrMore.php
index f289c78..3936c26 100644
--- a/lib/MC/Parser/Def/NOrMore.php
+++ b/lib/MC/Parser/Def/NOrMore.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
@@ -13,10 +15,6 @@ class NOrMore extends Def
     /** @var int */
     public $min;
 
-    /**
-     * @param Def $expr
-     * @param int $min
-     */
     public function __construct(Def $expr, int $min)
     {
         $this->expr = $expr;
@@ -24,9 +22,6 @@ public function __construct(Def $expr, int $min)
     }
 
     /**
-     * @param string $str
-     * @param int    $loc
-     *
      * @throws ParseError
      *
      * @return mixed[]
@@ -56,9 +51,6 @@ public function _parse(string $str, int $loc): array
         return [$loc, $toks];
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         return $this->min.' or more: '.$this->expr->getName();
diff --git a/lib/MC/Parser/Def/OneOf.php b/lib/MC/Parser/Def/OneOf.php
index 5c9b21e..306c979 100644
--- a/lib/MC/Parser/Def/OneOf.php
+++ b/lib/MC/Parser/Def/OneOf.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
@@ -50,16 +52,13 @@ public function _parse(string $str, int $loc): array
         if (-1 === $maxMatch) {
             throw new ParseError('No alternative options match', $str, $loc);
         }
-        if ($this->name && !$res->name) {
+        if ((null !== $res) && (null === $res->name) && (null !== $this->name)) {
             $res->name = $this->name;
         }
 
         return [$maxMatch, $res];
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         $names = [];
diff --git a/lib/MC/Parser/Def/Recursive.php b/lib/MC/Parser/Def/Recursive.php
index 1877115..74d2b56 100644
--- a/lib/MC/Parser/Def/Recursive.php
+++ b/lib/MC/Parser/Def/Recursive.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
@@ -12,9 +14,6 @@ class Recursive extends Def
     public $replacement;
 
     /**
-     * @param string $str
-     * @param int    $loc
-     *
      * @throws DefError
      * @throws ParseError
      *
@@ -31,10 +30,6 @@ public function _parse(string $str, int $loc): array
 
     /**
      * When actually parsing the grammar, use this rule to validate the recursive rule - this must be called before parsing begins.
-     *
-     * @param Def $expr
-     *
-     * @return Recursive chainable method - returns $this
      */
     public function replace(Def $expr): self
     {
@@ -43,9 +38,6 @@ public function replace(Def $expr): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         if (null === $this->replacement) {
diff --git a/lib/MC/Parser/Def/Regex.php b/lib/MC/Parser/Def/Regex.php
index 92f3bb9..ae27edc 100644
--- a/lib/MC/Parser/Def/Regex.php
+++ b/lib/MC/Parser/Def/Regex.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
@@ -13,28 +15,21 @@ class Regex extends Def
     /** @var string */
     const DELIMITER = '/';
 
-    /*
-     * Subclasses of this can just modify the $regex, $flags, and $errstr properties.
-     */
+    // Subclasses of this can just modify the $regex, $flags, and $errstr properties.
 
-    /** @var string|null  */
+    /** @var null|string */
     public $regex;
 
-    /** @var string|null */
+    /** @var null|string */
     public $flags = 'u';
 
-    /** @var string|null */
+    /** @var null|string */
     public $errstr;
 
     /** @var int */
     public $retgroup = 0;
 
-    /**
-     * @param null|string $regex
-     * @param null|string $flags
-     * @param null|string $errstr
-     */
-    public function __construct($regex = null, $flags = null, $errstr = null)
+    public function __construct(string $regex = null, string $flags = null, string $errstr = null)
     {
         if (null !== $regex) {
             $this->regex = $regex;
@@ -48,29 +43,23 @@ public function __construct($regex = null, $flags = null, $errstr = null)
     }
 
     /**
-     * @param string $str
-     * @param int    $loc
-     *
      * @throws ParseError
      *
      * @return mixed[]
      */
     public function _parse(string $str, int $loc): array
     {
-        preg_match(self::DELIMITER.'^'.$this->regex.self::DELIMITER.$this->flags, substr($str, $loc), $matches, PREG_OFFSET_CAPTURE);
-        $success = @$matches[$this->retgroup];
-        if (empty($success) || 0 !== $success[1]) {
+        preg_match(self::DELIMITER.'^'.$this->regex.self::DELIMITER.$this->flags, mb_substr($str, $loc), $matches, PREG_OFFSET_CAPTURE);
+        $success = $matches[$this->retgroup] ?? null;
+        if ((null === $success) || 0 !== $success[1]) {
             throw new ParseError('Expected: '.($this->errstr ?: 'matching '.$this->regex), $str, $loc);
         }
 
-        $loc += strlen($success[0]);
+        $loc += mb_strlen($success[0]);
 
         return [$loc, $this->token($success[0])];
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         if (null !== $this->errstr) {
diff --git a/lib/MC/Parser/Def/Set.php b/lib/MC/Parser/Def/Set.php
index 149dd12..49c8bd8 100644
--- a/lib/MC/Parser/Def/Set.php
+++ b/lib/MC/Parser/Def/Set.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 use MC\Parser\Def;
@@ -14,8 +16,6 @@ class Set extends Def
 
     /**
      * Set constructor.
-     *
-     * @param array $exprs
      */
     public function __construct(array $exprs = [])
     {
@@ -33,7 +33,7 @@ public function _parse(string $str, int $loc): array
         $res = $this->tokenGroup();
         foreach ($this->exprs as $expr) {
             list($loc, $toks) = $expr->parsePart($str, $loc);
-            if (!empty($toks)) {
+            if ((null !== $toks) && (!is_array($toks) || (count($toks) > 0))) {
                 $res->append($toks);
             }
         }
@@ -41,9 +41,6 @@ public function _parse(string $str, int $loc): array
         return [$loc, $res];
     }
 
-    /**
-     * @return string
-     */
     public function _name(): string
     {
         $names = [];
diff --git a/lib/MC/Parser/Def/Word.php b/lib/MC/Parser/Def/Word.php
index dfc91e0..d8b0086 100644
--- a/lib/MC/Parser/Def/Word.php
+++ b/lib/MC/Parser/Def/Word.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Def;
 
 /**
@@ -8,10 +10,10 @@
 class Word extends Regex
 {
     /**
-     * @param string $firstChars the characters allowed as the first character in the word
-     * @param string|null $restChars  the characters allwed as the rest of the word - defaults to same as $first_chars
+     * @param string      $firstChars the characters allowed as the first character in the word
+     * @param null|string $restChars  the characters allwed as the rest of the word - defaults to same as $first_chars
      */
-    public function __construct(string $firstChars, $restChars = null)
+    public function __construct(string $firstChars, string $restChars = null)
     {
         parent::__construct();
 
diff --git a/lib/MC/Parser/DefError.php b/lib/MC/Parser/DefError.php
index 3234130..7e2d5ed 100644
--- a/lib/MC/Parser/DefError.php
+++ b/lib/MC/Parser/DefError.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser;
 
 class DefError extends Error
diff --git a/lib/MC/Parser/Error.php b/lib/MC/Parser/Error.php
index 8133cd2..84588e9 100644
--- a/lib/MC/Parser/Error.php
+++ b/lib/MC/Parser/Error.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser;
 
 use Exception;
diff --git a/lib/MC/Parser/ParseError.php b/lib/MC/Parser/ParseError.php
index 91b98b2..2a9434e 100644
--- a/lib/MC/Parser/ParseError.php
+++ b/lib/MC/Parser/ParseError.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser;
 
 class ParseError extends Error
diff --git a/lib/MC/Parser/Token.php b/lib/MC/Parser/Token.php
index abf132f..255b7db 100644
--- a/lib/MC/Parser/Token.php
+++ b/lib/MC/Parser/Token.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace MC\Parser;
 
 /**
@@ -41,9 +43,6 @@ public function getNameValues(): array
         return [[$this->name, $this->value]];
     }
 
-    /**
-     * @return bool
-     */
     public function hasChildren(): bool
     {
         return false;
diff --git a/lib/MC/Parser/Token/Group.php b/lib/MC/Parser/Token/Group.php
index 0d66c22..2f93656 100644
--- a/lib/MC/Parser/Token/Group.php
+++ b/lib/MC/Parser/Token/Group.php
@@ -2,6 +2,8 @@
 
 /** @noinspection SlowArrayOperationsInLoopInspection */
 
+declare(strict_types = 1);
+
 namespace MC\Parser\Token;
 
 use Countable;
@@ -13,7 +15,7 @@ class Group extends Token implements Countable
     public $subtoks = [];
 
     /**
-     * @param string|null $name
+     * @param null|string $name
      */
     public function __construct($name)
     {
@@ -36,9 +38,6 @@ public function append($toks)
         $this->subtoks = array_merge($this->subtoks, $toks);
     }
 
-    /**
-     * @return int
-     */
     public function count(): int
     {
         return count($this->subtoks);
@@ -70,12 +69,9 @@ public function getNameValues(): array
         return $values;
     }
 
-    /**
-     * @return bool
-     */
     public function hasChildren(): bool
     {
-        return !empty($this->subtoks);
+        return count($this->subtoks) > 0;
     }
 
     /**
diff --git a/phpstan.neon b/phpstan.neon
index 941b6d0..1c0d854 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,8 @@
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/phpstan/phpstan-strict-rules/rules.neon
 parameters:
     checkMissingIterableValueType: false
+    ignoreErrors:
+        - '#has no return typehint#'
\ No newline at end of file
diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
index 83ee408..e0df9d1 100644
--- a/tests/ExampleTest.php
+++ b/tests/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Tests;
 
 use MC\Google\Visualization;
@@ -56,7 +58,7 @@ public function testQueryComplete()
         $output = $vis->handleRequest(false, $parameters);
 
         //file_put_contents(__DIR__.'/result1.js', $output);
-        static::assertStringEqualsFile(__DIR__.'/result1.js', $output);
+        self::assertStringEqualsFile(__DIR__.'/result1.js', $output);
     }
 
     /**
@@ -81,7 +83,7 @@ public function testQuerySimple()
         $output = $vis->handleRequest(false, $parameters);
 
         //file_put_contents(__DIR__.'/result2.js', $output);
-        static::assertStringEqualsFile(__DIR__.'/result2.js', $output);
+        self::assertStringEqualsFile(__DIR__.'/result2.js', $output);
     }
 
     /**
@@ -116,6 +118,6 @@ public function testQueryJoins()
         $output = $vis->handleRequest(false, $parameters);
 
         //file_put_contents(__DIR__.'/result3.js', $output);
-        static::assertStringEqualsFile(__DIR__.'/result3.js', $output);
+        self::assertStringEqualsFile(__DIR__.'/result3.js', $output);
     }
 }
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
index 1107b19..f531600 100644
--- a/tests/ParserTest.php
+++ b/tests/ParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Tests;
 
 use MC\Parser;
@@ -31,11 +33,11 @@ public function testLiteral()
         $select = $p->keyword('select', true);
 
         $select->parse('sELECT');
-        static::assertSame(['select'], $select->parse('select    ')->getValues());
+        self::assertSame(['select'], $select->parse('select    ')->getValues());
 
         $from = $p->keyword('from', true);
         $selectfrom = $p->set($select, $from);
-        static::assertSame(['select', 'from'], $selectfrom->parse('select  from   ')->getValues());
+        self::assertSame(['select', 'from'], $selectfrom->parse('select  from   ')->getValues());
     }
 
     public function testName()
@@ -43,9 +45,9 @@ public function testName()
         $p = new Parser();
         $select = $p->keyword('select');
 
-        static::assertSame('select', $select->getName());
+        self::assertSame('select', $select->getName());
         $select->name('SELECT');
-        static::assertSame('SELECT', $select->getName());
+        self::assertSame('SELECT', $select->getName());
     }
 
     public function testToken()
@@ -54,10 +56,9 @@ public function testToken()
         $select = $p->keyword('select');
 
         $token = $select->token('test');
-        assert($token !== null);
-        static::assertInstanceOf(Token::class, $token);
-        static::assertSame([[null, 'test']], $token->getNameValues());
-        static::assertSame([], $token->getChildren());
+        assert($token instanceof Token);
+        self::assertSame([[null, 'test']], $token->getNameValues());
+        self::assertSame([], $token->getChildren());
     }
 
     public function testTokenGroup()
@@ -66,11 +67,11 @@ public function testTokenGroup()
         $select = $p->keyword('select');
 
         $group = $select->tokenGroup();
-        static::assertSame([], $group->getNameValues());
-        static::assertSame([], $group->getChildren());
+        self::assertSame([], $group->getNameValues());
+        self::assertSame([], $group->getChildren());
 
         $group->append(null);
-        static::assertSame([], $group->getChildren());
+        self::assertSame([], $group->getChildren());
     }
 
     /**
@@ -82,8 +83,8 @@ public function testOneOf()
         $select = $p->keyword('select');
         $from = $p->keyword('from');
         $oneof = $p->oneOf($select, $from);
-        static::assertSame(['select'], $oneof->parse('select')->getValues());
-        static::assertSame(['from'], $oneof->parse('from')->getValues());
+        self::assertSame(['select'], $oneof->parse('select')->getValues());
+        self::assertSame(['from'], $oneof->parse('from')->getValues());
     }
 
     /**
@@ -95,10 +96,10 @@ public function testOptional()
         $select = $p->keyword('select');
         $from = $p->keyword('from');
         $query = $p->set($p->optional($select), $p->optional($from));
-        static::assertSame([], $query->parse('')->getValues());
-        static::assertSame(['select'], $query->parse('select')->getValues());
-        static::assertSame(['from'], $query->parse('from')->getValues());
-        static::assertSame(['select', 'from'], $query->parse('select from')->getValues());
+        self::assertSame([], $query->parse('')->getValues());
+        self::assertSame(['select'], $query->parse('select')->getValues());
+        self::assertSame(['from'], $query->parse('from')->getValues());
+        self::assertSame(['select', 'from'], $query->parse('select from')->getValues());
     }
 
     /**
@@ -110,7 +111,7 @@ public function testWord()
         $select = $p->keyword('select');
         $word = $p->word($p->alphas(), $p->alphanums());
         $query = $p->set($select, $word);
-        static::assertSame(['select', 'a90'], $query->parse('select a90  ')->getValues());
+        self::assertSame(['select', 'a90'], $query->parse('select a90  ')->getValues());
     }
 
     /**
@@ -122,7 +123,7 @@ public function testDelimitedList()
         $select = $p->keyword('select');
         $word = $p->word($p->alphas());
         $query = $p->set($select, $p->delimitedList($word));
-        static::assertSame(['select', 'one', 'two'], $query->parse('select one,two')->getValues());
+        self::assertSame(['select', 'one', 'two'], $query->parse('select one,two')->getValues());
     }
 
     /**
@@ -134,7 +135,7 @@ public function testRecursive()
         $expr = $p->recursive();
         $expr->replace($p->set($p->literal('{'), $p->optional($expr), $p->literal('}')));
 
-        static::assertSame(['{', '{', '}', '}'], $expr->parse('{{ }}')->getValues());
+        self::assertSame(['{', '{', '}', '}'], $expr->parse('{{ }}')->getValues());
     }
 
     /**
@@ -145,7 +146,7 @@ public function testDelimitedSet()
     {
         $p = new Parser();
         $limit = $p->set($p->keyword('limit'), $p->delimitedList($p->set($p->word($p->alphanums()), $p->quotedString())));
-        static::assertSame(['limit', 'field', '"label"', 'field2', '"label2"'], $limit->parse('limit field "label", field2 "label2"')->getValues());
+        self::assertSame(['limit', 'field', '"label"', 'field2', '"label2"'], $limit->parse('limit field "label", field2 "label2"')->getValues());
     }
 
     /**
@@ -208,19 +209,19 @@ public function testVisParser()
         $query = $p->set($p->optional($select), $p->optional($from), $p->optional($where), $p->optional($groupby), $p->optional($pivot), $p->optional($limit), $p->optional($offset), $p->optional($label), $p->optional($format), $p->optional($options));
 
         $result = $query->parse('');
-        static::assertSame([], $result->getValues(), 'empty query');
+        self::assertSame([], $result->getValues(), 'empty query');
 
         $result = $query->parse('select *');
-        static::assertSame(['select', '*'], $result->getValues(), 'simple select *');
+        self::assertSame(['select', '*'], $result->getValues(), 'simple select *');
 
         $result = $query->parse('from something');
-        static::assertSame(['from', 'something'], $result->getValues(), 'select-less from');
+        self::assertSame(['from', 'something'], $result->getValues(), 'select-less from');
 
         $result = $query->parse('select one, two from table');
-        static::assertSame(['select', 'one', 'two', 'from', 'table'], $result->getValues(), 'select list');
+        self::assertSame(['select', 'one', 'two', 'from', 'table'], $result->getValues(), 'select list');
 
         $result = $query->parse('select max(one) from table where (two>1.5 and (three < 4)) group by one');
-        static::assertSame(['select', 'max', 'one', 'from', 'table', 'where', '(', 'two', '>', '1.5', 'and', '(', 'three', '<', '4', ')', ')', 'group', 'by', 'one'], $result->getValues());
+        self::assertSame(['select', 'max', 'one', 'from', 'table', 'where', '(', 'two', '>', '1.5', 'and', '(', 'three', '<', '4', ')', ')', 'group', 'by', 'one'], $result->getValues());
     }
 
     /**
diff --git a/tests/VisualizationTest.php b/tests/VisualizationTest.php
index 9b9b4f7..a507c4d 100644
--- a/tests/VisualizationTest.php
+++ b/tests/VisualizationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Tests;
 
 use MC\Google\Visualization;
@@ -60,12 +62,12 @@ public function testGenSQL()
 
         $vis->setDefaultEntity('entity');
 
-        static::assertSame('SELECT unique_id AS id, some_number AS some FROM table', $vis->getSQL('select *'));
-        static::assertSame('SELECT unique_id AS id, some_number AS some FROM table', $vis->getSQL('select id, some from entity'));
+        self::assertSame('SELECT unique_id AS id, some_number AS some FROM table', $vis->getSQL('select *'));
+        self::assertSame('SELECT unique_id AS id, some_number AS some FROM table', $vis->getSQL('select id, some from entity'));
 
-        static::assertSame('SELECT e3.company AS company FROM entity2 INNER JOIN entity3 e3 USING (id)', $vis->getSQL('select company from entity2'));
+        self::assertSame('SELECT e3.company AS company FROM entity2 INNER JOIN entity3 e3 USING (id)', $vis->getSQL('select company from entity2'));
 
-        static::assertSame('SELECT unique_id AS id, name AS name, YEAR(date_created) AS created_year FROM entity2', $vis->getSQL('select id, name, created_year from entity2'));
+        self::assertSame('SELECT unique_id AS id, name AS name, YEAR(date_created) AS created_year FROM entity2', $vis->getSQL('select id, name, created_year from entity2'));
     }
 
     /**
@@ -85,7 +87,7 @@ public function testFunctions()
         ]);
 
         $sql = $vis->getSQL('select max(opens) from campaigns');
-        static::assertSame('SELECT MAX(opens) AS `max-opens` FROM campaigns', $sql);
+        self::assertSame('SELECT MAX(opens) AS `max-opens` FROM campaigns', $sql);
     }
 
     /**
@@ -107,7 +109,7 @@ public function testSerializeFunction()
         $query = $vis->parseQuery('select max(opens) from campaigns');
         $meta = $vis->generateMetadata($query);
         $val = $vis->getRowValues(['max-opens' => 10], $meta);
-        static::assertSame('{c:[{v:10,f:"10"}]}', $val);
+        self::assertSame('{c:[{v:10,f:"10"}]}', $val);
     }
 
     /**
@@ -127,7 +129,7 @@ public function testWhere()
             ],
         ]);
 
-        static::assertSame('SELECT title AS title FROM campaigns WHERE (( status = "sent" ))', $vis->getSQL('select title from campaigns where (status = "sent")'));
+        self::assertSame('SELECT title AS title FROM campaigns WHERE (( status = "sent" ))', $vis->getSQL('select title from campaigns where (status = "sent")'));
     }
 
     /**
@@ -150,11 +152,11 @@ public function testCallback()
             ],
         ]);
 
-        static::assertSame('SELECT campaign_id AS field FROM campaigns', $vis->getSQL('select req_callback from campaigns'));
+        self::assertSame('SELECT campaign_id AS field FROM campaigns', $vis->getSQL('select req_callback from campaigns'));
 
         $query = $vis->parseQuery('select req_callback from campaigns');
         $meta = $vis->generateMetadata($query);
-        static::assertSame('{c:[{v:"callback-1"}]}', $vis->getRowValues(['field' => '1'], $meta));
+        self::assertSame('{c:[{v:"callback-1"}]}', $vis->getRowValues(['field' => '1'], $meta));
     }
 
     /**
@@ -172,7 +174,7 @@ public function testOrderBy()
             ],
         ]);
 
-        static::assertSame('SELECT campaign_id AS id FROM campaigns ORDER BY campaign_id ASC', $vis->getSQL('select id from campaigns order by id'));
+        self::assertSame('SELECT campaign_id AS id FROM campaigns ORDER BY campaign_id ASC', $vis->getSQL('select id from campaigns order by id'));
     }
 
     /**
@@ -195,7 +197,7 @@ public function testFormat()
         $query = $vis->parseQuery('select * from campaigns format date_field "m/d/Y", num_field "num:2", bool_field "N:Y"');
         $meta = $vis->generateMetadata($query);
         $val = $vis->getRowValues(['date_field' => '2007-01-01', 'num_field' => '2057.566', 'bool_field' => 0], $meta);
-        static::assertSame('{c:[{v:new Date(2007,0,1),f:"01\/01\/2007"},{v:2057.566,f:"2,057.57"},{v:false,f:"N"}]}', $val);
+        self::assertSame('{c:[{v:new Date(2007,0,1),f:"01\/01\/2007"},{v:2057.566,f:"2,057.57"},{v:false,f:"N"}]}', $val);
     }
 
     /**
@@ -214,7 +216,7 @@ public function testGroupBy()
             ],
         ]);
 
-        static::assertSame('SELECT sub_field AS group_field, SUM(num_field) AS `sum-num_field` FROM campaigns GROUP BY sub_field', $vis->getSQL('select group_field, sum(num_field) from campaigns group by group_field'));
+        self::assertSame('SELECT sub_field AS group_field, SUM(num_field) AS `sum-num_field` FROM campaigns GROUP BY sub_field', $vis->getSQL('select group_field, sum(num_field) from campaigns group by group_field'));
     }
 
     /**
@@ -225,7 +227,7 @@ public function testGroupBy()
     public function testPivot()
     {
         if (!in_array('sqlite', PDO::getAvailableDrivers(), true)) {
-            static::markTestSkipped('Pivot tests require the SQLite PDO drivers to be installed');
+            self::markTestSkipped('Pivot tests require the SQLite PDO drivers to be installed');
         }
 
         $db = new PDO('sqlite::memory:');
@@ -246,7 +248,7 @@ public function testPivot()
         $db->exec('INSERT INTO users VALUES (2, "user2");');
 
         $sql = $vis->getSQL('select count(id) from users pivot username');
-        static::assertSame("SELECT COUNT(CASE WHEN username='user1' THEN unique_id ELSE NULL END) AS `user1 count-id`, COUNT(CASE WHEN username='user2' THEN unique_id ELSE NULL END) AS `user2 count-id` FROM users", $sql);
+        self::assertSame("SELECT COUNT(CASE WHEN username='user1' THEN unique_id ELSE NULL END) AS `user1 count-id`, COUNT(CASE WHEN username='user2' THEN unique_id ELSE NULL END) AS `user2 count-id` FROM users", $sql);
     }
 
     /**
@@ -263,7 +265,7 @@ public function testLabelAfterWhereAndGroupBy()
             'fields' => ['amount' => ['field' => 'amount', 'type' => 'number']],
         ]);
 
-        static::assertSame('SELECT SUM(amount) AS `sum-amount` FROM orders WHERE (amount = true) GROUP BY amount', $vis->getSQL('select sum(amount) from orders where amount=true group by amount label amount "Revenue"'));
+        self::assertSame('SELECT SUM(amount) AS `sum-amount` FROM orders WHERE (amount = true) GROUP BY amount', $vis->getSQL('select sum(amount) from orders where amount=true group by amount label amount "Revenue"'));
     }
 
     /**
@@ -278,7 +280,7 @@ public function testDateLiterals()
         $vis->addEntity('orders', [
             'fields' => ['order_date' => ['field' => 'order_date', 'type' => 'datetime']],
         ]);
-        static::assertSame("SELECT order_date AS order_date FROM orders WHERE (order_date > '2008-01-01 00:00:00')", $vis->getSQL('select order_date from orders where order_date > date "2008-01-01 00:00:00"'));
+        self::assertSame("SELECT order_date AS order_date FROM orders WHERE (order_date > '2008-01-01 00:00:00')", $vis->getSQL('select order_date from orders where order_date > date "2008-01-01 00:00:00"'));
     }
 
     /**
@@ -297,7 +299,7 @@ public function testNoFormat()
         $query = $vis->parseQuery('select amount from orders options no_format');
         $meta = $vis->generateMetadata($query);
         $val = $vis->getRowValues(['amount' => 10000], $meta);
-        static::assertSame('{c:[{v:10000}]}', $val);
+        self::assertSame('{c:[{v:10000}]}', $val);
     }
 
     /**
@@ -316,7 +318,7 @@ public function testNoValues()
         $query = $vis->parseQuery('select amount from orders options no_values');
         $meta = $vis->generateMetadata($query);
         $val = $vis->getRowValues(['amount' => 10000], $meta);
-        static::assertSame('{c:[{f:"10,000"}]}', $val);
+        self::assertSame('{c:[{f:"10,000"}]}', $val);
     }
 
     /**
@@ -336,7 +338,7 @@ public function testCountNonNumber()
         $query = $vis->parseQuery('select count(id), product from orders group by product');
         $meta = $vis->generateMetadata($query);
         $val = $vis->getRowValues(['count-id' => 2, 'product' => 'test product'], $meta);
-        static::assertSame('{c:[{v:2,f:"2"},{v:"test product"}]}', $val);
+        self::assertSame('{c:[{v:2,f:"2"},{v:"test product"}]}', $val);
     }
 
     /**
@@ -354,7 +356,7 @@ public function testIsNull()
                 'id' => ['field' => 'id', 'type' => 'text'],
             ], ]);
         $sql = $vis->getSQL('select id from orders where product is not null');
-        static::assertSame('SELECT id AS id FROM orders WHERE (product IS NOT NULL)', $sql);
+        self::assertSame('SELECT id AS id FROM orders WHERE (product IS NOT NULL)', $sql);
     }
 
     public static function callbackTest(array $row): string