Formatting and improve setRawAttributes implementation

Author: MatanYadaev

src/Traits/HasSpatial.php

@@ -13,19 +13,19 @@ public function newEloquentBuilder($query): SpatialBuilder
   }
 
   /**
-   * @param  array<string, mixed>  $attributes
+   * @param array<string, mixed> $attributes
+   * @param bool $sync
+   * @return $this
    */
   public function setRawAttributes(array $attributes, $sync = false)
   {
     $result = parent::setRawAttributes($attributes, $sync);
 
     foreach ($attributes as $attribute => $value) {
-      if ($value && is_string($value) && ! preg_match('//u', $value)) { // the string is binary
-        // access the attribute to force conversion via attribute cast
-        $spatialAttribute = $this->$attribute;
+      $casts = $this->getCasts();
+      if (isset($casts[$attribute]) && is_subclass_of($casts[$attribute], Geometry::class)) {
+        $spatialAttribute = $this->getAttribute($attribute);
 
-        // override attribute and original attribute to get rid of binary strings
-        // (Those would lead to errors while JSON encoding a serialized version of the model.)
         if ($spatialAttribute instanceof Geometry) {
           $this->attributes[$attribute] = $spatialAttribute;
           $this->original[$attribute] = $spatialAttribute;

tests/GeometryCastTest.php

@@ -111,8 +111,6 @@
   ]));
 
   expect(function (): void {
-    // cast deserialization happens in setRawAttributes
-    // called immediately after retrieving db record
     TestPlace::firstOrFail();
   })->toThrow(InvalidArgumentException::class);
 });
@@ -127,40 +125,31 @@
   expect($testPlace->point)->toEqual($point);
 });
 
-it('is serializeable and JSON encodeable by standard serialize / JSON encode functions', function (): void {
+it('serializes and json encodes a model record with geometry', function (): void {
+  // Arrange
   $point = new Point(0, 180);
-
   /** @var TestPlace $testPlace */
   $testPlace = TestPlace::factory()->make(['point' => $point]);
 
-  $serialized = serialize($testPlace);
-  $json = json_encode($serialized);
-
-  expect($json)->toBeTruthy('JSON encoding failed.');
-
+  // Act
   // @phpstan-ignore-next-line
-  $recoveredTestPlace = unserialize(json_decode($json));
+  $recoveredTestPlace = unserialize(json_decode(json_encode(serialize($testPlace))));
 
+  // Assert
   expect($recoveredTestPlace)->toEqual($testPlace);
 });
 
-it('is serializeable and JSON encodeable by standard serialize / JSON encode functions when retrieved from db', function (): void {
+it('serializes and json encodes a model record with geometry when retrieving from database', function (): void {
+  // Arrange
   $point = new Point(0, 180);
-
   /** @var TestPlace $testPlace */
-  $testPlace = TestPlace::factory()->make(['point' => $point]);
-
-  $testPlace->save();
-
+  $testPlace = TestPlace::factory()->create(['point' => $point]);
   $testPlaceFromDb = TestPlace::find($testPlace->id);
 
-  $serialized = serialize($testPlaceFromDb);
-  $json = json_encode($serialized);
-
-  expect($json)->toBeTruthy('JSON encoding failed.');
-
+  // Act
   // @phpstan-ignore-next-line
-  $recoveredTestPlace = unserialize(json_decode($json));
+  $recoveredTestPlace = unserialize(json_decode(json_encode(serialize($testPlaceFromDb))));
 
+  // Assert
   expect($recoveredTestPlace)->toEqual($testPlaceFromDb);
 });