Make Geometry::toWkt parameters optional

Author: Matan Yadaev

src/GeometryCast.php

@@ -29,6 +29,7 @@ public function __construct(string $className)
      * @param  string  $key
      * @param  string|Expression|null  $wkbOrWKt
      * @param  array<string, mixed>  $attributes
+     *
      * @return Geometry|null
      */
     public function get($model, string $key, $wkbOrWKt, array $attributes): ?Geometry
@@ -51,6 +52,7 @@ public function get($model, string $key, $wkbOrWKt, array $attributes): ?Geometr
      * @param  string  $key
      * @param  Geometry|mixed|null  $geometry
      * @param  array<string, mixed>  $attributes
+     *
      * @return Expression|null
      *
      * @throws InvalidArgumentException

src/Objects/Geometry.php

@@ -16,10 +16,11 @@
 
 abstract class Geometry implements Castable, Arrayable, Jsonable, JsonSerializable
 {
-    abstract public function toWkt(bool $withFunction): string;
+    abstract public function toWkt(bool $withFunction = true): string;
 
     /**
      * @param  int  $options
+     *
      * @return string
      *
      * @throws JsonException
@@ -31,6 +32,7 @@ public function toJson($options = 0): string
 
     /**
      * @param  string  $wkb
+     *
      * @return static
      *
      * @throws InvalidArgumentException
@@ -50,6 +52,7 @@ public static function fromWkb(string $wkb): static
 
     /**
      * @param  string  $wkt
+     *
      * @return static
      *
      * @throws InvalidArgumentException
@@ -69,6 +72,7 @@ public static function fromWkt(string $wkt): static
 
     /**
      * @param  string  $geoJson
+     *
      * @return static
      *
      * @throws InvalidArgumentException
@@ -143,6 +147,7 @@ abstract public function getCoordinates(): array;
 
     /**
      * @param  array<string>  $arguments
+     *
      * @return CastsAttributes
      */
     public static function castUsing(array $arguments): CastsAttributes

src/Objects/GeometryCollection.php

@@ -43,11 +43,12 @@ public function __construct(Collection|array $geometries)
 
     /**
      * @param  bool  $withFunction
+     *
      * @return string
      *
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
      */
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = $this->toCollectionWkt(withFunction: true);
 
@@ -94,6 +95,7 @@ public function getGeometries(): Collection
 
     /**
      * @param  int  $offset
+     *
      * @return bool
      */
     public function offsetExists($offset): bool
@@ -103,6 +105,7 @@ public function offsetExists($offset): bool
 
     /**
      * @param  int  $offset
+     *
      * @return TGeometry|null
      */
     public function offsetGet($offset): ?Geometry

src/Objects/LineString.php

@@ -8,7 +8,7 @@ class LineString extends PointCollection
 {
     protected int $minimumGeometries = 2;
 
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = $this->toCollectionWkt(withFunction: false);
 

src/Objects/MultiLineString.php

@@ -18,11 +18,12 @@ class MultiLineString extends GeometryCollection
 
     /**
      * @param  bool  $withFunction
+     *
      * @return string
      *
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
      */
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = $this->toCollectionWkt(withFunction: false);
 

src/Objects/MultiPoint.php

@@ -10,11 +10,12 @@ class MultiPoint extends PointCollection
 
     /**
      * @param  bool  $withFunction
+     *
      * @return string
      *
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
      */
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = $this->toCollectionWkt(withFunction: false);
 

src/Objects/MultiPolygon.php

@@ -18,11 +18,12 @@ class MultiPolygon extends GeometryCollection
 
     /**
      * @param  bool  $withFunction
+     *
      * @return string
      *
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
      */
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = $this->toCollectionWkt(withFunction: false);
 

src/Objects/Point.php

@@ -16,7 +16,7 @@ public function __construct(float $latitude, float $longitude)
         $this->longitude = $longitude;
     }
 
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = "{$this->longitude} {$this->latitude}";
 

src/Objects/Polygon.php

@@ -6,7 +6,7 @@
 
 class Polygon extends MultiLineString
 {
-    public function toWkt(bool $withFunction): string
+    public function toWkt(bool $withFunction = true): string
     {
         $wkt = $this->toCollectionWkt(withFunction: false);