[11.x] Fixes handling Js::from(collect()); (#53206)

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Illuminate/Support/Js.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\Jsonable;
 use JsonSerializable;
 use Stringable;
+use UnitEnum;
 
 class Js implements Htmlable, Stringable
 {
@@ -70,7 +71,9 @@ protected function convertDataToJavaScriptExpression($data, $flags = 0, $depth =
             return $data->toHtml();
         }
 
-        $data = enum_value($data);
+        if ($data instanceof UnitEnum) {
+            $data = enum_value($data);
+        }
 
         $json = static::encode($data, $flags, $depth);
 

src/Illuminate/Support/functions.php

@@ -43,16 +43,12 @@ function defer(?callable $callback = null, ?string $name = null, bool $always =
      */
     function enum_value($value, $default = null)
     {
-        if (empty($value)) {
-            return $value;
-        }
-
         return transform($value, fn ($value) => match (true) {
             $value instanceof \BackedEnum => $value->value,
             $value instanceof \UnitEnum => $value->name,
 
             default => $value,
-        }, $default);
+        }, $default ?? $value);
     }
 }
 

tests/Support/SupportEnumValueFunctionTest.php

@@ -43,5 +43,6 @@ public static function scalarDataProvider()
         yield [true, true];
         yield [1337, 1337];
         yield [1.0, 1.0];
+        yield [$collect = collect(), $collect];
     }
 }

tests/Support/SupportJsTest.php

@@ -19,6 +19,8 @@ public function testScalars()
         $this->assertSame('1', (string) Js::from(1));
         $this->assertSame('1.1', (string) Js::from(1.1));
         $this->assertSame('[]', (string) Js::from([]));
+        $this->assertSame('[]', (string) Js::from(collect()));
+        $this->assertSame('null', (string) Js::from(null));
         $this->assertSame("'Hello world'", (string) Js::from('Hello world'));
         $this->assertEquals(
             "'\\u003Cdiv class=\\u0022foo\\u0022\\u003E\\u0027quoted html\\u0027\\u003C\\/div\\u003E'",