Require enums in interface signatures

geo-io · Jan 17, 2022 · f9a7e36 · f9a7e36
1 parent 43d909e
commit f9a7e36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/Extractor.php b/src/Extractor.php
@@ -13,17 +13,13 @@ public function supports(mixed $geometry): bool;
 
     /**
      * Extracts the type of the given geometry.
-     *
-     * Must return one of the GeometryType::* constants.
      */
-    public function extractType(mixed $geometry): string;
+    public function extractType(mixed $geometry): GeometryType;
 
     /**
      * Extracts the dimension of the given geometry.
-     *
-     * Must return one of the Dimension::* constants.
      */
-    public function extractDimension(mixed $geometry): string;
+    public function extractDimension(mixed $geometry): Dimension;
 
     /**
      * Extracts the SRID of the given geometry.

diff --git a/src/Factory.php b/src/Factory.php
@@ -12,7 +12,7 @@ interface Factory
      * If the Coordinates argument is `null`, it should create an empty point.
      */
     public function createPoint(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         ?Coordinates $coordinates,
     ): mixed;
@@ -27,7 +27,7 @@ public function createPoint(
      * LineString.
      */
     public function createLineString(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $points,
     ): mixed;
@@ -46,7 +46,7 @@ public function createLineString(
      * LinearRing, it can return a LineString instead.
      */
     public function createLinearRing(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $points,
     ): mixed;
@@ -62,7 +62,7 @@ public function createLinearRing(
      * Polygon.
      */
     public function createPolygon(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $linearRings,
     ): mixed;
@@ -78,7 +78,7 @@ public function createPolygon(
      * MultiPoint.
      */
     public function createMultiPoint(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $points,
     ): mixed;
@@ -94,7 +94,7 @@ public function createMultiPoint(
      * MultiLineString.
      */
     public function createMultiLineString(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $lineStrings,
     ): mixed;
@@ -110,7 +110,7 @@ public function createMultiLineString(
      * MultiPolygon.
      */
     public function createMultiPolygon(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $polygons,
     ): mixed;
@@ -126,7 +126,7 @@ public function createMultiPolygon(
      * GeometryCollection.
      */
     public function createGeometryCollection(
-        string $dimension,
+        Dimension $dimension,
         ?int $srid,
         iterable $geometries,
     ): mixed;