Merge #17075 - Use int as srid type

Pull-request: #17075

Signed-off-by: William Desportes <williamdes@wdes.fr>

12 files changed, 57 insertions, 140 deletions

diff --git a/libraries/classes/Controllers/GisDataEditorController.php b/libraries/classes/Controllers/GisDataEditorController.php
index 6631d4821e..5ee78c368a 100644
--- a/libraries/classes/Controllers/GisDataEditorController.php
+++ b/libraries/classes/Controllers/GisDataEditorController.php
@@ -90,7 +90,7 @@ class GisDataEditorController extends AbstractController
         }
 
         // Generate Well Known Text
-        $srid = isset($gis_data['srid']) && $gis_data['srid'] != '' ? $gis_data['srid'] : 0;
+        $srid = isset($gis_data['srid']) && $gis_data['srid'] != '' ? (int) $gis_data['srid'] : 0;
         $wkt = $gis_obj->generateWkt($gis_data, 0);
         $wkt_with_zero = $gis_obj->generateWkt($gis_data, 0, '0');
         $result = "'" . $wkt . "'," . $srid;
diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php
index f9acbaa49b..72b9d41de2 100644
--- a/libraries/classes/Gis/GisGeometry.php
+++ b/libraries/classes/Gis/GisGeometry.php
@@ -12,7 +12,6 @@ use TCPDF;
 
 use function explode;
 use function floatval;
-use function intval;
 use function mb_strripos;
 use function mb_substr;
 use function mt_rand;
