Fix remaining class/variable case

Author: BenMorel

CHANGELOG.md

@@ -51,7 +51,7 @@ The following breaking changes may only affect you if you're writing your own en
 
 🐛 **Bug fixes**
 
-- `WKTParser` and `EWKTParser` now accept both `MULTIPOINT (1 2, 3 4)` and `MULTIPOINT((1 2), (3 4))` syntaxes;
+- `WktParser` and `EwktParser` now accept both `MULTIPOINT (1 2, 3 4)` and `MULTIPOINT((1 2), (3 4))` syntaxes;
   this notably fixes interoperability issues with PostGIS
 
 ## [0.12.0](https://github.com/brick/geo/releases/tag/0.12.0) - 2025-03-09

tests/IO/GeoJsonReaderTest.php

@@ -16,37 +16,37 @@
 class GeoJsonReaderTest extends GeoJsonAbstractTestCase
 {
     /**
-     * @param string $geojson The GeoJSON to read.
+     * @param string $geoJson The GeoJSON to read.
      * @param array  $coords  The expected Geometry coordinates.
      * @param bool   $is3D    Whether the resulting Geometry has a Z coordinate.
      * @param bool   $lenient Whether to be lenient about case-sensitivity.
      */
     #[DataProvider('providerReadGeometry')]
-    public function testReadGeometry(string $geojson, array $coords, bool $is3D, bool $lenient) : void
+    public function testReadGeometry(string $geoJson, array $coords, bool $is3D, bool $lenient) : void
     {
-        $geometry = (new GeoJsonReader($lenient))->read($geojson);
+        $geometry = (new GeoJsonReader($lenient))->read($geoJson);
         $this->assertGeometryContents($geometry, $coords, $is3D, false, 4326);
     }
 
     public static function providerReadGeometry() : \Generator
     {
-        foreach (self::providerGeometryGeoJson() as [$geojson, $coords, $is3D]) {
-            yield [$geojson, $coords, $is3D, false];
-            yield [self::alterCase($geojson), $coords, $is3D, true];
+        foreach (self::providerGeometryGeoJson() as [$geoJson, $coords, $is3D]) {
+            yield [$geoJson, $coords, $is3D, false];
+            yield [self::alterCase($geoJson), $coords, $is3D, true];
         }
     }
 
     /**
-     * @param string        $geojson    The GeoJSON to read.
+     * @param string        $geoJson    The GeoJSON to read.
      * @param stdClass|null $properties The contained properties.
      * @param array|null    $coords     The expected Geometry coordinates, or null if the Feature has no geometry.
      * @param bool          $is3D       Whether the resulting Geometry has a Z coordinate.
      * @param bool          $lenient    Whether to be lenient about case-sensitivity.
      */
     #[DataProvider('providerReadFeature')]
-    public function testReadFeature(string $geojson, ?stdClass $properties, ?array $coords, bool $is3D, bool $lenient) : void
+    public function testReadFeature(string $geoJson, ?stdClass $properties, ?array $coords, bool $is3D, bool $lenient) : void
     {
-        $feature = (new GeoJsonReader($lenient))->read($geojson);
+        $feature = (new GeoJsonReader($lenient))->read($geoJson);
 
         self::assertInstanceOf(Feature::class, $feature);
         self::assertEquals($properties, $feature->getProperties());
@@ -62,22 +62,22 @@ public function testReadFeature(string $geojson, ?stdClass $properties, ?array $
 
     public static function providerReadFeature() : \Generator
     {
-        foreach (self::providerFeatureGeoJson() as [$geojson, $properties, $coords, $is3D]) {
-            yield [$geojson, $properties, $coords, $is3D, false];
-            yield [self::alterCase($geojson), $properties, $coords, $is3D, true];
+        foreach (self::providerFeatureGeoJson() as [$geoJson, $properties, $coords, $is3D]) {
+            yield [$geoJson, $properties, $coords, $is3D, false];
+            yield [self::alterCase($geoJson), $properties, $coords, $is3D, true];
         }
     }
 
     /**
-     * @param string  $geojson The GeoJSON to read.
+     * @param string  $geoJson The GeoJSON to read.
      * @param array[] $coords  The expected Point coordinates.
      * @param bool[]  $is3D    Whether the resulting Point has a Z coordinate.
      * @param bool    $lenient Whether to be lenient about case-sensitivity.
      */
     #[DataProvider('providerReadFeatureCollection')]
-    public function testReadFeatureCollection(string $geojson, array $properties, array $coords, array $is3D, bool $lenient) : void
+    public function testReadFeatureCollection(string $geoJson, array $properties, array $coords, array $is3D, bool $lenient) : void
     {
-        $featureCollection = (new GeoJsonReader($lenient))->read($geojson);
+        $featureCollection = (new GeoJsonReader($lenient))->read($geoJson);
 
         self::assertInstanceOf(FeatureCollection::class, $featureCollection);
 
@@ -90,9 +90,9 @@ public function testReadFeatureCollection(string $geojson, array $properties, ar
 
     public static function providerReadFeatureCollection() : \Generator
     {
-        foreach (self::providerFeatureCollectionGeoJson() as [$geojson, $properties, $coords, $is3D]) {
-            yield [$geojson, $properties, $coords, $is3D, false];
-            yield [self::alterCase($geojson), $properties, $coords, $is3D, true];
+        foreach (self::providerFeatureCollectionGeoJson() as [$geoJson, $properties, $coords, $is3D]) {
+            yield [$geoJson, $properties, $coords, $is3D, false];
+            yield [self::alterCase($geoJson), $properties, $coords, $is3D, true];
         }
     }
 
@@ -248,14 +248,14 @@ public function testNestedGeometryCollectionInLenientMode(): void
     }
 
     #[DataProvider('providerWrongCaseTypeInNonLenientMode')]
-    public function testWrongCaseTypeInNonLenientMode(string $geojson, string $expectedExceptionMessage) : void
+    public function testWrongCaseTypeInNonLenientMode(string $geoJson, string $expectedExceptionMessage) : void
     {
         $reader = new GeoJsonReader();
 
         $this->expectException(GeometryIoException::class);
         $this->expectExceptionMessage($expectedExceptionMessage);
 
-        $reader->read($geojson);
+        $reader->read($geoJson);
     }
 
     public static function providerWrongCaseTypeInNonLenientMode() : \Generator
@@ -285,10 +285,10 @@ public static function providerWrongCaseTypeInNonLenientMode() : \Generator
     /**
      * Changes the case of type attributes.
      */
-    private static function alterCase(string $geojson) : string
+    private static function alterCase(string $geoJson) : string
     {
         $callback = fn(array $matches): string => $matches[1] . strtoupper($matches[2]);
 
-        return preg_replace_callback('/("type"\s*\:\s*)("[^"]+")/', $callback, $geojson);
+        return preg_replace_callback('/("type"\s*\:\s*)("[^"]+")/', $callback, $geoJson);
     }
 }

tests/IO/GeoJsonWriterTest.php

@@ -17,12 +17,12 @@ class GeoJsonWriterTest extends GeoJsonAbstractTestCase
     #[DataProvider('providerGeometryGeoJson')]
     #[DataProvider('providerFeatureGeoJson')]
     #[DataProvider('providerFeatureCollectionGeoJson')]
-    public function testWriteGeometry(string $geojson) : void
+    public function testWriteGeometry(string $geoJson) : void
     {
-        $geometry = (new GeoJsonReader())->read($geojson);
+        $geometry = (new GeoJsonReader())->read($geoJson);
         $geometryGeoJson = (new GeoJsonWriter())->write($geometry);
 
-        self::assertSame($geojson, $geometryGeoJson);
+        self::assertSame($geoJson, $geometryGeoJson);
     }
 
     public function testPrettyPrint() : void