Merge pull request #56 from laravel/fix/improve-date-objects-serializ…

…ation [1.x] Fixes serialization of date carbon objects
laravel · Aug 26, 2022 · d78fd36 · d78fd36
2 parents 944c564 + 2d26693
commit d78fd36
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "php": "^7.3|^8.0"
     },
     "require-dev": {
+        "nesbot/carbon": "^2.61",
         "pestphp/pest": "^1.21.3",
         "phpstan/phpstan": "^1.8.2",
         "symfony/var-dumper": "^5.4.11"

diff --git a/src/Serializers/Native.php b/src/Serializers/Native.php
@@ -3,6 +3,7 @@
 namespace Laravel\SerializableClosure\Serializers;
 
 use Closure;
+use DateTimeInterface;
 use Laravel\SerializableClosure\Contracts\Serializable;
 use Laravel\SerializableClosure\SerializableClosure;
 use Laravel\SerializableClosure\Support\ClosureScope;
@@ -460,6 +461,12 @@ protected function mapByReference(&$data)
 
             $instance = $data;
 
+            if ($data instanceof DateTimeInterface) {
+                $this->scope[$instance] = $data;
+
+                return;
+            }
+
             if ($data instanceof UnitEnum) {
                 $this->scope[$instance] = $data;
 

diff --git a/tests/SerializerTest.php b/tests/SerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Carbon\Carbon;
+use Carbon\CarbonImmutable;
 use Laravel\SerializableClosure\SerializableClosure;
 use Laravel\SerializableClosure\Serializers\Signed;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
@@ -401,6 +403,41 @@ function () {
     expect($f(new Model))->toBeInstanceOf(Model::class);
 })->with('serializers');
 
+test('serializes used dates', function ($_, $date) {
+    $closure = function () use ($date) {
+        return $date;
+    };
+
+    $u = s($closure);
+    $r = $u();
+
+    expect($r)->toEqual($date);
+})->with('serializers')->with([
+    new DateTime,
+    new DateTimeImmutable,
+    new Carbon,
+    new CarbonImmutable,
+]);
+
+test('serializes with used object date properties', function ($_, $date) {
+    $obj = new ObjSelf;
+    $obj->o = $date;
+
+    $closure = function () use ($obj) {
+        return $obj;
+    };
+
+    $u = s($closure);
+    $r = $u();
+
+    expect($r->o)->toEqual($date);
+})->with('serializers')->with([
+    new DateTime,
+    new DateTimeImmutable,
+    new Carbon,
+    new CarbonImmutable,
+]);
+
 class A
 {
     protected static function aStaticProtected()