TBF

Author: ddebin

lib/MC/Google/Visualization.php

@@ -535,11 +535,7 @@ public function getRowValues(array $row, array $meta): string
                     if (1 === preg_match('#^num:(\d+)(.*)$#i', $format, $matches)) {
                         $digits = (int) $matches[1];
                         $extras = str_split($matches[2]);
-                        if (2 === count($extras)) {
-                            $formatted = number_format($val, $digits, $extras[0], $extras[1]);
-                        } else {
-                            $formatted = number_format($val, $digits);
-                        }
+                        $formatted = 2 === count($extras) ? number_format($val, $digits, $extras[0], $extras[1]) : number_format($val, $digits);
                     } elseif ('dollars' === $format) {
                         $formatted = '$'.number_format($val, 2);
                     } elseif ('percent' === $format) {
@@ -979,7 +975,7 @@ protected function generateSQL(array &$meta): string
             }
 
             $pivotSql = 'SELECT '.implode(', ', $pivotFields).' FROM '.$meta['table'];
-            if (count($pivotJoins) > 0) {
+            if ([] !== $pivotJoins) {
                 $pivotSql .= ' '.implode(' ', $pivotJoins);
             }
             $pivotSql .= ' GROUP BY '.implode(', ', $pivotGroup);
@@ -1075,7 +1071,7 @@ protected function generateSQL(array &$meta): string
             $wheres[] = $meta['global_where'];
         }
 
-        if (count($wheres) > 0) {
+        if ([] !== $wheres) {
             $sql .= ' WHERE '.implode(' AND ', $wheres);
         }
 

lib/MC/Parser/Def/Literal.php

@@ -35,7 +35,7 @@ public function __construct(string $search, bool $caseless = false, bool $fullwo
      */
     public function _parse(string $str, int $loc): array
     {
-        $match = !$this->caseless ? strpos($str, $this->search, $loc) : stripos($str, $this->search, $loc);
+        $match = $this->caseless ? stripos($str, $this->search, $loc) : strpos($str, $this->search, $loc);
 
         if ($match !== $loc) {
             throw new ParseError('Expected: '.$this->search, $str, $loc);

lib/MC/Parser/Token/Group.php

@@ -68,7 +68,7 @@ public function getNameValues(): array
 
     public function hasChildren(): bool
     {
-        return count($this->subtoks) > 0;
+        return [] !== $this->subtoks;
     }
 
     /**

tests/ExampleTest.php

@@ -142,7 +142,7 @@ public function testQueryJoins(): void
         $output = $vis->handleRequest(false, $parameters);
 
         // hack, different PHP version have different float rounding
-        $output = preg_replace('/69\.22149730656[0-9]+/', '69.22149730656', $output);
+        $output = preg_replace('/69\.22149730656\d+/', '69.22149730656', $output);
         assert(is_string($output));
 
         // file_put_contents(__DIR__.'/result3.js', $output);

tests/VisualizationTest.php

@@ -147,7 +147,7 @@ public function testCallback(): void
                 'req_callback' => [
                     'fields' => ['field'],
                     'type' => 'text',
-                    'callback' => [__CLASS__, 'callbackTest'],
+                    'callback' => [self::class, 'callbackTest'],
                 ],
             ],
         ]);