Skip to content

[5.x] Corrects issue serializing/deserializing "resolvingValues" when using Eloquent driver#11888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JohnathonKoster wants to merge 1 commit into from
Closed

[5.x] Corrects issue serializing/deserializing "resolvingValues" when using Eloquent driver #11888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Data/HasOrigin.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

trait HasOrigin
{
private $resolvingValues = false;
protected $resolvingValues = false;

/**
* @var string
Expand Down
2 changes: 1 addition & 1 deletion src/Entries/Entry.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1109,6 +1109,6 @@ public function __sleep()
$this->slug = $slug($this);
}

return array_keys(Arr::except(get_object_vars($this), ['cachedKeys', 'computedCallbackCache', 'siteCache', 'augmentationReferenceKey']));
return array_keys(Arr::except(get_object_vars($this), ['cachedKeys', 'computedCallbackCache', 'siteCache', 'augmentationReferenceKey', 'resolvingValues']));
}
}
27 changes: 27 additions & 0 deletions tests/Data/Entries/EntryTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2698,4 +2698,31 @@ public function it_detects_recursive_augmentation()

$entry->values();
}

#[Test]
public function entries_can_be_serialized_after_resolving_values()
{
$entry = EntryFactory::id('entry-id')
->collection('test')
->slug('entry-slug')
->create();

$customEntry = CustomEntry::fromEntry($entry);

$serialized = serialize($customEntry);
$unserialized = unserialize($serialized);

$this->assertSame('entry-slug', $unserialized->slug);
}
}

class CustomEntry extends Entry
{
public static function fromEntry(Entry $entry)
{
return (new static)
->slug($entry->slug)
->collection($entry->collection)
->data($entry->data);
}
}