Style CI fix 🎭

grimzy · Chrissi2812 · commit 84ed34abd848 · 2018-12-18T17:04:25.000+01:00
(cherry picked from commit 8add88a)
diff --git a/src/Exceptions/InvalidGeoJsonException.php b/src/Exceptions/InvalidGeoJsonException.php
@@ -4,4 +4,4 @@
 
 class InvalidGeoJsonException extends \RuntimeException
 {
-}
+}
diff --git a/src/Types/Geometry.php b/src/Types/Geometry.php
@@ -72,20 +72,22 @@ public static function fromWKT($wkt)
         return static::fromString($wktArgument);
     }
 
-    public static function fromJson($geoJson) {
-        if(is_string($geoJson)) {
+    public static function fromJson($geoJson)
+    {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if($geoJson->getType() === 'FeatureCollection') {
+        if ($geoJson->getType() === 'FeatureCollection') {
             return GeometryCollection::fromJson($geoJson);
         }
 
-        if($geoJson->getType() === 'Feature') {
+        if ($geoJson->getType() === 'Feature') {
             $geoJson = $geoJson->getGeometry();
         }
 
         $type = '\Grimzy\LaravelMysqlSpatial\Types\\'.$geoJson->getType();
+
         return $type::fromJson($geoJson);
     }
 
diff --git a/src/Types/GeometryCollection.php b/src/Types/GeometryCollection.php
@@ -110,22 +110,22 @@ public function count()
         return count($this->items);
     }
 
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, FeatureCollection::class)) {
-            throw new InvalidGeoJsonException('Expected ' . FeatureCollection::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, FeatureCollection::class)) {
+            throw new InvalidGeoJsonException('Expected '.FeatureCollection::class.', got '.get_class($geoJson));
         }
 
         $set = [];
         foreach ($geoJson->getFeatures() as $feature) {
             $set[] = parent::fromJson($feature);
         }
 
-        return new GeometryCollection($set);
+        return new self($set);
     }
 
     /**
diff --git a/src/Types/LineString.php b/src/Types/LineString.php
@@ -35,22 +35,22 @@ public function __toString()
         return $this->toPairList();
     }
 
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, GeoJsonLineString::class)) {
-            throw new InvalidGeoJsonException('Expected ' . GeoJsonLineString::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, GeoJsonLineString::class)) {
+            throw new InvalidGeoJsonException('Expected '.GeoJsonLineString::class.', got '.get_class($geoJson));
         }
 
         $set = [];
-        foreach($geoJson->getCoordinates() as $coordinate) {
+        foreach ($geoJson->getCoordinates() as $coordinate) {
             $set[] = new Point($coordinate[1], $coordinate[0]);
         }
 
-        return new LineString($set);
+        return new self($set);
     }
 
     /**
diff --git a/src/Types/MultiLineString.php b/src/Types/MultiLineString.php
@@ -65,26 +65,26 @@ public function offsetSet($offset, $value)
         parent::offsetSet($offset, $value);
     }
 
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, GeoJsonMultiLineString::class)) {
-            throw new InvalidGeoJsonException('Expected ' . GeoJsonMultiLineString::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, GeoJsonMultiLineString::class)) {
+            throw new InvalidGeoJsonException('Expected '.GeoJsonMultiLineString::class.', got '.get_class($geoJson));
         }
 
         $set = [];
-        foreach($geoJson->getCoordinates() as $coordinates) {
+        foreach ($geoJson->getCoordinates() as $coordinates) {
             $points = [];
-            foreach($coordinates as $coordinate) {
+            foreach ($coordinates as $coordinate) {
                 $points[] = new Point($coordinate[1], $coordinate[0]);
             }
             $set[] = new LineString($points);
         }
 
-        return new MultiLineString($set);
+        return new self($set);
     }
 
     /**
diff --git a/src/Types/MultiPoint.php b/src/Types/MultiPoint.php
@@ -39,22 +39,22 @@ public function __toString()
         }, $this->items));
     }
 
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, GeoJsonMultiPoint::class)) {
-            throw new InvalidGeoJsonException('Expected ' . GeoJsonMultiPoint::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, GeoJsonMultiPoint::class)) {
+            throw new InvalidGeoJsonException('Expected '.GeoJsonMultiPoint::class.', got '.get_class($geoJson));
         }
 
         $set = [];
-        foreach($geoJson->getCoordinates() as $coordinate) {
+        foreach ($geoJson->getCoordinates() as $coordinate) {
             $set[] = new Point($coordinate[1], $coordinate[0]);
         }
 
-        return new MultiPoint($set);
+        return new self($set);
     }
 
     /**
diff --git a/src/Types/MultiPolygon.php b/src/Types/MultiPolygon.php
@@ -100,30 +100,30 @@ public function offsetSet($offset, $value)
         parent::offsetSet($offset, $value);
     }
 
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, GeoJsonMultiPolygon::class)) {
-            throw new InvalidGeoJsonException('Expected ' . GeoJsonMultiPolygon::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, GeoJsonMultiPolygon::class)) {
+            throw new InvalidGeoJsonException('Expected '.GeoJsonMultiPolygon::class.', got '.get_class($geoJson));
         }
 
         $set = [];
-        foreach($geoJson->getCoordinates() as $polygonCoordinates) {
+        foreach ($geoJson->getCoordinates() as $polygonCoordinates) {
             $lineStrings = [];
-            foreach($polygonCoordinates as $lineStringCoordinates) {
+            foreach ($polygonCoordinates as $lineStringCoordinates) {
                 $points = [];
-                foreach($lineStringCoordinates as $lineStringCoordinate) {
+                foreach ($lineStringCoordinates as $lineStringCoordinate) {
                     $points[] = new Point($lineStringCoordinate[1], $lineStringCoordinate[0]);
                 }
                 $lineStrings[] = new LineString($points);
             }
             $set[] = new Polygon($lineStrings);
         }
 
-        return new MultiPolygon($set);
+        return new self($set);
     }
 
     /**
diff --git a/src/Types/Point.php b/src/Types/Point.php
@@ -67,20 +67,22 @@ public function __toString()
 
     /**
      * @param $geoJson  \GeoJson\Feature\Feature|string
+     *
      * @return \Grimzy\LaravelMysqlSpatial\Types\Point
      */
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, GeoJsonPoint::class)) {
-            throw new InvalidGeoJsonException('Expected ' . GeoJsonPoint::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, GeoJsonPoint::class)) {
+            throw new InvalidGeoJsonException('Expected '.GeoJsonPoint::class.', got '.get_class($geoJson));
         }
 
         $coordinates = $geoJson->getCoordinates();
