Include blueprint in augmented entry data (statamic#6015)

Co-authored-by: Jason Varga <[email protected]>
sjclark · Aug 12, 2022 · f7c410e · f7c410e
1 parent dcff6ca
commit f7c410e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/Entries/AugmentedEntry.php b/src/Entries/AugmentedEntry.php
@@ -35,6 +35,7 @@ private function commonKeys()
             'order',
             'is_entry',
             'collection',
+            'blueprint',
             'mount',
             'locale',
             'last_modified',

diff --git a/tests/Data/Entries/AugmentedEntryTest.php b/tests/Data/Entries/AugmentedEntryTest.php
@@ -14,6 +14,7 @@
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\User;
+use Statamic\Fields\Blueprint as FieldsBlueprint;
 use Tests\Data\AugmentedTestCase;
 
 class AugmentedEntryTest extends AugmentedTestCase
@@ -98,6 +99,7 @@ public function it_gets_values()
             'order'         => ['type' => 'null', 'value' => null], // todo: test for when this is an int
             'is_entry'      => ['type' => 'bool', 'value' => true],
             'collection'    => ['type' => CollectionContract::class, 'value' => $collection],
+            'blueprint'     => ['type' => FieldsBlueprint::class, 'value' => $blueprint],
             'mount'         => ['type' => CollectionContract::class, 'value' => $mount],
             'locale'        => ['type' => 'string', 'value' => 'en'],
             'last_modified' => ['type' => Carbon::class, 'value' => '2017-02-03 14:10'],

diff --git a/tests/Data/Structures/AugmentedPageTest.php b/tests/Data/Structures/AugmentedPageTest.php
@@ -90,7 +90,7 @@ public function it_gets_entry_keys()
             // entry blueprint
             'title', 'foo',
             // augmented entry keys
-            'amp_url', 'api_url', 'collection', 'date', 'edit_url', 'id', 'origin_id', 'is_entry',
+            'amp_url', 'api_url', 'collection', 'blueprint', 'date', 'edit_url', 'id', 'origin_id', 'is_entry',
             'last_modified', 'locale', 'mount', 'order', 'permalink', 'private',
             'published', 'slug', 'status', 'updated_at', 'updated_by', 'uri', 'url',
             // page blueprint

diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
@@ -476,11 +476,12 @@ public function it_is_arrayable()
         $this->assertInstanceOf(Arrayable::class, $page);
 
         collect($arr = $page->toArray())
-            ->except(['collection'])
+            ->except(['collection', 'blueprint'])
             ->each(fn ($value, $key) => $this->assertEquals($value, $page->{$key}))
             ->each(fn ($value, $key) => $this->assertEquals($value, $page[$key]));
 
         $this->assertEquals($page->collection()->toArray(), $arr['collection']);
+        $this->assertEquals($page->blueprint->toArray(), $arr['blueprint']);
     }
 
     protected function newTree()