Extract GIS related methods from Util class

Creates the PhpMyAdmin\Utils\Gis class.

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

Author: MauricioFauth

libraries/classes/Controllers/Table/SearchController.php

@@ -17,6 +17,7 @@
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Utils\Gis;
 
 use function in_array;
 use function intval;
@@ -140,7 +141,7 @@ private function loadTableInfo(): void
             true
         );
         // Get details about the geometry functions
-        $geom_types = Util::getGISDatatypes();
+        $geom_types = Gis::getDataTypes();
 
         foreach ($columns as $row) {
             // set column name

libraries/classes/Controllers/Table/ZoomSearchController.php

@@ -13,6 +13,7 @@
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Utils\Gis;
 
 use function array_search;
 use function count;
@@ -187,7 +188,7 @@ private function loadTableInfo(): void
             true
         );
         // Get details about the geometry functions
-        $geom_types = Util::getGISDatatypes();
+        $geom_types = Gis::getDataTypes();
 
         foreach ($columns as $row) {
             // set column name

libraries/classes/Display/Results.php

@@ -29,6 +29,7 @@
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Utils\Gis;
 
 use function array_filter;
 use function array_keys;
@@ -3656,7 +3657,7 @@ private function getDataCellForGeometryColumns(
             $whereComparison = ' = ' . $column;
 
             // Convert to WKT format
-            $wktval = Util::asWKT($column);
+            $wktval = Gis::convertToWellKnownText($column);
             [
                 $isFieldTruncated,
                 $displayedColumn,

libraries/classes/InsertEdit.php

@@ -10,6 +10,7 @@
 use PhpMyAdmin\Controllers\Table\ChangeController;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Plugins\TransformationsPlugin;
+use PhpMyAdmin\Utils\Gis;
 
 use function array_fill;
 use function array_flip;
@@ -2115,7 +2116,7 @@ private function getSpecialCharsAndBackupFieldForExistingRow(
             // Convert gis data to Well Know Text format
             $current_row[$column['Field']] = $as_is
                 ? $current_row[$column['Field']]
-                : Util::asWKT(
+                : Gis::convertToWellKnownText(
                     $current_row[$column['Field']],
                     true
                 );
@@ -3393,7 +3394,7 @@ private function getHtmlForInsertEditFormColumn(
         }
 
         // Get a list of GIS data types.
-        $gis_data_types = Util::getGISDatatypes();
+        $gis_data_types = Gis::getDataTypes();
 
         // Prepares the field value
         $real_null_value = false;

libraries/classes/Table/Search.php

@@ -6,6 +6,7 @@
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Utils\Gis;
 
 use function count;
 use function explode;
@@ -280,7 +281,7 @@ private function getGeomWhereClause(
         $where = '';
 
         // Get details about the geometry functions
-        $geom_funcs = Util::getGISFunctions($types, true, false);
+        $geom_funcs = Gis::getFunctions($types, true, false);
 
         // If the function takes multiple parameters
         if (strpos($func_type, 'IS NULL') !== false || strpos($func_type, 'IS NOT NULL') !== false) {
@@ -289,7 +290,7 @@ private function getGeomWhereClause(
 
         if ($geom_funcs[$geom_func]['params'] > 1) {
             // create gis data from the criteria input
-            $gis_data = Util::createGISData($criteriaValues, $this->dbi->getVersion());
+            $gis_data = Gis::createData($criteriaValues, $this->dbi->getVersion());
 
             return $geom_func . '(' . Util::backquote($names)
                 . ', ' . $gis_data . ')';
@@ -307,11 +308,11 @@ private function getGeomWhereClause(
         ) {
             $where = $geom_function_applied;
         } elseif (
-            in_array($type, Util::getGISDatatypes())
+            in_array($type, Gis::getDataTypes())
             && ! empty($criteriaValues)
         ) {
             // create gis data from the criteria input
-            $gis_data = Util::createGISData($criteriaValues, $this->dbi->getVersion());
+            $gis_data = Gis::createData($criteriaValues, $this->dbi->getVersion());
             $where = $geom_function_applied . ' ' . $func_type . ' ' . $gis_data;
         } elseif (strlen($criteriaValues) > 0) {
             $where = $geom_function_applied . ' '

libraries/classes/Twig/UtilExtension.php

@@ -60,11 +60,11 @@ public function getFunctions()
             ),
             new TwigFunction(
                 'get_gis_datatypes',
-                'PhpMyAdmin\Util::getGISDatatypes'
+                'PhpMyAdmin\Utils\Gis::getDataTypes'
             ),
             new TwigFunction(
                 'get_gis_functions',
-                'PhpMyAdmin\Util::getGISFunctions'
+                'PhpMyAdmin\Utils\Gis::getFunctions'
             ),
             new TwigFunction(
                 'get_icon',