-        return new Point($coordinates[1], $coordinates[0]);
+
+        return new self($coordinates[1], $coordinates[0]);
     }
 
     /**
diff --git a/src/Types/Polygon.php b/src/Types/Polygon.php
@@ -13,26 +13,26 @@ public function toWKT()
         return sprintf('POLYGON(%s)', (string) $this);
     }
 
-    public static function fromJson ($geoJson)
+    public static function fromJson($geoJson)
     {
-        if(is_string($geoJson)) {
+        if (is_string($geoJson)) {
             $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
         }
 
-        if(!is_a($geoJson, GeoJsonPolygon::class)) {
-            throw new InvalidGeoJsonException('Expected ' . GeoJsonPolygon::class . ', got ' . get_class($geoJson));
+        if (!is_a($geoJson, GeoJsonPolygon::class)) {
+            throw new InvalidGeoJsonException('Expected '.GeoJsonPolygon::class.', got '.get_class($geoJson));
         }
 
         $set = [];
-        foreach($geoJson->getCoordinates() as $coordinates) {
+        foreach ($geoJson->getCoordinates() as $coordinates) {
             $points = [];
-            foreach($coordinates as $coordinate) {
+            foreach ($coordinates as $coordinate) {
                 $points[] = new Point($coordinate[1], $coordinate[0]);
             }
             $set[] = new LineString($points);
         }
 
-        return new Polygon($set);
+        return new self($set);
     }
 
     /**
diff --git a/tests/Unit/Eloquent/SpatialTraitTest.php b/tests/Unit/Eloquent/SpatialTraitTest.php
@@ -192,14 +192,16 @@ public function testInsertUpdateGeometryCollectionHasCorrectSql()
         $this->assertContains("GeomFromText('GEOMETRYCOLLECTION(POINT(2 1),LINESTRING(3 2,3 3))')", $this->queries[1]);
     }
 
-    public function testSettingRawAttributes() {
+    public function testSettingRawAttributes()
+    {
         $attributes['point'] = '0101000000000000000000f03f0000000000000040';
 
         $this->model->setRawAttributes($attributes);
         $this->assertInstanceOf(Point::class, ($this->model->point));
     }
 
-    public function testSpatialFieldsNotDefinedException() {
+    public function testSpatialFieldsNotDefinedException()
+    {
         $model = new TestNoSpatialModel();
         $this->setExpectedException(SpatialFieldsNotDefinedException::class);
         $model->getSpatialFields();
@@ -403,7 +405,8 @@ public function testmodels()
     }
 }
 
-class TestNoSpatialModel extends Model {
+class TestNoSpatialModel extends Model
+{
     use \Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 }
 
diff --git a/tests/Unit/Types/GeometryCollectionTest.php b/tests/Unit/Types/GeometryCollectionTest.php
@@ -89,7 +89,8 @@ public function testArrayAccess()
         $geometryCollection[] = 1;
     }
 
-    public function testFromJson() {
+    public function testFromJson()
+    {
         $geometryCollection = GeometryCollection::fromJson('{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[1,2]}},{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[3,4]}}]}');
         $this->assertInstanceOf(GeometryCollection::class, $geometryCollection);
         $geometryCollectionPoints = $geometryCollection->getGeometries();
@@ -98,7 +99,8 @@ public function testFromJson() {
         $this->assertEquals(new Point(4, 3), $geometryCollectionPoints[1]);
     }
 
-    public function testInvalidGeoJsonException() {
+    public function testInvalidGeoJsonException()
+    {
         $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         GeometryCollection::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
diff --git a/tests/Unit/Types/GeometryTest.php b/tests/Unit/Types/GeometryTest.php
@@ -123,7 +123,8 @@ public function testFromJsonMultiLineString()
         $this->assertEquals(new Point(3, 2), $multiLineStringLineStrings[1][2]);
     }
 
-    public function testFromJsonMultiPolygon() {
+    public function testFromJsonMultiPolygon()
+    {
         $multiPolygon = Geometry::fromJson('{"type":"MultiPolygon","coordinates":[[[[1,1],[1,2],[2,2],[2,1],[1,1]]],[[[0,0],[0,1],[1,1],[1,0],[0,0]]]]}');
         $this->assertInstanceOf(MultiPolygon::class, $multiPolygon);
         $multiPolygonPolygons = $multiPolygon->getGeometries();
@@ -133,25 +134,27 @@ public function testFromJsonMultiPolygon() {
             new Point(2, 1),
             new Point(2, 2),
             new Point(1, 2),
-            new Point(1, 1)
+            new Point(1, 1),
         ])]), $multiPolygonPolygons[0]);
         $this->assertEquals(new Polygon([new LineString([
             new Point(0, 0),
             new Point(1, 0),
             new Point(1, 1),
             new Point(0, 1),
-            new Point(0, 0)
+            new Point(0, 0),
         ])]), $multiPolygonPolygons[1]);
     }
 
-    public function testFromJsonPointFeature() {
+    public function testFromJsonPointFeature()
+    {
         $point = Geometry::fromJson('{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[3.4,1.2]}}');
         $this->assertInstanceOf(Point::class, $point);
         $this->assertEquals(1.2, $point->getLat());
         $this->assertEquals(3.4, $point->getLng());
     }
-    
-    public function testFromJsonMultiPointFeatureCollection() {
+
+    public function testFromJsonMultiPointFeatureCollection()
+    {
         $geometryCollection = Geometry::fromJson('{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[1,2]}},{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[3,4]}}]}');
         $this->assertInstanceOf(GeometryCollection::class, $geometryCollection);
         $geometryCollectionPoints = $geometryCollection->getGeometries();
diff --git a/tests/Unit/Types/LineStringTest.php b/tests/Unit/Types/LineStringTest.php
@@ -34,15 +34,17 @@ public function testToString()
         $this->assertEquals('0 0,1 1,2 2', (string) $linestring);
     }
 
-    public function testFromJson() {
+    public function testFromJson()
+    {
         $lineString = LineString::fromJson('{"type": "LineString","coordinates":[[1,1],[2,2]]}');
         $this->assertInstanceOf(LineString::class, $lineString);
         $lineStringPoints = $lineString->getGeometries();
         $this->assertEquals(new Point(1, 1), $lineStringPoints[0]);
         $this->assertEquals(new Point(2, 2), $lineStringPoints[1]);
     }
 
-    public function testInvalidGeoJsonException() {
+    public function testInvalidGeoJsonException()
+    {
         $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         LineString::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
diff --git a/tests/Unit/Types/MultiLineStringTest.php b/tests/Unit/Types/MultiLineStringTest.php
@@ -29,7 +29,8 @@ public function testToWKT()
         $this->assertSame('MULTILINESTRING((0 0,1 0,1 1,0 1,0 0))', $multilinestring->toWKT());
     }
 
-    public function testFromJson() {
+    public function testFromJson()
+    {
         $multiLineString = MultiLineString::fromJson('{"type":"MultiLineString","coordinates":[[[1,1],[1,2],[1,3]],[[2,1],[2,2],[2,3]]]}');
         $this->assertInstanceOf(MultiLineString::class, $multiLineString);
         $multiLineStringLineStrings = $multiLineString->getGeometries();
@@ -42,7 +43,8 @@ public function testFromJson() {
         $this->assertEquals(new Point(3, 2), $multiLineStringLineStrings[1][2]);
     }
 
-    public function testInvalidGeoJsonException() {
+    public function testInvalidGeoJsonException()
+    {
         $this->setExpectedException(\Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException::class);
         MultiLineString::fromJson('{"type":"Point","coordinates":[3.4,1.2]}');
     }
diff --git a/tests/Unit/Types/MultiPointTest.php b/tests/Unit/Types/MultiPointTest.php
diff --git a/tests/Unit/Types/MultiPolygonTest.php b/tests/Unit/Types/MultiPolygonTest.php
diff --git a/tests/Unit/Types/PointTest.php b/tests/Unit/Types/PointTest.php
diff --git a/tests/Unit/Types/PolygonTest.php b/tests/Unit/Types/PolygonTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`class InvalidGeoJsonException extends \RuntimeException`
`6`	`6`	`{`
`7`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -72,20 +72,22 @@ public static function fromWKT($wkt)`
`72`	`72`	`return static::fromString($wktArgument);`
`73`	`73`	`}`
`74`	`74`
`75`		`- public static function fromJson($geoJson) {`
`76`		`- if(is_string($geoJson)) {`
	`75`	`+ public static function fromJson($geoJson)`
	`76`	`+ {`
	`77`	`+ if (is_string($geoJson)) {`
`77`	`78`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`78`	`79`	`}`
`79`	`80`
`80`		`- if($geoJson->getType() === 'FeatureCollection') {`
	`81`	`+ if ($geoJson->getType() === 'FeatureCollection') {`
`81`	`82`	`return GeometryCollection::fromJson($geoJson);`
`82`	`83`	`}`
`83`	`84`
`84`		`- if($geoJson->getType() === 'Feature') {`
	`85`	`+ if ($geoJson->getType() === 'Feature') {`
`85`	`86`	`$geoJson = $geoJson->getGeometry();`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`$type = '\Grimzy\LaravelMysqlSpatial\Types\\'.$geoJson->getType();`
	`90`	`+`
`89`	`91`	`return $type::fromJson($geoJson);`
`90`	`92`	`}`
`91`	`93`
Original file line number	Diff line number	Diff line change
`@@ -110,22 +110,22 @@ public function count()`
`110`	`110`	`return count($this->items);`
`111`	`111`	`}`
`112`	`112`
`113`		`- public static function fromJson ($geoJson)`
	`113`	`+ public static function fromJson($geoJson)`
`114`	`114`	`{`
`115`		`- if(is_string($geoJson)) {`
	`115`	`+ if (is_string($geoJson)) {`
`116`	`116`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`117`	`117`	`}`
`118`	`118`
`119`		`- if(!is_a($geoJson, FeatureCollection::class)) {`
`120`		`- throw new InvalidGeoJsonException('Expected ' . FeatureCollection::class . ', got ' . get_class($geoJson));`
	`119`	`+ if (!is_a($geoJson, FeatureCollection::class)) {`
	`120`	`+ throw new InvalidGeoJsonException('Expected '.FeatureCollection::class.', got '.get_class($geoJson));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`$set = [];`
`124`	`124`	`foreach ($geoJson->getFeatures() as $feature) {`
`125`	`125`	`$set[] = parent::fromJson($feature);`
`126`	`126`	`}`
`127`	`127`
`128`		`- return new GeometryCollection($set);`
	`128`	`+ return new self($set);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,22 +35,22 @@ public function __toString()`
`35`	`35`	`return $this->toPairList();`
`36`	`36`	`}`
`37`	`37`
`38`		`- public static function fromJson ($geoJson)`
	`38`	`+ public static function fromJson($geoJson)`
`39`	`39`	`{`
`40`		`- if(is_string($geoJson)) {`
	`40`	`+ if (is_string($geoJson)) {`
`41`	`41`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`42`	`42`	`}`
`43`	`43`
`44`		`- if(!is_a($geoJson, GeoJsonLineString::class)) {`
`45`		`- throw new InvalidGeoJsonException('Expected ' . GeoJsonLineString::class . ', got ' . get_class($geoJson));`
	`44`	`+ if (!is_a($geoJson, GeoJsonLineString::class)) {`
	`45`	`+ throw new InvalidGeoJsonException('Expected '.GeoJsonLineString::class.', got '.get_class($geoJson));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$set = [];`
`49`		`- foreach($geoJson->getCoordinates() as $coordinate) {`
	`49`	`+ foreach ($geoJson->getCoordinates() as $coordinate) {`
`50`	`50`	`$set[] = new Point($coordinate[1], $coordinate[0]);`
`51`	`51`	`}`
`52`	`52`
`53`		`- return new LineString($set);`
	`53`	`+ return new self($set);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,26 +65,26 @@ public function offsetSet($offset, $value)`
`65`	`65`	`parent::offsetSet($offset, $value);`
`66`	`66`	`}`
`67`	`67`
`68`		`- public static function fromJson ($geoJson)`
	`68`	`+ public static function fromJson($geoJson)`
`69`	`69`	`{`
`70`		`- if(is_string($geoJson)) {`
	`70`	`+ if (is_string($geoJson)) {`
`71`	`71`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`72`	`72`	`}`
`73`	`73`
`74`		`- if(!is_a($geoJson, GeoJsonMultiLineString::class)) {`
`75`		`- throw new InvalidGeoJsonException('Expected ' . GeoJsonMultiLineString::class . ', got ' . get_class($geoJson));`
	`74`	`+ if (!is_a($geoJson, GeoJsonMultiLineString::class)) {`
	`75`	`+ throw new InvalidGeoJsonException('Expected '.GeoJsonMultiLineString::class.', got '.get_class($geoJson));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`$set = [];`
`79`		`- foreach($geoJson->getCoordinates() as $coordinates) {`
	`79`	`+ foreach ($geoJson->getCoordinates() as $coordinates) {`
`80`	`80`	`$points = [];`
`81`		`- foreach($coordinates as $coordinate) {`
	`81`	`+ foreach ($coordinates as $coordinate) {`
`82`	`82`	`$points[] = new Point($coordinate[1], $coordinate[0]);`
`83`	`83`	`}`
`84`	`84`	`$set[] = new LineString($points);`
`85`	`85`	`}`
`86`	`86`
`87`		`- return new MultiLineString($set);`
	`87`	`+ return new self($set);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,22 @@ public function __toString()`
`39`	`39`	`}, $this->items));`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static function fromJson ($geoJson)`
	`42`	`+ public static function fromJson($geoJson)`
`43`	`43`	`{`
`44`		`- if(is_string($geoJson)) {`
	`44`	`+ if (is_string($geoJson)) {`
`45`	`45`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`46`	`46`	`}`
`47`	`47`
`48`		`- if(!is_a($geoJson, GeoJsonMultiPoint::class)) {`
`49`		`- throw new InvalidGeoJsonException('Expected ' . GeoJsonMultiPoint::class . ', got ' . get_class($geoJson));`
	`48`	`+ if (!is_a($geoJson, GeoJsonMultiPoint::class)) {`
	`49`	`+ throw new InvalidGeoJsonException('Expected '.GeoJsonMultiPoint::class.', got '.get_class($geoJson));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$set = [];`
`53`		`- foreach($geoJson->getCoordinates() as $coordinate) {`
	`53`	`+ foreach ($geoJson->getCoordinates() as $coordinate) {`
`54`	`54`	`$set[] = new Point($coordinate[1], $coordinate[0]);`
`55`	`55`	`}`
`56`	`56`
`57`		`- return new MultiPoint($set);`
	`57`	`+ return new self($set);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -100,30 +100,30 @@ public function offsetSet($offset, $value)`
`100`	`100`	`parent::offsetSet($offset, $value);`
`101`	`101`	`}`
`102`	`102`
`103`		`- public static function fromJson ($geoJson)`
	`103`	`+ public static function fromJson($geoJson)`
`104`	`104`	`{`
`105`		`- if(is_string($geoJson)) {`
	`105`	`+ if (is_string($geoJson)) {`
`106`	`106`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`107`	`107`	`}`
`108`	`108`
`109`		`- if(!is_a($geoJson, GeoJsonMultiPolygon::class)) {`
`110`		`- throw new InvalidGeoJsonException('Expected ' . GeoJsonMultiPolygon::class . ', got ' . get_class($geoJson));`
	`109`	`+ if (!is_a($geoJson, GeoJsonMultiPolygon::class)) {`
	`110`	`+ throw new InvalidGeoJsonException('Expected '.GeoJsonMultiPolygon::class.', got '.get_class($geoJson));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`$set = [];`
`114`		`- foreach($geoJson->getCoordinates() as $polygonCoordinates) {`
	`114`	`+ foreach ($geoJson->getCoordinates() as $polygonCoordinates) {`
`115`	`115`	`$lineStrings = [];`
`116`		`- foreach($polygonCoordinates as $lineStringCoordinates) {`
	`116`	`+ foreach ($polygonCoordinates as $lineStringCoordinates) {`
`117`	`117`	`$points = [];`
`118`		`- foreach($lineStringCoordinates as $lineStringCoordinate) {`
	`118`	`+ foreach ($lineStringCoordinates as $lineStringCoordinate) {`
`119`	`119`	`$points[] = new Point($lineStringCoordinate[1], $lineStringCoordinate[0]);`
`120`	`120`	`}`
`121`	`121`	`$lineStrings[] = new LineString($points);`
`122`	`122`	`}`
`123`	`123`	`$set[] = new Polygon($lineStrings);`
`124`	`124`	`}`
`125`	`125`
`126`		`- return new MultiPolygon($set);`
	`126`	`+ return new self($set);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -67,20 +67,22 @@ public function __toString()`
`67`	`67`
`68`	`68`	`/**`
`69`	`69`	`* @param $geoJson \GeoJson\Feature\Feature\|string`
	`70`	`+ *`
`70`	`71`	`* @return \Grimzy\LaravelMysqlSpatial\Types\Point`
`71`	`72`	`*/`
`72`		`- public static function fromJson ($geoJson)`
	`73`	`+ public static function fromJson($geoJson)`
`73`	`74`	`{`
`74`		`- if(is_string($geoJson)) {`
	`75`	`+ if (is_string($geoJson)) {`
`75`	`76`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`76`	`77`	`}`
`77`	`78`
`78`		`- if(!is_a($geoJson, GeoJsonPoint::class)) {`
`79`		`- throw new InvalidGeoJsonException('Expected ' . GeoJsonPoint::class . ', got ' . get_class($geoJson));`
	`79`	`+ if (!is_a($geoJson, GeoJsonPoint::class)) {`
	`80`	`+ throw new InvalidGeoJsonException('Expected '.GeoJsonPoint::class.', got '.get_class($geoJson));`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`$coordinates = $geoJson->getCoordinates();`
`83`		`- return new Point($coordinates[1], $coordinates[0]);`
	`84`	`+`
	`85`	`+ return new self($coordinates[1], $coordinates[0]);`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,26 +13,26 @@ public function toWKT()`
`13`	`13`	`return sprintf('POLYGON(%s)', (string) $this);`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static function fromJson ($geoJson)`
	`16`	`+ public static function fromJson($geoJson)`
`17`	`17`	`{`
`18`		`- if(is_string($geoJson)) {`
	`18`	`+ if (is_string($geoJson)) {`
`19`	`19`	`$geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));`
`20`	`20`	`}`
`21`	`21`
`22`		`- if(!is_a($geoJson, GeoJsonPolygon::class)) {`
`23`		`- throw new InvalidGeoJsonException('Expected ' . GeoJsonPolygon::class . ', got ' . get_class($geoJson));`
	`22`	`+ if (!is_a($geoJson, GeoJsonPolygon::class)) {`
	`23`	`+ throw new InvalidGeoJsonException('Expected '.GeoJsonPolygon::class.', got '.get_class($geoJson));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`$set = [];`
`27`		`- foreach($geoJson->getCoordinates() as $coordinates) {`
	`27`	`+ foreach ($geoJson->getCoordinates() as $coordinates) {`
`28`	`28`	`$points = [];`
`29`		`- foreach($coordinates as $coordinate) {`
	`29`	`+ foreach ($coordinates as $coordinate) {`
`30`	`30`	`$points[] = new Point($coordinate[1], $coordinate[0]);`
`31`	`31`	`}`
`32`	`32`	`$set[] = new LineString($points);`
`33`	`33`	`}`
`34`	`34`
`35`		`- return new Polygon($set);`
	`35`	`+ return new self($set);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -192,14 +192,16 @@ public function testInsertUpdateGeometryCollectionHasCorrectSql()`
`192`	`192`	`$this->assertContains("GeomFromText('GEOMETRYCOLLECTION(POINT(2 1),LINESTRING(3 2,3 3))')", $this->queries[1]);`
`193`	`193`	`}`
`194`	`194`
`195`		`- public function testSettingRawAttributes() {`
	`195`	`+ public function testSettingRawAttributes()`
	`196`	`+ {`
`196`	`197`	`$attributes['point'] = '0101000000000000000000f03f0000000000000040';`
`197`	`198`
`198`	`199`	`$this->model->setRawAttributes($attributes);`
`199`	`200`	`$this->assertInstanceOf(Point::class, ($this->model->point));`
`200`	`201`	`}`
`201`	`202`
`202`		`- public function testSpatialFieldsNotDefinedException() {`
	`203`	`+ public function testSpatialFieldsNotDefinedException()`
	`204`	`+ {`
`203`	`205`	`$model = new TestNoSpatialModel();`
`204`	`206`	`$this->setExpectedException(SpatialFieldsNotDefinedException::class);`
`205`	`207`	`$model->getSpatialFields();`
`@@ -403,7 +405,8 @@ public function testmodels()`
`403`	`405`	`}`
`404`	`406`	`}`
`405`	`407`
`406`		`-class TestNoSpatialModel extends Model {`
	`408`	`+class TestNoSpatialModel extends Model`
	`409`	`+{`
`407`	`410`	`use \Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;`
`408`	`411`	`}`
`409`	`412`