Merge pull request #535 from fritz-c/master

Fix: Ensure duplicateAndHydrate works with Fields using static closures

src/Layouts/Layout.php

@@ -310,7 +310,14 @@ protected function cloneField(Field $original)
             if (! is_a($field->$callable ?? null, \Closure::class)) {
                 continue;
             }
-            $field->$callable = $field->$callable->bindTo($field);
+
+            try {
+                $field->$callable = $field->$callable->bindTo($field);
+            } catch (\Throwable $th) {
+                // Binding an instance to a static closure will fail. Assuming
+                // that's the cause of the error here, we leave the original
+                // closure as-is.
+            }
         }
 
         return $field;

tests/Unit/Layouts/LayoutTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Unit\Layouts;
+
+use PHPUnit\Framework\TestCase;
+use Laravel\Nova\Fields\DateTime;
+use Laravel\Nova\Fields\Text;
+use Whitecube\NovaFlexibleContent\Layouts\Layout;
+
+class LayoutTest extends TestCase
+{
+    public function testDuplicateAndHydrate(): void
+    {
+        $layout = new Layout('Test Layout', 'test', [
+            DateTime::make('Created At'),
+            Text::make('Name', 'name', static function($resource, $attribute) {
+                return 'static-name';
+            }),
+        ]);
+
+        // Should not throw any exceptions
+        $duplicate = $layout->duplicateAndHydrate('keylikegenerated', [
+            'created_at' => '2023-01-01 00:00:00',
+            'name' => 'Test'
+        ]);
+
+        $this->assertInstanceOf(Layout::class, $duplicate);
+        $this->assertEquals('keylikegenerated', $duplicate->key());
+        $this->assertEquals('Test Layout', $duplicate->title());
+        $this->assertEquals('test', $duplicate->name());
+
+        // The text field should resolve the value
+        $textField = $duplicate->fields()[1];
+        $textField->resolve(null);
+        $this->assertEquals('static-name', $textField->value);
+    }
+}