@@ -93,7 +92,7 @@ abstract class GisGeometry
      */
     abstract public function prepareRowAsOl(
         $spatial,
-        $srid,
+        int $srid,
         $label,
         $color,
         array $scale_data
@@ -126,15 +125,15 @@ abstract class GisGeometry
     /**
      * Returns OpenLayers.Bounds object that correspond to the bounds of GIS data.
      *
-     * @param string $srid       spatial reference ID
-     * @param array  $scale_data data related to scaling
+     * @param int   $srid       spatial reference ID
+     * @param array $scale_data data related to scaling
      *
      * @return string OpenLayers.Bounds object that
      *                correspond to the bounds of GIS data
      *
      * @access protected
      */
-    protected function getBoundsForOl($srid, array $scale_data)
+    protected function getBoundsForOl(int $srid, array $scale_data)
     {
         return sprintf(
             'var minLoc = [%s, %s];'
@@ -146,7 +145,7 @@ abstract class GisGeometry
             $scale_data['minY'],
             $scale_data['maxX'],
             $scale_data['maxY'],
-            intval($srid)
+            $srid
         );
     }
 
@@ -213,7 +212,7 @@ abstract class GisGeometry
 
         if (preg_match("/^'" . $geom_types . "\(.*\)',[0-9]*$/i", $value)) {
             $last_comma = mb_strripos($value, ',');
-            $srid = trim(mb_substr($value, $last_comma + 1));
+            $srid = (int) trim(mb_substr($value, $last_comma + 1));
             $wkt = trim(mb_substr($value, 1, $last_comma - 2));
         } elseif (preg_match('/^' . $geom_types . '\(.*\)$/i', $value)) {
             $wkt = $value;
@@ -279,14 +278,14 @@ abstract class GisGeometry
     /**
      * Generates JavaScript for adding an array of polygons to OpenLayers.
      *
-     * @param array  $polygons x and y coordinates for each polygon
-     * @param string $srid     spatial reference id
+     * @param array $polygons x and y coordinates for each polygon
+     * @param int   $srid     spatial reference id
      *
      * @return string JavaScript for adding an array of polygons to OpenLayers
      *
      * @access protected
      */
-    protected function getPolygonArrayForOpenLayers(array $polygons, $srid)
+    protected function getPolygonArrayForOpenLayers(array $polygons, int $srid)
     {
         $ol_array = 'var polygonArray = [];';
         foreach ($polygons as $polygon) {
@@ -301,14 +300,14 @@ abstract class GisGeometry
     /**
      * Generates JavaScript for adding points for OpenLayers polygon.
      *
-     * @param array  $polygon x and y coordinates for each line
-     * @param string $srid    spatial reference id
+     * @param array $polygon x and y coordinates for each line
+     * @param int   $srid    spatial reference id
      *
      * @return string JavaScript for adding points for OpenLayers polygon
      *
      * @access protected
      */
-    protected function getPolygonForOpenLayers(array $polygon, $srid)
+    protected function getPolygonForOpenLayers(array $polygon, int $srid)
     {
         return $this->getLineArrayForOpenLayers($polygon, $srid, false)
         . 'var polygon = new ol.geom.Polygon(arr);';
@@ -318,9 +317,9 @@ abstract class GisGeometry
      * Generates JavaScript for adding an array of LineString
      * or LineRing to OpenLayers.
      *
-     * @param array  $lines          x and y coordinates for each line
-     * @param string $srid           spatial reference id
-     * @param bool   $is_line_string whether it's an array of LineString
+     * @param array $lines          x and y coordinates for each line
+     * @param int   $srid           spatial reference id
+     * @param bool  $is_line_string whether it's an array of LineString
      *
      * @return string JavaScript for adding an array of LineString
      *                or LineRing to OpenLayers
@@ -329,7 +328,7 @@ abstract class GisGeometry
      */
     protected function getLineArrayForOpenLayers(
         array $lines,
-        $srid,
+        int $srid,
         $is_line_string = true
     ) {
         $ol_array = 'var arr = [];';
@@ -352,9 +351,9 @@ abstract class GisGeometry
     /**
      * Generates JavaScript for adding a LineString or LineRing to OpenLayers.
      *
-     * @param array  $points_arr     x and y coordinates for each point
-     * @param string $srid           spatial reference id
-     * @param bool   $is_line_string whether it's a LineString
+     * @param array $points_arr     x and y coordinates for each point
+     * @param int   $srid           spatial reference id
+     * @param bool  $is_line_string whether it's a LineString
      *
      * @return string JavaScript for adding a LineString or LineRing to OpenLayers
      *
@@ -362,7 +361,7 @@ abstract class GisGeometry
      */
     protected function getLineForOpenLayers(
         array $points_arr,
-        $srid,
+        int $srid,
         $is_line_string = true
     ) {
         return 'new ol.geom.'
@@ -374,14 +373,14 @@ abstract class GisGeometry
     /**
      * Generates JavaScript for adding an array of points to OpenLayers.
      *
-     * @param array  $points_arr x and y coordinates for each point
-     * @param string $srid       spatial reference id
+     * @param array $points_arr x and y coordinates for each point
+     * @param int   $srid       spatial reference id
      *
      * @return string JavaScript for adding an array of points to OpenLayers
      *
      * @access protected
      */
-    protected function getPointsArrayForOpenLayers(array $points_arr, $srid)
+    protected function getPointsArrayForOpenLayers(array $points_arr, int $srid)
     {
         $ol_array = 'new Array(';
         foreach ($points_arr as $point) {
@@ -396,17 +395,17 @@ abstract class GisGeometry
     /**
      * Generates JavaScript for adding a point to OpenLayers.
      *
-     * @param array  $point array containing the x and y coordinates of the point
-     * @param string $srid  spatial reference id
+     * @param array $point array containing the x and y coordinates of the point
+     * @param int   $srid  spatial reference id
      *
      * @return string JavaScript for adding points to OpenLayers
      *
      * @access protected
      */
-    protected function getPointForOpenLayers(array $point, $srid)
+    protected function getPointForOpenLayers(array $point, int $srid)
     {
         return '(new ol.geom.Point([' . $point[0] . ',' . $point[1] . '])'
-        . '.transform(ol.proj.get("EPSG:' . ((int) $srid) . '")'
+        . '.transform(ol.proj.get("EPSG:' . $srid . '")'
         . ', ol.proj.get(\'EPSG:3857\')))';
     }
 
diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php
index a6d365e227..d4bf9ed643 100644
--- a/libraries/classes/Gis/GisGeometryCollection.php
+++ b/libraries/classes/Gis/GisGeometryCollection.php
@@ -259,7 +259,7 @@ class GisGeometryCollection extends GisGeometry
      *
      * @access public
      */
-    public function prepareRowAsOl($spatial, $srid, $label, $color, array $scale_data)
+    public function prepareRowAsOl($spatial, int $srid, $label, $color, array $scale_data)
     {
         $row = '';
 
diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php
index 07312ee0cd..16493744bb 100644
--- a/libraries/classes/Gis/GisLineString.php
+++ b/libraries/classes/Gis/GisLineString.php
@@ -235,7 +235,7 @@ class GisLineString extends GisGeometry
      *
      * @access public
      */
-    public function prepareRowAsOl($spatial, $srid, $label, $line_color, array $scale_data)
+    public function prepareRowAsOl($spatial, int $srid, $label, $line_color, array $scale_data)
     {
         $stroke_style = [
             'color' => $line_color,
@@ -251,7 +251,7 @@ class GisLineString extends GisGeometry
 
         $result .= '});';
 
-        if ($srid == 0) {
+        if ($srid === 0) {
             $srid = 4326;
         }
 
diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
index b920a27532..79fac4eae2 100644
--- a/libraries/classes/Gis/GisMultiLineString.php
+++ b/libraries/classes/Gis/GisMultiLineString.php
@@ -266,7 +266,7 @@ class GisMultiLineString extends GisGeometry
      *
      * @access public
      */
-    public function prepareRowAsOl($spatial, $srid, $label, $line_color, array $scale_data)
+    public function prepareRowAsOl($spatial, int $srid, $label, $line_color, array $scale_data)
     {
         $stroke_style = [
             'color' => $line_color,
@@ -282,7 +282,7 @@ class GisMultiLineString extends GisGeometry
 
         $row .= '});';
 
-        if ($srid == 0) {
+        if ($srid === 0) {
             $srid = 4326;
         }
 
diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
index 324a52a6b1..a2fc8fd955 100644
--- a/libraries/classes/Gis/GisMultiPoint.php
+++ b/libraries/classes/Gis/GisMultiPoint.php
@@ -247,7 +247,7 @@ class GisMultiPoint extends GisGeometry
      */
     public function prepareRowAsOl(
         $spatial,
-        $srid,
+        int $srid,
         $label,
         $point_color,
         array $scale_data
@@ -278,7 +278,7 @@ class GisMultiPoint extends GisGeometry
 
         $result .= '});';
 
-        if ($srid == 0) {
+        if ($srid === 0) {
             $srid = 4326;
         }
 
@@ -391,14 +391,14 @@ class GisMultiPoint extends GisGeometry
      * Overridden to make sure that only the points having valid values
      * for x and y coordinates are added.
      *
-     * @param array  $points_arr x and y coordinates for each point
-     * @param string $srid       spatial reference id
+     * @param array $points_arr x and y coordinates for each point
+     * @param int   $srid       spatial reference id
      *
      * @return string JavaScript for adding an array of points to OpenLayers
      *
      * @access protected
      */
-    protected function getPointsArrayForOpenLayers(array $points_arr, $srid)
+    protected function getPointsArrayForOpenLayers(array $points_arr, int $srid)
     {
         $ol_array = 'new Array(';
         foreach ($points_arr as $point) {
diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
index d51f2a3514..5699b8dc46 100644
--- a/libraries/classes/Gis/GisMultiPolygon.php
+++ b/libraries/classes/Gis/GisMultiPolygon.php
@@ -315,7 +315,7 @@ class GisMultiPolygon extends GisGeometry
      *
      * @access public
      */
-    public function prepareRowAsOl($spatial, $srid, $label, $fill_color, array $scale_data)
+    public function prepareRowAsOl($spatial, int $srid, $label, $fill_color, array $scale_data)
     {
         $fill_opacity = 0.8;
         array_push($fill_color, $fill_opacity);
@@ -335,7 +335,7 @@ class GisMultiPolygon extends GisGeometry
 
         $row .= '});';
 
-        if ($srid == 0) {
+        if ($srid === 0) {
             $srid = 4326;
         }
 
diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
index 7d35192709..780b8a84b0 100644
--- a/libraries/classes/Gis/GisPoint.php
+++ b/libraries/classes/Gis/GisPoint.php
@@ -234,7 +234,7 @@ class GisPoint extends GisGeometry
      */
     public function prepareRowAsOl(
         $spatial,
-        $srid,
+        int $srid,
         $label,
         $point_color,
         array $scale_data
@@ -265,7 +265,7 @@ class GisPoint extends GisGeometry
 
         $result .= '});';
 
-        if ($srid == 0) {
+        if ($srid === 0) {
             $srid = 4326;
         }
 
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index d8f9818edb..46f134f301 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -274,7 +274,7 @@ class GisPolygon extends GisGeometry
      *
      * @access public
      */
-    public function prepareRowAsOl($spatial, $srid, $label, $fill_color, array $scale_data)
+    public function prepareRowAsOl($spatial, int $srid, $label, $fill_color, array $scale_data)
     {
         $fill_opacity = 0.8;
         array_push($fill_color, $fill_opacity);
@@ -293,7 +293,7 @@ class GisPolygon extends GisGeometry
 
         $row .= '});';
 
-        if ($srid == 0) {
+        if ($srid === 0) {
             $srid = 4326;
         }
 
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index c4469c1cd6..7de763b269 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -763,7 +763,7 @@ class GisVisualization
             } elseif ($format === 'ol') {
                 $results .= $gis_obj->prepareRowAsOl(
                     $row[$this->settings['spatialColumn']],
-                    $row['srid'],
+                    (int) $row['srid'],
                     $label,
                     $this->settings['colors_hex'][$index],
                     $scale_data
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7933755c1d..8e6c8dd89d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -346,16 +346,6 @@ parameters:
 			path: libraries/classes/Gis/GisGeometryCollection.php
 
 		-
-			message: "#^Parameter \\#1 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getBoundsForOl\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisLineString.php
-
-		-
-			message: "#^Parameter \\#2 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getLineForOpenLayers\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisLineString.php
-
-		-
 			message: "#^Parameter \\#5 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:line\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisLineString.php
@@ -366,16 +356,6 @@ parameters:
 			path: libraries/classes/Gis/GisLineString.php
 
 		-
-			message: "#^Parameter \\#1 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getBoundsForOl\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisMultiLineString.php
-
-		-
-			message: "#^Parameter \\#2 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getLineArrayForOpenLayers\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisMultiLineString.php
-
-		-
 			message: "#^Parameter \\#5 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:line\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisMultiLineString.php
@@ -386,16 +366,6 @@ parameters:
 			path: libraries/classes/Gis/GisMultiLineString.php
 
 		-
-			message: "#^Parameter \\#1 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getBoundsForOl\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisMultiPoint.php
-
-		-
-			message: "#^Parameter \\#2 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisMultiPoint\\:\\:getPointsArrayForOpenLayers\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisMultiPoint.php
-
-		-
 			message: "#^Parameter \\#5 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:string\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisMultiPoint.php
@@ -406,36 +376,16 @@ parameters:
 			path: libraries/classes/Gis/GisMultiPoint.php
 
 		-
-			message: "#^Parameter \\#1 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getBoundsForOl\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisMultiPolygon.php
-
-		-
 			message: "#^Parameter \\#2 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:filledPolygon\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisMultiPolygon.php
 
 		-
-			message: "#^Parameter \\#2 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getPolygonArrayForOpenLayers\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisMultiPolygon.php
-
-		-
 			message: "#^Parameter \\#5 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:string\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisMultiPolygon.php
 
 		-
-			message: "#^Parameter \\#1 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getBoundsForOl\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisPoint.php
-
-		-
-			message: "#^Parameter \\#2 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getPointForOpenLayers\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisPoint.php
-
-		-
 			message: "#^Parameter \\#5 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:string\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisPoint.php
@@ -446,21 +396,11 @@ parameters:
 			path: libraries/classes/Gis/GisPoint.php
 
 		-
-			message: "#^Parameter \\#1 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getBoundsForOl\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisPolygon.php
-
-		-
 			message: "#^Parameter \\#2 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:filledPolygon\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisPolygon.php
 
 		-
-			message: "#^Parameter \\#2 \\$srid of method PhpMyAdmin\\\\Gis\\\\GisGeometry\\:\\:getPolygonForOpenLayers\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisPolygon.php
-
-		-
 			message: "#^Parameter \\#5 \\$color of method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:string\\(\\) expects int, int\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisPolygon.php
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index c8a536ff29..318fae1316 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1965,14 +1965,10 @@
       <code>$gis_data['gis_type']</code>
       <code>$gis_data['gis_type']</code>
     </MixedArrayAssignment>
-    <MixedAssignment occurrences="3">
+    <MixedAssignment occurrences="2">
       <code>$geom_type</code>
       <code>$gis_data</code>
-      <code>$srid</code>
     </MixedAssignment>
-    <MixedOperand occurrences="1">
-      <code>$srid</code>
-    </MixedOperand>
     <PossiblyFalseOperand occurrences="1">
       <code>mb_strpos($_POST['value'], '(')</code>
     </PossiblyFalseOperand>
@@ -7326,10 +7322,6 @@
     </RedundantPropertyInitializationCheck>
   </file>
   <file src="libraries/classes/Gis/GisLineString.php">
-    <InvalidScalarArgument occurrences="2">
-      <code>$srid</code>
-      <code>$srid</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="13">
       <code>$point[0]</code>
       <code>$point[0]</code>
@@ -7400,10 +7392,6 @@
     </RedundantPropertyInitializationCheck>
   </file>
   <file src="libraries/classes/Gis/GisMultiLineString.php">
-    <InvalidScalarArgument occurrences="2">
-      <code>$srid</code>
-      <code>$srid</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="13">
       <code>$point[0]</code>
       <code>$point[0]</code>
@@ -7485,10 +7473,6 @@
     </RedundantPropertyInitializationCheck>
   </file>
   <file src="libraries/classes/Gis/GisMultiPoint.php">
-    <InvalidScalarArgument occurrences="2">
-      <code>$srid</code>
-      <code>$srid</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="10">
       <code>$point</code>
       <code>$point[0]</code>
@@ -7563,10 +7547,6 @@
     </RedundantPropertyInitializationCheck>
   </file>
   <file src="libraries/classes/Gis/GisMultiPolygon.php">
-    <InvalidScalarArgument occurrences="2">
-      <code>$srid</code>
-      <code>$srid</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="9">
       <code>$label_point[0]</code>
       <code>$label_point[0]</code>
@@ -7695,10 +7675,6 @@
     </UnusedVariable>
   </file>
   <file src="libraries/classes/Gis/GisPoint.php">
-    <InvalidScalarArgument occurrences="2">
-      <code>$srid</code>
-      <code>$srid</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="10">
       <code>$points_arr[0]</code>
       <code>$points_arr[0][0]</code>
@@ -7763,10 +7739,6 @@
     <InvalidNullableReturnType occurrences="1">
       <code>array|false</code>
     </InvalidNullableReturnType>
-    <InvalidScalarArgument occurrences="2">
-      <code>$srid</code>
-      <code>$srid</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="7">
       <code>$points_arr[2]</code>
       <code>$points_arr[2]</code>
@@ -7930,7 +7902,7 @@
     <DocblockTypeContradiction occurrences="1">
       <code>$this-&gt;userSpecifiedSettings === null</code>
     </DocblockTypeContradiction>
-    <MixedArgument occurrences="22">
+    <MixedArgument occurrences="21">
       <code>$label</code>
       <code>$label</code>
       <code>$label</code>
@@ -7941,7 +7913,6 @@
       <code>$row[$this-&gt;settings['spatialColumn']]</code>
       <code>$row[$this-&gt;settings['spatialColumn']]</code>
       <code>$row[$this-&gt;settings['spatialColumn']]</code>
-      <code>$row['srid']</code>
       <code>$this-&gt;settings['colors']</code>
       <code>$this-&gt;settings['colors'][$index]</code>
       <code>$this-&gt;settings['colors'][$index]</code>
@@ -11125,7 +11096,7 @@
       <code>$values</code>
       <code>$values</code>
     </MixedArgumentTypeCoercion>
-    <MixedArrayAccess occurrences="25">
+    <MixedArrayAccess occurrences="26">
       <code>$aliases[$oldDatabase]['tables']</code>
       <code>$cfgRelation['mimework']</code>
       <code>$columnAliases[$column['name']]</code>
@@ -11137,6 +11108,7 @@
       <code>$column['Null']</code>
       <code>$column['Type']</code>
       <code>$column['Type']</code>
+      <code>$column['name']</code>
       <code>$definition['Type']</code>
       <code>$mime['mimetype']</code>
       <code>$oneKey['index_list']</code>
@@ -11152,15 +11124,20 @@
       <code>$trigger['create']</code>
       <code>$trigger['drop']</code>
     </MixedArrayAccess>
-    <MixedArrayOffset occurrences="6">
+    <MixedArrayAssignment occurrences="1">
+      <code>$field-&gt;key-&gt;columns[$key]['name']</code>
+    </MixedArrayAssignment>
+    <MixedArrayOffset occurrences="8">
       <code>$aliases[$db]['tables'][$table]['columns'][$field]</code>
       <code>$aliases[$db]['tables'][$table]['columns'][$relField]</code>
       <code>$aliases[$db]['tables'][$view]['columns'][$colAlias]</code>
+      <code>$aliases[$oldDatabase]['tables'][$oldTable]['columns'][$column['name']]</code>
       <code>$aliases[$oldDatabase]['tables'][$refTable]['columns'][$column]</code>
+      <code>$columnAliases[$column['name']]</code>
       <code>$oneKey['ref_index_list'][$index]</code>
       <code>$values[$val]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="43">
+    <MixedAssignment occurrences="44">
       <code>$GLOBALS['old_tz']</code>
       <code>$colAlias</code>
       <code>$colAlias</code>
@@ -11168,6 +11145,7 @@
       <code>$colAs</code>
       <code>$column</code>
       <code>$column</code>
+      <code>$column</code>
       <code>$columnAliases</code>
       <code>$createQuery</code>
       <code>$definition</code>