Enable strict mode in Gis classes

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · May 16, 2018 · 107e0b1 · 107e0b1
1 parent 2be3ac8
commit 107e0b1
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 8 deletions.
diff --git a/libraries/classes/Gis/GisFactory.php b/libraries/classes/Gis/GisFactory.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Gis;
 
 /**

diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 

diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 

diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 
@@ -223,7 +224,7 @@ public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data
         }
         $row .= '"';
         foreach ($line_options as $option => $val) {
-            $row .= ' ' . $option . '="' . trim($val) . '"';
+            $row .= ' ' . $option . '="' . trim((string) $val) . '"';
         }
         $row .= '/>';
 
@@ -292,10 +293,10 @@ public function generateWkt(array $gis_data, $index, $empty = '')
         $wkt = 'LINESTRING(';
         for ($i = 0; $i < $no_of_points; $i++) {
             $wkt .= ((isset($gis_data[$index]['LINESTRING'][$i]['x'])
-                    && trim($gis_data[$index]['LINESTRING'][$i]['x']) != '')
+                    && trim((string) $gis_data[$index]['LINESTRING'][$i]['x']) != '')
                     ? $gis_data[$index]['LINESTRING'][$i]['x'] : $empty)
                 . ' ' . ((isset($gis_data[$index]['LINESTRING'][$i]['y'])
-                    && trim($gis_data[$index]['LINESTRING'][$i]['y']) != '')
+                    && trim((string) $gis_data[$index]['LINESTRING'][$i]['y']) != '')
                     ? $gis_data[$index]['LINESTRING'][$i]['y'] : $empty) . ',';
         }
 

diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 
@@ -250,7 +251,7 @@ public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data
             $row .= '"';
             $line_options['id'] = $label . rand();
             foreach ($line_options as $option => $val) {
-                $row .= ' ' . $option . '="' . trim($val) . '"';
+                $row .= ' ' . $option . '="' . trim((string) $val) . '"';
             }
             $row .= '/>';
         }

diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 
@@ -213,7 +214,7 @@ public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_dat
                     . $point[1] . '" r="3"';
                 $point_options['id'] = $label . rand();
                 foreach ($point_options as $option => $val) {
-                    $row .= ' ' . $option . '="' . trim($val) . '"';
+                    $row .= ' ' . $option . '="' . trim((string) $val) . '"';
                 }
                 $row .= '/>';
             }

diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 
@@ -286,7 +287,7 @@ public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data
             $polygon_options['id'] = $label . rand();
             $row .= '"';
             foreach ($polygon_options as $option => $val) {
-                $row .= ' ' . $option . '="' . trim($val) . '"';
+                $row .= ' ' . $option . '="' . trim((string) $val) . '"';
             }
             $row .= '/>';
         }

diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;
 
@@ -221,7 +222,7 @@ public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_dat
             $row .= '<circle cx="' . $points_arr[0][0]
                 . '" cy="' . $points_arr[0][1] . '" r="3"';
             foreach ($point_options as $option => $val) {
-                $row .= ' ' . $option . '="' . trim($val) . '"';
+                $row .= ' ' . $option . '="' . trim((string) $val) . '"';
             }
             $row .= '/>';
         }

diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Gis;
 
 use TCPDF;
@@ -253,7 +255,7 @@ public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data
 
         $row .= '"';
         foreach ($polygon_options as $option => $val) {
-            $row .= ' ' . $option . '="' . trim($val) . '"';
+            $row .= ' ' . $option . '="' . trim((string) $val) . '"';
         }
         $row .= '/>';
 

diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-GIS
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Gis;