Remove unnecessary array count in ImportShp::doImport()

MauricioFauth · MauricioFauth · commit a975456b1ead · 2023-09-13T12:13:43.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -15195,21 +15195,6 @@ parameters:
 			count: 4
 			path: src/Plugins/Import/ImportShp.php
 
-		-
-			message: "#^Cannot access offset mixed on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Import/ImportShp.php
-
-		-
-			message: "#^Cannot access property \\$dbfData on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Import/ImportShp.php
-
-		-
-			message: "#^Cannot access property \\$shpData on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Import/ImportShp.php
-
 		-
 			message: "#^Cannot cast mixed to string\\.$#"
 			count: 3
@@ -15255,11 +15240,6 @@ parameters:
 			count: 1
 			path: src/Plugins/Import/ImportShp.php
 
-		-
-			message: "#^Parameter \\#1 \\$rowData of method PhpMyAdmin\\\\Gis\\\\GisMultiLineString\\:\\:getShape\\(\\) expects array, mixed given\\.$#"
-			count: 1
-			path: src/Plugins/Import/ImportShp.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function mb_substr expects string, mixed given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -9658,7 +9658,6 @@
       <code>$c[0]</code>
       <code>$dbfHeader[$n]</code>
       <code>$dbfHeader[$n][0]</code>
-      <code><![CDATA[$record->dbfData[$c[0]]]]></code>
     </MixedArrayAccess>
     <MixedArrayAssignment>
       <code>$analyses[$tableNo][Import::FORMATTEDSQL]</code>
@@ -9685,7 +9684,6 @@
       <code>$dbfFileName</code>
       <code>$dbfHeader</code>
       <code>$extracted</code>
-      <code>$record</code>
       <code>$result</code>
       <code>$temp</code>
     </MixedAssignment>
@@ -9696,8 +9694,6 @@
     </MixedOperand>
     <MixedPropertyFetch>
       <code><![CDATA[$config->settings]]></code>
-      <code><![CDATA[$record->dbfData]]></code>
-      <code><![CDATA[$record->shpData]]></code>
     </MixedPropertyFetch>
     <MixedReturnTypeCoercion>
       <code>$sqlStatements</code>
diff --git a/src/Plugins/Import/ImportShp.php b/src/Plugins/Import/ImportShp.php
@@ -209,36 +209,33 @@ public function doImport(File|null $importHandle = null): array
             $gisObj = null;
         }
 
-        $numRows = count($shp->records);
         // If .dbf file is loaded, the number of extra data columns
         $numDataCols = $shp->getDBFHeader() !== null ? count($shp->getDBFHeader()) : 0;
 
         $rows = [];
         $colNames = [];
-        if ($numRows != 0) {
-            foreach ($shp->records as $record) {
-                $tempRow = [];
-                if ($gisObj == null || ! method_exists($gisObj, 'getShape')) {
-                    $tempRow[] = null;
-                } else {
-                    $tempRow[] = "GeomFromText('"
-                        . $gisObj->getShape($record->shpData) . "')";
-                }
-
-                if ($shp->getDBFHeader() !== null) {
-                    foreach ($shp->getDBFHeader() as $c) {
-                        $cell = trim((string) $record->dbfData[$c[0]]);
+        foreach ($shp->records as $record) {
+            $tempRow = [];
+            if ($gisObj == null || ! method_exists($gisObj, 'getShape')) {
+                $tempRow[] = null;
+            } else {
+                $tempRow[] = "GeomFromText('"
+                    . $gisObj->getShape($record->shpData) . "')";
+            }
 
-                        if ($cell === '') {
-                            $cell = 'NULL';
-                        }
+            if ($shp->getDBFHeader() !== null) {
+                foreach ($shp->getDBFHeader() as $c) {
+                    $cell = trim((string) $record->dbfData[$c[0]]);
 
-                        $tempRow[] = $cell;
+                    if ($cell === '') {
+                        $cell = 'NULL';
                     }
-                }
 
-                $rows[] = $tempRow;
+                    $tempRow[] = $cell;
+                }
             }
+
+            $rows[] = $tempRow;
         }
 
         if ($rows === []) {
