Upgrade phpmyadmin/coding-standard to 3.0.0

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Author: MauricioFauth

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.37",
-        "phpmyadmin/coding-standard": "^2.1.1",
+        "phpmyadmin/coding-standard": "^3.0.0",
         "phpstan/phpstan-phpunit": "^0.12.6",
         "phpunit/phpunit": "^7.4 || ^8 || ^9"
     },

examples/read.php

@@ -30,6 +30,7 @@
  *
  * @param string $filename File to open
  */
+// phpcs:ignore Squiz.Functions.GlobalFunction.Found
 function display_file(string $filename): void
 {
     $shp = new ShapeFile(1);

phpcs.xml.dist

@@ -14,21 +14,16 @@
     <exclude-pattern>*/examples/index.php</exclude-pattern>
 
     <rule ref="PhpMyAdmin">
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversablePropertyTypeHintSpecification"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingPropertyTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
     </rule>
 
-    <rule ref="Squiz.Functions.GlobalFunction.Found">
-        <exclude-pattern>*/examples/read.php</exclude-pattern>
-    </rule>
-    <!-- Fixing this issue has some side effects -->
-    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedEqualOperator">
-        <exclude-pattern>*/src/ShapeFile.php</exclude-pattern>
-    </rule>
-    <!-- Fixing this issue has some side effects -->
-    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedNotEqualOperator">
-        <exclude-pattern>*/src/ShapeFile.php</exclude-pattern>
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition"/>
+    <rule ref="SlevomatCodingStandard.Functions.RequireSingleLineCall"/>
+    <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">
+        <properties>
+            <property name="ignoreSpacesInComment" value="true"/>
+        </properties>
     </rule>
 </ruleset>

src/ShapeFile.php

@@ -205,15 +205,17 @@ private function updateBBox(string $type, array $data): void
         $min = $type . 'min';
         $max = $type . 'max';
 
-        if (! isset($this->boundingBox[$min])
-            || $this->boundingBox[$min] == 0.0
+        if (
+            ! isset($this->boundingBox[$min])
+            || $this->boundingBox[$min] == 0.0 // phpcs:ignore SlevomatCodingStandard.Operators.DisallowEqualOperators
             || ($this->boundingBox[$min] > $data[$min])
         ) {
             $this->boundingBox[$min] = $data[$min];
         }
 
-        if (isset($this->boundingBox[$max])
-            && $this->boundingBox[$max] != 0.0
+        if (
+            isset($this->boundingBox[$max])
+            && $this->boundingBox[$max] != 0.0 // phpcs:ignore SlevomatCodingStandard.Operators.DisallowEqualOperators
             && ($this->boundingBox[$max] >= $data[$max])
         ) {
             return;
@@ -308,7 +310,8 @@ public function setDBFHeader(array $header): void
     public function getIndexFromDBFData(string $field, $value): int
     {
         foreach ($this->records as $index => $record) {
-            if (isset($record->dbfData[$field]) &&
+            if (
+                isset($record->dbfData[$field]) &&
                 (trim(strtoupper($record->dbfData[$field])) === strtoupper($value))
             ) {
                 return $index;
@@ -691,6 +694,7 @@ public function getShapeName(): string
      */
     public function hasMeasure(): bool
     {
+        // phpcs:ignore SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedNotEqualOperator
         return $this->boundingBox['mmin'] != 0 || $this->boundingBox['mmax'] != 0;
     }
 }

src/ShapeRecord.php

@@ -480,7 +480,8 @@ private function loadPolyLineRecord(): void
                 ++$part;
             }
 
-            if (! isset($this->shpData['parts'][$part]['points'])
+            if (
+                ! isset($this->shpData['parts'][$part]['points'])
                 || ! is_array($this->shpData['parts'][$part]['points'])
             ) {
                 $this->shpData['parts'][$part] = ['points' => []];
@@ -687,6 +688,7 @@ public function addPoint(array $point, int $partIndex = 0): void
             case 0:
                 //Don't add anything
                 return;
+
             case 1:
             case 11:
             case 21:
@@ -754,7 +756,8 @@ public function deletePoint(int $pointIndex = 0, int $partIndex = 0): void
             case 23:
             case 25:
                 //Deletes the point from the selected part, if exists
-                if (isset($this->shpData['parts'][$partIndex])
+                if (
+                    isset($this->shpData['parts'][$partIndex])
                     && isset($this->shpData['parts'][$partIndex]['points'][$pointIndex])
                 ) {
                     $count = count($this->shpData['parts'][$partIndex]['points']) - 1;

tests/ShapeFileTest.php

@@ -28,6 +28,7 @@
 use PhpMyAdmin\ShapeFile\ShapeFile;
 use PhpMyAdmin\ShapeFile\ShapeRecord;
 use PHPUnit\Framework\TestCase;
+
 use function count;
 
 class ShapeFileTest extends TestCase
@@ -121,6 +122,7 @@ public function testLoadEmptyFilename(): void
 
             return;
         }
+
         $this->assertEquals('Not a SHP file (file code mismatch)', $shp->lastError);
     }
 
@@ -360,10 +362,7 @@ public function testShapeSaveLoad(int $type, array $points): void
                 continue;
             }
 
-            $this->assertEquals(
-                $record->shpData[$item],
-                $record2->shpData[$item]
-            );
+            $this->assertEquals($record->shpData[$item], $record2->shpData[$item]);
         }
 
         /* Test deletion works */