move invalid argument exception to same interface

jmikola · Dec 4, 2023 · 89e17fb · 89e17fb
1 parent 845c70b
commit 89e17fb
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 15 deletions.
diff --git a/src/BoundingBox.php b/src/BoundingBox.php
@@ -4,8 +4,8 @@
 
 namespace GeoJson;
 
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\Exception\UnserializationException;
-use InvalidArgumentException;
 use JsonSerializable;
 
 use function count;

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GeoJson\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements Exception
+{
+}
diff --git a/src/Feature/FeatureCollection.php b/src/Feature/FeatureCollection.php
@@ -8,8 +8,8 @@
 use Countable;
 use GeoJson\BoundingBox;
 use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\GeoJson;
-use InvalidArgumentException;
 use IteratorAggregate;
 use Traversable;
 

diff --git a/src/Geometry/GeometryCollection.php b/src/Geometry/GeometryCollection.php
@@ -8,7 +8,7 @@
 use Countable;
 use GeoJson\BoundingBox;
 use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
-use InvalidArgumentException;
+use GeoJson\Exception\InvalidArgumentException;
 use IteratorAggregate;
 use Traversable;
 

diff --git a/src/Geometry/LineString.php b/src/Geometry/LineString.php
@@ -6,7 +6,7 @@
 
 use GeoJson\BoundingBox;
 use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
-use InvalidArgumentException;
+use GeoJson\Exception\InvalidArgumentException;
 
 use function count;
 

diff --git a/src/Geometry/LinearRing.php b/src/Geometry/LinearRing.php
@@ -6,7 +6,7 @@
 
 use GeoJson\BoundingBox;
 use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
-use InvalidArgumentException;
+use GeoJson\Exception\InvalidArgumentException;
 
 use function count;
 use function end;

diff --git a/src/Geometry/Point.php b/src/Geometry/Point.php
@@ -6,7 +6,7 @@
 
 use GeoJson\BoundingBox;
 use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
-use InvalidArgumentException;
+use GeoJson\Exception\InvalidArgumentException;
 
 use function count;
 use function is_float;

diff --git a/tests/BoundingBoxTest.php b/tests/BoundingBoxTest.php
@@ -5,9 +5,9 @@
 namespace GeoJson\Tests;
 
 use GeoJson\BoundingBox;
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\Exception\UnserializationException;
 use GeoJson\JsonUnserializable;
-use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 

diff --git a/tests/Feature/FeatureCollectionTest.php b/tests/Feature/FeatureCollectionTest.php
@@ -4,13 +4,13 @@
 
 namespace GeoJson\Tests\Feature;
 
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\Exception\UnserializationException;
 use GeoJson\Feature\Feature;
 use GeoJson\Feature\FeatureCollection;
 use GeoJson\GeoJson;
 use GeoJson\Geometry\Point;
 use GeoJson\Tests\BaseGeoJsonTest;
-use InvalidArgumentException;
 use stdClass;
 
 use function is_subclass_of;

diff --git a/tests/Geometry/GeometryCollectionTest.php b/tests/Geometry/GeometryCollectionTest.php
@@ -4,13 +4,13 @@
 
 namespace GeoJson\Tests\Geometry;
 
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\Exception\UnserializationException;
 use GeoJson\GeoJson;
 use GeoJson\Geometry\Geometry;
 use GeoJson\Geometry\GeometryCollection;
 use GeoJson\Geometry\Point;
 use GeoJson\Tests\BaseGeoJsonTest;
-use InvalidArgumentException;
 use stdClass;
 
 use function is_subclass_of;

diff --git a/tests/Geometry/LineStringTest.php b/tests/Geometry/LineStringTest.php
@@ -4,11 +4,11 @@
 
 namespace GeoJson\Tests\Geometry;
 
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\GeoJson;
 use GeoJson\Geometry\LineString;
 use GeoJson\Geometry\MultiPoint;
 use GeoJson\Tests\BaseGeoJsonTest;
-use InvalidArgumentException;
 
 use function is_subclass_of;
 use function json_decode;

diff --git a/tests/Geometry/LinearRingTest.php b/tests/Geometry/LinearRingTest.php
@@ -4,12 +4,11 @@
 
 namespace GeoJson\Tests\Geometry;
 
-use GeoJson\GeoJson;
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\Geometry\LinearRing;
 use GeoJson\Geometry\LineString;
 use GeoJson\Geometry\Point;
 use GeoJson\Tests\BaseGeoJsonTest;
-use InvalidArgumentException;
 
 use function is_subclass_of;
 
@@ -72,11 +71,11 @@ public function testSerialization(): void
         $linearRing = new LinearRing($coordinates);
 
         $expected = [
-            'type' => GeoJson::TYPE_LINE_STRING,
+            'type' => 'LineString',
             'coordinates' => $coordinates,
         ];
 
-        $this->assertSame(GeoJson::TYPE_LINE_STRING, $linearRing->getType());
+        $this->assertSame('LineString', $linearRing->getType());
         $this->assertSame($coordinates, $linearRing->getCoordinates());
         $this->assertSame($expected, $linearRing->jsonSerialize());
     }

diff --git a/tests/Geometry/PointTest.php b/tests/Geometry/PointTest.php
@@ -4,11 +4,11 @@
 
 namespace GeoJson\Tests\Geometry;
 
+use GeoJson\Exception\InvalidArgumentException;
 use GeoJson\GeoJson;
 use GeoJson\Geometry\Geometry;
 use GeoJson\Geometry\Point;
 use GeoJson\Tests\BaseGeoJsonTest;
-use InvalidArgumentException;
 use stdClass;
 
 use function func_get_args;