fixes

Author: MatanYadaev

phpinsights.php

@@ -109,6 +109,7 @@
             'exclude' => [
                 'src/SpatialBuilder.php',
                 'src/Objects/Geometry.php',
+                'src/Objects/GeometryCollection.php',
             ],
         ],
         ClassTraitAndInterfaceLengthSniff::class => [

src/Factory.php

@@ -25,11 +25,9 @@
 
 class Factory
 {
-    public static function parse(string $value): Geometry
+    public static function parse(string $value, bool $isWkb): Geometry
     {
-        $isJson = (bool) is_object(json_decode($value));
-
-        if (! $isJson) {
+        if ($isWkb) {
             // MySQL adds 4 NULL bytes at the start of the WKB
             $value = substr($value, 4);
         }

src/Objects/Geometry.php

@@ -32,7 +32,7 @@ public function toJson($options = 0): string
      */
     public static function fromWkb(string $wkb): static
     {
-        $geometry = Factory::parse($wkb);
+        $geometry = Factory::parse($wkb, true);
 
         if (! ($geometry instanceof static)) {
             throw new InvalidArgumentException(
@@ -52,7 +52,7 @@ public static function fromWkb(string $wkb): static
      */
     public static function fromJson(string $geoJson): static
     {
-        $geometry = Factory::parse($geoJson);
+        $geometry = Factory::parse($geoJson, false);
 
         if (! ($geometry instanceof static)) {
             throw new InvalidArgumentException(

src/Objects/GeometryCollection.php

@@ -79,6 +79,45 @@ public function getGeometries(): Collection
         return $this->geometries->collect();
     }
 
+    /**
+     * @param mixed $offset
+     *
+     * @return bool
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->geometries[$offset]);
+    }
+
+    /**
+     * @param mixed $offset
+     *
+     * @return Geometry
+     */
+    public function offsetGet($offset): Geometry
+    {
+        return $this->geometries[$offset];
+    }
+
+    /**
+     * @param mixed $offset
+     * @param Geometry $geometry
+     */
+    public function offsetSet($offset, $geometry): void
+    {
+        $this->geometries[$offset] = $geometry;
+        $this->validateGeometriesType();
+    }
+
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset): void
+    {
+        $this->geometries->splice($offset, 1);
+        $this->validateGeometriesCount();
+    }
+
     /**
      * @throws InvalidArgumentException
      */
@@ -121,41 +160,4 @@ protected function toCollectionWkt(): Expression
 
         return DB::raw($wkb);
     }
-
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->geometries[$offset]);
-    }
-
-    /**
-     * @param mixed $offset
-     * @return Geometry
-     */
-    public function offsetGet($offset): Geometry
-    {
-        return $this->geometries[$offset];
-    }
-
-    /**
-     * @param mixed $offset
-     * @param Geometry $geometry
-     */
-    public function offsetSet($offset, $geometry): void
-    {
-        $this->geometries[$offset] = $geometry;
-        $this->validateGeometriesType();
-    }
-
-    /**
-     * @param mixed $offset
-     */
-    public function offsetUnset($offset): void
-    {
-        $this->geometries->splice($offset, 1);
-        $this->validateGeometriesCount();
-    }
 }