From c1834bcc0d9bbac842f310f969d757b88e46b6a4 Mon Sep 17 00:00:00 2001
From: dcb6 <danielb14065@gmail.com>
Date: Wed, 2 Oct 2024 11:53:56 -0400
Subject: [PATCH] seed

---
 seed/php-model/alias-extends/src/Child.php    |   5 +
 .../alias-extends/src/Traits/AliasType.php    |  14 ++
 .../alias-extends/src/Traits/Parent_.php      |  14 ++
 .../circular-references-advanced/src/A/A.php  |  14 ++
 .../src/Traits/RootType.php                   |  14 ++
 .../php-model/circular-references/src/A/A.php |  14 ++
 .../src/Traits/RootType.php                   |  14 ++
 .../examples/src/Types/ExtendedMovie.php      |  23 ++++
 .../examples/src/Types/Traits/Movie.php       |  69 ++++++++++
 seed/php-model/extends/src/ExampleType.php    |   5 +
 seed/php-model/extends/src/Json.php           |   5 +
 seed/php-model/extends/src/NestedType.php     |   7 +
 seed/php-model/extends/src/Traits/Docs.php    |  14 ++
 .../extends/src/Traits/ExampleType.php        |  16 +++
 seed/php-model/extends/src/Traits/Json.php    |  16 +++
 .../ListUsersExtendedOptionalListResponse.php |   7 +
 .../src/Users/ListUsersExtendedResponse.php   |   7 +
 .../src/Users/Traits/UserOptionalListPage.php |  21 +++
 .../pagination/src/Users/Traits/UserPage.php  |  21 +++
 .../src/Service/Response.php                  |   9 ++
 .../src/Service/Traits/WithDocs.php           |  14 ++
 .../src/Traits/WithMetadata.php               |  15 +++
 seed/php-model/simple-fhir/src/Account.php    |   9 ++
 seed/php-model/simple-fhir/src/Patient.php    |   9 ++
 .../simple-fhir/src/Practitioner.php          |   9 ++
 seed/php-model/simple-fhir/src/Script.php     |   9 ++
 .../simple-fhir/src/Traits/BaseResource.php   |  33 +++++
 .../php-model/trace/src/Playlist/Playlist.php |   7 +
 .../Playlist/Traits/PlaylistCreateRequest.php |  21 +++
 .../src/Requests/InlinedChildRequest.php      |   5 +
 .../alias-extends/src/Traits/AliasType.php    |  14 ++
 .../alias-extends/src/Traits/Parent_.php      |  14 ++
 .../php-sdk/alias-extends/src/Types/Child.php |   5 +
 .../src/A/Types/A.php                         |  14 ++
 .../src/Traits/RootType.php                   |  14 ++
 .../circular-references/src/A/Types/A.php     |  14 ++
 .../src/Traits/RootType.php                   |  14 ++
 .../examples/src/Types/Traits/Movie.php       |  69 ++++++++++
 .../src/Types/Types/ExtendedMovie.php         |  23 ++++
 .../src/Users/Traits/UserOptionalListPage.php |  21 +++
 .../pagination/src/Users/Traits/UserPage.php  |  21 +++
 .../ListUsersExtendedOptionalListResponse.php |   7 +
 .../Users/Types/ListUsersExtendedResponse.php |   7 +
 .../src/Service/Traits/WithDocs.php           |  14 ++
 .../src/Service/Types/Response.php            |   9 ++
 .../src/Traits/WithMetadata.php               |  15 +++
 .../simple-fhir/src/Traits/BaseResource.php   |  33 +++++
 .../php-sdk/simple-fhir/src/Types/Account.php |   9 ++
 .../php-sdk/simple-fhir/src/Types/Patient.php |   9 ++
 .../simple-fhir/src/Types/Practitioner.php    |   9 ++
 seed/php-sdk/simple-fhir/src/Types/Script.php |   9 ++
 .../Playlist/Traits/PlaylistCreateRequest.php |  21 +++
 .../trace/src/Playlist/Types/Playlist.php     |   7 +
 .../Seed/Core/ScalarTypesTestWithTrait.php    | 126 ------------------
 54 files changed, 812 insertions(+), 126 deletions(-)
 create mode 100644 seed/php-model/alias-extends/src/Traits/AliasType.php
 create mode 100644 seed/php-model/alias-extends/src/Traits/Parent_.php
 create mode 100644 seed/php-model/circular-references-advanced/src/Traits/RootType.php
 create mode 100644 seed/php-model/circular-references/src/Traits/RootType.php
 create mode 100644 seed/php-model/examples/src/Types/Traits/Movie.php
 create mode 100644 seed/php-model/extends/src/Traits/Docs.php
 create mode 100644 seed/php-model/extends/src/Traits/ExampleType.php
 create mode 100644 seed/php-model/extends/src/Traits/Json.php
 create mode 100644 seed/php-model/pagination/src/Users/Traits/UserOptionalListPage.php
 create mode 100644 seed/php-model/pagination/src/Users/Traits/UserPage.php
 create mode 100644 seed/php-model/response-property/src/Service/Traits/WithDocs.php
 create mode 100644 seed/php-model/response-property/src/Traits/WithMetadata.php
 create mode 100644 seed/php-model/simple-fhir/src/Traits/BaseResource.php
 create mode 100644 seed/php-model/trace/src/Playlist/Traits/PlaylistCreateRequest.php
 create mode 100644 seed/php-sdk/alias-extends/src/Traits/AliasType.php
 create mode 100644 seed/php-sdk/alias-extends/src/Traits/Parent_.php
 create mode 100644 seed/php-sdk/circular-references-advanced/src/Traits/RootType.php
 create mode 100644 seed/php-sdk/circular-references/src/Traits/RootType.php
 create mode 100644 seed/php-sdk/examples/src/Types/Traits/Movie.php
 create mode 100644 seed/php-sdk/pagination/src/Users/Traits/UserOptionalListPage.php
 create mode 100644 seed/php-sdk/pagination/src/Users/Traits/UserPage.php
 create mode 100644 seed/php-sdk/response-property/src/Service/Traits/WithDocs.php
 create mode 100644 seed/php-sdk/response-property/src/Traits/WithMetadata.php
 create mode 100644 seed/php-sdk/simple-fhir/src/Traits/BaseResource.php
 create mode 100644 seed/php-sdk/trace/src/Playlist/Traits/PlaylistCreateRequest.php
 delete mode 100644 seed/php-sdk/undiscriminated-unions/tests/Seed/Core/ScalarTypesTestWithTrait.php

diff --git a/seed/php-model/alias-extends/src/Child.php b/seed/php-model/alias-extends/src/Child.php
index b8c31ff899..7bee8fcda6 100644
--- a/seed/php-model/alias-extends/src/Child.php
+++ b/seed/php-model/alias-extends/src/Child.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\Parent_;
 use Seed\Core\Json\JsonProperty;
 
 class Child extends SerializableType
 {
+    use Parent_;
+
     /**
      * @var string $child
      */
@@ -16,11 +19,13 @@ class Child extends SerializableType
     /**
      * @param array{
      *   child: string,
+     *   parent: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->child = $values['child'];
+        $this->parent = $values['parent'];
     }
 }
diff --git a/seed/php-model/alias-extends/src/Traits/AliasType.php b/seed/php-model/alias-extends/src/Traits/AliasType.php
new file mode 100644
index 0000000000..6ec816f3e3
--- /dev/null
+++ b/seed/php-model/alias-extends/src/Traits/AliasType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait AliasType
+{
+    /**
+     * @var string $parent
+     */
+    #[JsonProperty('parent')]
+    public string $parent;
+}
diff --git a/seed/php-model/alias-extends/src/Traits/Parent_.php b/seed/php-model/alias-extends/src/Traits/Parent_.php
new file mode 100644
index 0000000000..2545c9f3ab
--- /dev/null
+++ b/seed/php-model/alias-extends/src/Traits/Parent_.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait Parent_
+{
+    /**
+     * @var string $parent
+     */
+    #[JsonProperty('parent')]
+    public string $parent;
+}
diff --git a/seed/php-model/circular-references-advanced/src/A/A.php b/seed/php-model/circular-references-advanced/src/A/A.php
index ad86a0bec7..4cb6b86784 100644
--- a/seed/php-model/circular-references-advanced/src/A/A.php
+++ b/seed/php-model/circular-references-advanced/src/A/A.php
@@ -3,7 +3,21 @@
 namespace Seed\A;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\RootType;
 
 class A extends SerializableType
 {
+    use RootType;
+
+
+    /**
+     * @param array{
+     *   s: string,
+     * } $values
+     */
+    public function __construct(
+        array $values,
+    ) {
+        $this->s = $values['s'];
+    }
 }
diff --git a/seed/php-model/circular-references-advanced/src/Traits/RootType.php b/seed/php-model/circular-references-advanced/src/Traits/RootType.php
new file mode 100644
index 0000000000..44f28a0911
--- /dev/null
+++ b/seed/php-model/circular-references-advanced/src/Traits/RootType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait RootType
+{
+    /**
+     * @var string $s
+     */
+    #[JsonProperty('s')]
+    public string $s;
+}
diff --git a/seed/php-model/circular-references/src/A/A.php b/seed/php-model/circular-references/src/A/A.php
index ad86a0bec7..4cb6b86784 100644
--- a/seed/php-model/circular-references/src/A/A.php
+++ b/seed/php-model/circular-references/src/A/A.php
@@ -3,7 +3,21 @@
 namespace Seed\A;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\RootType;
 
 class A extends SerializableType
 {
+    use RootType;
+
+
+    /**
+     * @param array{
+     *   s: string,
+     * } $values
+     */
+    public function __construct(
+        array $values,
+    ) {
+        $this->s = $values['s'];
+    }
 }
diff --git a/seed/php-model/circular-references/src/Traits/RootType.php b/seed/php-model/circular-references/src/Traits/RootType.php
new file mode 100644
index 0000000000..44f28a0911
--- /dev/null
+++ b/seed/php-model/circular-references/src/Traits/RootType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait RootType
+{
+    /**
+     * @var string $s
+     */
+    #[JsonProperty('s')]
+    public string $s;
+}
diff --git a/seed/php-model/examples/src/Types/ExtendedMovie.php b/seed/php-model/examples/src/Types/ExtendedMovie.php
index 4c313c65c6..03ac0fe7d8 100644
--- a/seed/php-model/examples/src/Types/ExtendedMovie.php
+++ b/seed/php-model/examples/src/Types/ExtendedMovie.php
@@ -3,11 +3,14 @@
 namespace Seed\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Types\Traits\Movie;
 use Seed\Core\Json\JsonProperty;
 use Seed\Core\Types\ArrayType;
 
 class ExtendedMovie extends SerializableType
 {
+    use Movie;
+
     /**
      * @var array<string> $cast
      */
@@ -17,11 +20,31 @@ class ExtendedMovie extends SerializableType
     /**
      * @param array{
      *   cast: array<string>,
+     *   id: string,
+     *   prequel?: ?string,
+     *   title: string,
+     *   from: string,
+     *   rating: float,
+     *   type: string,
+     *   tag: string,
+     *   book?: ?string,
+     *   metadata: array<string, mixed>,
+     *   revenue: int,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->cast = $values['cast'];
+        $this->id = $values['id'];
+        $this->prequel = $values['prequel'] ?? null;
+        $this->title = $values['title'];
+        $this->from = $values['from'];
+        $this->rating = $values['rating'];
+        $this->type = $values['type'];
+        $this->tag = $values['tag'];
+        $this->book = $values['book'] ?? null;
+        $this->metadata = $values['metadata'];
+        $this->revenue = $values['revenue'];
     }
 }
diff --git a/seed/php-model/examples/src/Types/Traits/Movie.php b/seed/php-model/examples/src/Types/Traits/Movie.php
new file mode 100644
index 0000000000..2f40680e30
--- /dev/null
+++ b/seed/php-model/examples/src/Types/Traits/Movie.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Seed\Types\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Core\Types\ArrayType;
+
+trait Movie
+{
+    /**
+     * @var string $id
+     */
+    #[JsonProperty('id')]
+    public string $id;
+
+    /**
+     * @var ?string $prequel
+     */
+    #[JsonProperty('prequel')]
+    public ?string $prequel;
+
+    /**
+     * @var string $title
+     */
+    #[JsonProperty('title')]
+    public string $title;
+
+    /**
+     * @var string $from
+     */
+    #[JsonProperty('from')]
+    public string $from;
+
+    /**
+     * @var float $rating The rating scale is one to five stars
+     */
+    #[JsonProperty('rating')]
+    public float $rating;
+
+    /**
+     * @var string $type
+     */
+    #[JsonProperty('type')]
+    public string $type;
+
+    /**
+     * @var string $tag
+     */
+    #[JsonProperty('tag')]
+    public string $tag;
+
+    /**
+     * @var ?string $book
+     */
+    #[JsonProperty('book')]
+    public ?string $book;
+
+    /**
+     * @var array<string, mixed> $metadata
+     */
+    #[JsonProperty('metadata'), ArrayType(['string' => 'mixed'])]
+    public array $metadata;
+
+    /**
+     * @var int $revenue
+     */
+    #[JsonProperty('revenue')]
+    public int $revenue;
+}
diff --git a/seed/php-model/extends/src/ExampleType.php b/seed/php-model/extends/src/ExampleType.php
index 7bc916aea7..f1d3ea4de7 100644
--- a/seed/php-model/extends/src/ExampleType.php
+++ b/seed/php-model/extends/src/ExampleType.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\Docs;
 use Seed\Core\Json\JsonProperty;
 
 class ExampleType extends SerializableType
 {
+    use Docs;
+
     /**
      * @var string $name
      */
@@ -16,11 +19,13 @@ class ExampleType extends SerializableType
     /**
      * @param array{
      *   name: string,
+     *   docs: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->name = $values['name'];
+        $this->docs = $values['docs'];
     }
 }
diff --git a/seed/php-model/extends/src/Json.php b/seed/php-model/extends/src/Json.php
index 9bc11b9c49..c62a6c629f 100644
--- a/seed/php-model/extends/src/Json.php
+++ b/seed/php-model/extends/src/Json.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\Docs;
 use Seed\Core\Json\JsonProperty;
 
 class Json extends SerializableType
 {
+    use Docs;
+
     /**
      * @var string $raw
      */
@@ -16,11 +19,13 @@ class Json extends SerializableType
     /**
      * @param array{
      *   raw: string,
+     *   docs: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->raw = $values['raw'];
+        $this->docs = $values['docs'];
     }
 }
diff --git a/seed/php-model/extends/src/NestedType.php b/seed/php-model/extends/src/NestedType.php
index 2955b61bdc..74cecd3ca2 100644
--- a/seed/php-model/extends/src/NestedType.php
+++ b/seed/php-model/extends/src/NestedType.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\Json;
 use Seed\Core\Json\JsonProperty;
 
 class NestedType extends SerializableType
 {
+    use Json;
+
     /**
      * @var string $name
      */
@@ -16,11 +19,15 @@ class NestedType extends SerializableType
     /**
      * @param array{
      *   name: string,
+     *   raw: string,
+     *   docs: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->name = $values['name'];
+        $this->raw = $values['raw'];
+        $this->docs = $values['docs'];
     }
 }
diff --git a/seed/php-model/extends/src/Traits/Docs.php b/seed/php-model/extends/src/Traits/Docs.php
new file mode 100644
index 0000000000..17eaf8aa4f
--- /dev/null
+++ b/seed/php-model/extends/src/Traits/Docs.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait Docs
+{
+    /**
+     * @var string $docs
+     */
+    #[JsonProperty('docs')]
+    public string $docs;
+}
diff --git a/seed/php-model/extends/src/Traits/ExampleType.php b/seed/php-model/extends/src/Traits/ExampleType.php
new file mode 100644
index 0000000000..27f834f90d
--- /dev/null
+++ b/seed/php-model/extends/src/Traits/ExampleType.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait ExampleType
+{
+    use Docs;
+
+    /**
+     * @var string $name
+     */
+    #[JsonProperty('name')]
+    public string $name;
+}
diff --git a/seed/php-model/extends/src/Traits/Json.php b/seed/php-model/extends/src/Traits/Json.php
new file mode 100644
index 0000000000..dcd46c8a1f
--- /dev/null
+++ b/seed/php-model/extends/src/Traits/Json.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait Json
+{
+    use Docs;
+
+    /**
+     * @var string $raw
+     */
+    #[JsonProperty('raw')]
+    public string $raw;
+}
diff --git a/seed/php-model/pagination/src/Users/ListUsersExtendedOptionalListResponse.php b/seed/php-model/pagination/src/Users/ListUsersExtendedOptionalListResponse.php
index 00810b43f4..e454dd175b 100644
--- a/seed/php-model/pagination/src/Users/ListUsersExtendedOptionalListResponse.php
+++ b/seed/php-model/pagination/src/Users/ListUsersExtendedOptionalListResponse.php
@@ -3,10 +3,13 @@
 namespace Seed\Users;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Users\Traits\UserOptionalListPage;
 use Seed\Core\Json\JsonProperty;
 
 class ListUsersExtendedOptionalListResponse extends SerializableType
 {
+    use UserOptionalListPage;
+
     /**
      * @var int $totalCount The totall number of /users
      */
@@ -16,11 +19,15 @@ class ListUsersExtendedOptionalListResponse extends SerializableType
     /**
      * @param array{
      *   totalCount: int,
+     *   data: UserOptionalListContainer,
+     *   next?: ?string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->totalCount = $values['totalCount'];
+        $this->data = $values['data'];
+        $this->next = $values['next'] ?? null;
     }
 }
diff --git a/seed/php-model/pagination/src/Users/ListUsersExtendedResponse.php b/seed/php-model/pagination/src/Users/ListUsersExtendedResponse.php
index dc600ccd16..93df8c38ec 100644
--- a/seed/php-model/pagination/src/Users/ListUsersExtendedResponse.php
+++ b/seed/php-model/pagination/src/Users/ListUsersExtendedResponse.php
@@ -3,10 +3,13 @@
 namespace Seed\Users;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Users\Traits\UserPage;
 use Seed\Core\Json\JsonProperty;
 
 class ListUsersExtendedResponse extends SerializableType
 {
+    use UserPage;
+
     /**
      * @var int $totalCount The totall number of /users
      */
@@ -16,11 +19,15 @@ class ListUsersExtendedResponse extends SerializableType
     /**
      * @param array{
      *   totalCount: int,
+     *   data: UserListContainer,
+     *   next?: ?string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->totalCount = $values['totalCount'];
+        $this->data = $values['data'];
+        $this->next = $values['next'] ?? null;
     }
 }
diff --git a/seed/php-model/pagination/src/Users/Traits/UserOptionalListPage.php b/seed/php-model/pagination/src/Users/Traits/UserOptionalListPage.php
new file mode 100644
index 0000000000..3056830dc1
--- /dev/null
+++ b/seed/php-model/pagination/src/Users/Traits/UserOptionalListPage.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Seed\Users\Traits;
+
+use Seed\Users\UserOptionalListContainer;
+use Seed\Core\Json\JsonProperty;
+
+trait UserOptionalListPage
+{
+    /**
+     * @var UserOptionalListContainer $data
+     */
+    #[JsonProperty('data')]
+    public UserOptionalListContainer $data;
+
+    /**
+     * @var ?string $next
+     */
+    #[JsonProperty('next')]
+    public ?string $next;
+}
diff --git a/seed/php-model/pagination/src/Users/Traits/UserPage.php b/seed/php-model/pagination/src/Users/Traits/UserPage.php
new file mode 100644
index 0000000000..2a14493a98
--- /dev/null
+++ b/seed/php-model/pagination/src/Users/Traits/UserPage.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Seed\Users\Traits;
+
+use Seed\Users\UserListContainer;
+use Seed\Core\Json\JsonProperty;
+
+trait UserPage
+{
+    /**
+     * @var UserListContainer $data
+     */
+    #[JsonProperty('data')]
+    public UserListContainer $data;
+
+    /**
+     * @var ?string $next
+     */
+    #[JsonProperty('next')]
+    public ?string $next;
+}
diff --git a/seed/php-model/response-property/src/Service/Response.php b/seed/php-model/response-property/src/Service/Response.php
index 46eaf9deee..ec80232ba7 100644
--- a/seed/php-model/response-property/src/Service/Response.php
+++ b/seed/php-model/response-property/src/Service/Response.php
@@ -3,10 +3,15 @@
 namespace Seed\Service;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\WithMetadata;
+use Seed\Service\Traits\WithDocs;
 use Seed\Core\Json\JsonProperty;
 
 class Response extends SerializableType
 {
+    use WithMetadata;
+    use WithDocs;
+
     /**
      * @var Movie $data
      */
@@ -16,11 +21,15 @@ class Response extends SerializableType
     /**
      * @param array{
      *   data: Movie,
+     *   metadata: array<string, string>,
+     *   docs: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->data = $values['data'];
+        $this->metadata = $values['metadata'];
+        $this->docs = $values['docs'];
     }
 }
diff --git a/seed/php-model/response-property/src/Service/Traits/WithDocs.php b/seed/php-model/response-property/src/Service/Traits/WithDocs.php
new file mode 100644
index 0000000000..429bb4dd85
--- /dev/null
+++ b/seed/php-model/response-property/src/Service/Traits/WithDocs.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Service\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait WithDocs
+{
+    /**
+     * @var string $docs
+     */
+    #[JsonProperty('docs')]
+    public string $docs;
+}
diff --git a/seed/php-model/response-property/src/Traits/WithMetadata.php b/seed/php-model/response-property/src/Traits/WithMetadata.php
new file mode 100644
index 0000000000..af6dc5a7ff
--- /dev/null
+++ b/seed/php-model/response-property/src/Traits/WithMetadata.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Core\Types\ArrayType;
+
+trait WithMetadata
+{
+    /**
+     * @var array<string, string> $metadata
+     */
+    #[JsonProperty('metadata'), ArrayType(['string' => 'string'])]
+    public array $metadata;
+}
diff --git a/seed/php-model/simple-fhir/src/Account.php b/seed/php-model/simple-fhir/src/Account.php
index d845b0822f..422d2ee66b 100644
--- a/seed/php-model/simple-fhir/src/Account.php
+++ b/seed/php-model/simple-fhir/src/Account.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 
 class Account extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -37,6 +40,9 @@ class Account extends SerializableType
      *   name: string,
      *   patient?: ?Patient,
      *   practitioner?: ?Practitioner,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -46,5 +52,8 @@ public function __construct(
         $this->name = $values['name'];
         $this->patient = $values['patient'] ?? null;
         $this->practitioner = $values['practitioner'] ?? null;
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-model/simple-fhir/src/Patient.php b/seed/php-model/simple-fhir/src/Patient.php
index 277551e550..bb245c25d6 100644
--- a/seed/php-model/simple-fhir/src/Patient.php
+++ b/seed/php-model/simple-fhir/src/Patient.php
@@ -3,11 +3,14 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 use Seed\Core\Types\ArrayType;
 
 class Patient extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -31,6 +34,9 @@ class Patient extends SerializableType
      *   resourceType: string,
      *   name: string,
      *   scripts: array<Script>,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -39,5 +45,8 @@ public function __construct(
         $this->resourceType = $values['resourceType'];
         $this->name = $values['name'];
         $this->scripts = $values['scripts'];
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-model/simple-fhir/src/Practitioner.php b/seed/php-model/simple-fhir/src/Practitioner.php
index 708896e88b..91290e6629 100644
--- a/seed/php-model/simple-fhir/src/Practitioner.php
+++ b/seed/php-model/simple-fhir/src/Practitioner.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 
 class Practitioner extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -23,6 +26,9 @@ class Practitioner extends SerializableType
      * @param array{
      *   resourceType: string,
      *   name: string,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -30,5 +36,8 @@ public function __construct(
     ) {
         $this->resourceType = $values['resourceType'];
         $this->name = $values['name'];
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-model/simple-fhir/src/Script.php b/seed/php-model/simple-fhir/src/Script.php
index 088cbeaaad..ec598e034d 100644
--- a/seed/php-model/simple-fhir/src/Script.php
+++ b/seed/php-model/simple-fhir/src/Script.php
@@ -3,10 +3,13 @@
 namespace Seed;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 
 class Script extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -23,6 +26,9 @@ class Script extends SerializableType
      * @param array{
      *   resourceType: string,
      *   name: string,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -30,5 +36,8 @@ public function __construct(
     ) {
         $this->resourceType = $values['resourceType'];
         $this->name = $values['name'];
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-model/simple-fhir/src/Traits/BaseResource.php b/seed/php-model/simple-fhir/src/Traits/BaseResource.php
new file mode 100644
index 0000000000..86b5045a19
--- /dev/null
+++ b/seed/php-model/simple-fhir/src/Traits/BaseResource.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Account;
+use Seed\Patient;
+use Seed\Practitioner;
+use Seed\Script;
+use Seed\Core\Types\ArrayType;
+use Seed\Core\Types\Union;
+use Seed\Memo;
+
+trait BaseResource
+{
+    /**
+     * @var string $id
+     */
+    #[JsonProperty('id')]
+    public string $id;
+
+    /**
+     * @var array<Account|Patient|Practitioner|Script> $relatedResources
+     */
+    #[JsonProperty('related_resources'), ArrayType([new Union(Account::class, Patient::class, Practitioner::class, Script::class)])]
+    public array $relatedResources;
+
+    /**
+     * @var Memo $memo
+     */
+    #[JsonProperty('memo')]
+    public Memo $memo;
+}
diff --git a/seed/php-model/trace/src/Playlist/Playlist.php b/seed/php-model/trace/src/Playlist/Playlist.php
index b5d0680e3c..20e2d6dd5d 100644
--- a/seed/php-model/trace/src/Playlist/Playlist.php
+++ b/seed/php-model/trace/src/Playlist/Playlist.php
@@ -3,10 +3,13 @@
 namespace Seed\Playlist;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Playlist\Traits\PlaylistCreateRequest;
 use Seed\Core\Json\JsonProperty;
 
 class Playlist extends SerializableType
 {
+    use PlaylistCreateRequest;
+
     /**
      * @var string $playlistId
      */
@@ -23,6 +26,8 @@ class Playlist extends SerializableType
      * @param array{
      *   playlistId: string,
      *   ownerId: string,
+     *   name: string,
+     *   problems: array<string>,
      * } $values
      */
     public function __construct(
@@ -30,5 +35,7 @@ public function __construct(
     ) {
         $this->playlistId = $values['playlistId'];
         $this->ownerId = $values['ownerId'];
+        $this->name = $values['name'];
+        $this->problems = $values['problems'];
     }
 }
diff --git a/seed/php-model/trace/src/Playlist/Traits/PlaylistCreateRequest.php b/seed/php-model/trace/src/Playlist/Traits/PlaylistCreateRequest.php
new file mode 100644
index 0000000000..3dd5b623fa
--- /dev/null
+++ b/seed/php-model/trace/src/Playlist/Traits/PlaylistCreateRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Seed\Playlist\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Core\Types\ArrayType;
+
+trait PlaylistCreateRequest
+{
+    /**
+     * @var string $name
+     */
+    #[JsonProperty('name')]
+    public string $name;
+
+    /**
+     * @var array<string> $problems
+     */
+    #[JsonProperty('problems'), ArrayType(['string'])]
+    public array $problems;
+}
diff --git a/seed/php-sdk/alias-extends/src/Requests/InlinedChildRequest.php b/seed/php-sdk/alias-extends/src/Requests/InlinedChildRequest.php
index e1f0d3fbf7..956fa09d1b 100644
--- a/seed/php-sdk/alias-extends/src/Requests/InlinedChildRequest.php
+++ b/seed/php-sdk/alias-extends/src/Requests/InlinedChildRequest.php
@@ -3,10 +3,13 @@
 namespace Seed\Requests;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\AliasType;
 use Seed\Core\Json\JsonProperty;
 
 class InlinedChildRequest extends SerializableType
 {
+    use AliasType;
+
     /**
      * @var string $child
      */
@@ -16,11 +19,13 @@ class InlinedChildRequest extends SerializableType
     /**
      * @param array{
      *   child: string,
+     *   parent: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->child = $values['child'];
+        $this->parent = $values['parent'];
     }
 }
diff --git a/seed/php-sdk/alias-extends/src/Traits/AliasType.php b/seed/php-sdk/alias-extends/src/Traits/AliasType.php
new file mode 100644
index 0000000000..6ec816f3e3
--- /dev/null
+++ b/seed/php-sdk/alias-extends/src/Traits/AliasType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait AliasType
+{
+    /**
+     * @var string $parent
+     */
+    #[JsonProperty('parent')]
+    public string $parent;
+}
diff --git a/seed/php-sdk/alias-extends/src/Traits/Parent_.php b/seed/php-sdk/alias-extends/src/Traits/Parent_.php
new file mode 100644
index 0000000000..2545c9f3ab
--- /dev/null
+++ b/seed/php-sdk/alias-extends/src/Traits/Parent_.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait Parent_
+{
+    /**
+     * @var string $parent
+     */
+    #[JsonProperty('parent')]
+    public string $parent;
+}
diff --git a/seed/php-sdk/alias-extends/src/Types/Child.php b/seed/php-sdk/alias-extends/src/Types/Child.php
index e31712505b..5001790278 100644
--- a/seed/php-sdk/alias-extends/src/Types/Child.php
+++ b/seed/php-sdk/alias-extends/src/Types/Child.php
@@ -3,10 +3,13 @@
 namespace Seed\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\Parent_;
 use Seed\Core\Json\JsonProperty;
 
 class Child extends SerializableType
 {
+    use Parent_;
+
     /**
      * @var string $child
      */
@@ -16,11 +19,13 @@ class Child extends SerializableType
     /**
      * @param array{
      *   child: string,
+     *   parent: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->child = $values['child'];
+        $this->parent = $values['parent'];
     }
 }
diff --git a/seed/php-sdk/circular-references-advanced/src/A/Types/A.php b/seed/php-sdk/circular-references-advanced/src/A/Types/A.php
index 5151cd8577..fe81f24ee8 100644
--- a/seed/php-sdk/circular-references-advanced/src/A/Types/A.php
+++ b/seed/php-sdk/circular-references-advanced/src/A/Types/A.php
@@ -3,7 +3,21 @@
 namespace Seed\A\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\RootType;
 
 class A extends SerializableType
 {
+    use RootType;
+
+
+    /**
+     * @param array{
+     *   s: string,
+     * } $values
+     */
+    public function __construct(
+        array $values,
+    ) {
+        $this->s = $values['s'];
+    }
 }
diff --git a/seed/php-sdk/circular-references-advanced/src/Traits/RootType.php b/seed/php-sdk/circular-references-advanced/src/Traits/RootType.php
new file mode 100644
index 0000000000..44f28a0911
--- /dev/null
+++ b/seed/php-sdk/circular-references-advanced/src/Traits/RootType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait RootType
+{
+    /**
+     * @var string $s
+     */
+    #[JsonProperty('s')]
+    public string $s;
+}
diff --git a/seed/php-sdk/circular-references/src/A/Types/A.php b/seed/php-sdk/circular-references/src/A/Types/A.php
index 5151cd8577..fe81f24ee8 100644
--- a/seed/php-sdk/circular-references/src/A/Types/A.php
+++ b/seed/php-sdk/circular-references/src/A/Types/A.php
@@ -3,7 +3,21 @@
 namespace Seed\A\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\RootType;
 
 class A extends SerializableType
 {
+    use RootType;
+
+
+    /**
+     * @param array{
+     *   s: string,
+     * } $values
+     */
+    public function __construct(
+        array $values,
+    ) {
+        $this->s = $values['s'];
+    }
 }
diff --git a/seed/php-sdk/circular-references/src/Traits/RootType.php b/seed/php-sdk/circular-references/src/Traits/RootType.php
new file mode 100644
index 0000000000..44f28a0911
--- /dev/null
+++ b/seed/php-sdk/circular-references/src/Traits/RootType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait RootType
+{
+    /**
+     * @var string $s
+     */
+    #[JsonProperty('s')]
+    public string $s;
+}
diff --git a/seed/php-sdk/examples/src/Types/Traits/Movie.php b/seed/php-sdk/examples/src/Types/Traits/Movie.php
new file mode 100644
index 0000000000..2f40680e30
--- /dev/null
+++ b/seed/php-sdk/examples/src/Types/Traits/Movie.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Seed\Types\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Core\Types\ArrayType;
+
+trait Movie
+{
+    /**
+     * @var string $id
+     */
+    #[JsonProperty('id')]
+    public string $id;
+
+    /**
+     * @var ?string $prequel
+     */
+    #[JsonProperty('prequel')]
+    public ?string $prequel;
+
+    /**
+     * @var string $title
+     */
+    #[JsonProperty('title')]
+    public string $title;
+
+    /**
+     * @var string $from
+     */
+    #[JsonProperty('from')]
+    public string $from;
+
+    /**
+     * @var float $rating The rating scale is one to five stars
+     */
+    #[JsonProperty('rating')]
+    public float $rating;
+
+    /**
+     * @var string $type
+     */
+    #[JsonProperty('type')]
+    public string $type;
+
+    /**
+     * @var string $tag
+     */
+    #[JsonProperty('tag')]
+    public string $tag;
+
+    /**
+     * @var ?string $book
+     */
+    #[JsonProperty('book')]
+    public ?string $book;
+
+    /**
+     * @var array<string, mixed> $metadata
+     */
+    #[JsonProperty('metadata'), ArrayType(['string' => 'mixed'])]
+    public array $metadata;
+
+    /**
+     * @var int $revenue
+     */
+    #[JsonProperty('revenue')]
+    public int $revenue;
+}
diff --git a/seed/php-sdk/examples/src/Types/Types/ExtendedMovie.php b/seed/php-sdk/examples/src/Types/Types/ExtendedMovie.php
index 5383325489..cfb47ab643 100644
--- a/seed/php-sdk/examples/src/Types/Types/ExtendedMovie.php
+++ b/seed/php-sdk/examples/src/Types/Types/ExtendedMovie.php
@@ -3,11 +3,14 @@
 namespace Seed\Types\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Types\Traits\Movie;
 use Seed\Core\Json\JsonProperty;
 use Seed\Core\Types\ArrayType;
 
 class ExtendedMovie extends SerializableType
 {
+    use Movie;
+
     /**
      * @var array<string> $cast
      */
@@ -17,11 +20,31 @@ class ExtendedMovie extends SerializableType
     /**
      * @param array{
      *   cast: array<string>,
+     *   id: string,
+     *   prequel?: ?string,
+     *   title: string,
+     *   from: string,
+     *   rating: float,
+     *   type: string,
+     *   tag: string,
+     *   book?: ?string,
+     *   metadata: array<string, mixed>,
+     *   revenue: int,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->cast = $values['cast'];
+        $this->id = $values['id'];
+        $this->prequel = $values['prequel'] ?? null;
+        $this->title = $values['title'];
+        $this->from = $values['from'];
+        $this->rating = $values['rating'];
+        $this->type = $values['type'];
+        $this->tag = $values['tag'];
+        $this->book = $values['book'] ?? null;
+        $this->metadata = $values['metadata'];
+        $this->revenue = $values['revenue'];
     }
 }
diff --git a/seed/php-sdk/pagination/src/Users/Traits/UserOptionalListPage.php b/seed/php-sdk/pagination/src/Users/Traits/UserOptionalListPage.php
new file mode 100644
index 0000000000..cec3f65b79
--- /dev/null
+++ b/seed/php-sdk/pagination/src/Users/Traits/UserOptionalListPage.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Seed\Users\Traits;
+
+use Seed\Users\Types\UserOptionalListContainer;
+use Seed\Core\Json\JsonProperty;
+
+trait UserOptionalListPage
+{
+    /**
+     * @var UserOptionalListContainer $data
+     */
+    #[JsonProperty('data')]
+    public UserOptionalListContainer $data;
+
+    /**
+     * @var ?string $next
+     */
+    #[JsonProperty('next')]
+    public ?string $next;
+}
diff --git a/seed/php-sdk/pagination/src/Users/Traits/UserPage.php b/seed/php-sdk/pagination/src/Users/Traits/UserPage.php
new file mode 100644
index 0000000000..1f142e511c
--- /dev/null
+++ b/seed/php-sdk/pagination/src/Users/Traits/UserPage.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Seed\Users\Traits;
+
+use Seed\Users\Types\UserListContainer;
+use Seed\Core\Json\JsonProperty;
+
+trait UserPage
+{
+    /**
+     * @var UserListContainer $data
+     */
+    #[JsonProperty('data')]
+    public UserListContainer $data;
+
+    /**
+     * @var ?string $next
+     */
+    #[JsonProperty('next')]
+    public ?string $next;
+}
diff --git a/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedOptionalListResponse.php b/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedOptionalListResponse.php
index 5866b827cb..8ffe8f6996 100644
--- a/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedOptionalListResponse.php
+++ b/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedOptionalListResponse.php
@@ -3,10 +3,13 @@
 namespace Seed\Users\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Users\Traits\UserOptionalListPage;
 use Seed\Core\Json\JsonProperty;
 
 class ListUsersExtendedOptionalListResponse extends SerializableType
 {
+    use UserOptionalListPage;
+
     /**
      * @var int $totalCount The totall number of /users
      */
@@ -16,11 +19,15 @@ class ListUsersExtendedOptionalListResponse extends SerializableType
     /**
      * @param array{
      *   totalCount: int,
+     *   data: UserOptionalListContainer,
+     *   next?: ?string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->totalCount = $values['totalCount'];
+        $this->data = $values['data'];
+        $this->next = $values['next'] ?? null;
     }
 }
diff --git a/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedResponse.php b/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedResponse.php
index 2629506d6e..b62f7dbeb8 100644
--- a/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedResponse.php
+++ b/seed/php-sdk/pagination/src/Users/Types/ListUsersExtendedResponse.php
@@ -3,10 +3,13 @@
 namespace Seed\Users\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Users\Traits\UserPage;
 use Seed\Core\Json\JsonProperty;
 
 class ListUsersExtendedResponse extends SerializableType
 {
+    use UserPage;
+
     /**
      * @var int $totalCount The totall number of /users
      */
@@ -16,11 +19,15 @@ class ListUsersExtendedResponse extends SerializableType
     /**
      * @param array{
      *   totalCount: int,
+     *   data: UserListContainer,
+     *   next?: ?string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->totalCount = $values['totalCount'];
+        $this->data = $values['data'];
+        $this->next = $values['next'] ?? null;
     }
 }
diff --git a/seed/php-sdk/response-property/src/Service/Traits/WithDocs.php b/seed/php-sdk/response-property/src/Service/Traits/WithDocs.php
new file mode 100644
index 0000000000..429bb4dd85
--- /dev/null
+++ b/seed/php-sdk/response-property/src/Service/Traits/WithDocs.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Seed\Service\Traits;
+
+use Seed\Core\Json\JsonProperty;
+
+trait WithDocs
+{
+    /**
+     * @var string $docs
+     */
+    #[JsonProperty('docs')]
+    public string $docs;
+}
diff --git a/seed/php-sdk/response-property/src/Service/Types/Response.php b/seed/php-sdk/response-property/src/Service/Types/Response.php
index 31d797461f..390c043273 100644
--- a/seed/php-sdk/response-property/src/Service/Types/Response.php
+++ b/seed/php-sdk/response-property/src/Service/Types/Response.php
@@ -3,10 +3,15 @@
 namespace Seed\Service\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\WithMetadata;
+use Seed\Service\Traits\WithDocs;
 use Seed\Core\Json\JsonProperty;
 
 class Response extends SerializableType
 {
+    use WithMetadata;
+    use WithDocs;
+
     /**
      * @var Movie $data
      */
@@ -16,11 +21,15 @@ class Response extends SerializableType
     /**
      * @param array{
      *   data: Movie,
+     *   metadata: array<string, string>,
+     *   docs: string,
      * } $values
      */
     public function __construct(
         array $values,
     ) {
         $this->data = $values['data'];
+        $this->metadata = $values['metadata'];
+        $this->docs = $values['docs'];
     }
 }
diff --git a/seed/php-sdk/response-property/src/Traits/WithMetadata.php b/seed/php-sdk/response-property/src/Traits/WithMetadata.php
new file mode 100644
index 0000000000..af6dc5a7ff
--- /dev/null
+++ b/seed/php-sdk/response-property/src/Traits/WithMetadata.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Core\Types\ArrayType;
+
+trait WithMetadata
+{
+    /**
+     * @var array<string, string> $metadata
+     */
+    #[JsonProperty('metadata'), ArrayType(['string' => 'string'])]
+    public array $metadata;
+}
diff --git a/seed/php-sdk/simple-fhir/src/Traits/BaseResource.php b/seed/php-sdk/simple-fhir/src/Traits/BaseResource.php
new file mode 100644
index 0000000000..d7885d6470
--- /dev/null
+++ b/seed/php-sdk/simple-fhir/src/Traits/BaseResource.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Seed\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Types\Account;
+use Seed\Types\Patient;
+use Seed\Types\Practitioner;
+use Seed\Types\Script;
+use Seed\Core\Types\ArrayType;
+use Seed\Core\Types\Union;
+use Seed\Types\Memo;
+
+trait BaseResource
+{
+    /**
+     * @var string $id
+     */
+    #[JsonProperty('id')]
+    public string $id;
+
+    /**
+     * @var array<Account|Patient|Practitioner|Script> $relatedResources
+     */
+    #[JsonProperty('related_resources'), ArrayType([new Union(Account::class, Patient::class, Practitioner::class, Script::class)])]
+    public array $relatedResources;
+
+    /**
+     * @var Memo $memo
+     */
+    #[JsonProperty('memo')]
+    public Memo $memo;
+}
diff --git a/seed/php-sdk/simple-fhir/src/Types/Account.php b/seed/php-sdk/simple-fhir/src/Types/Account.php
index 9163fd31a8..e16f2eaf4a 100644
--- a/seed/php-sdk/simple-fhir/src/Types/Account.php
+++ b/seed/php-sdk/simple-fhir/src/Types/Account.php
@@ -3,10 +3,13 @@
 namespace Seed\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 
 class Account extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -37,6 +40,9 @@ class Account extends SerializableType
      *   name: string,
      *   patient?: ?Patient,
      *   practitioner?: ?Practitioner,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -46,5 +52,8 @@ public function __construct(
         $this->name = $values['name'];
         $this->patient = $values['patient'] ?? null;
         $this->practitioner = $values['practitioner'] ?? null;
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-sdk/simple-fhir/src/Types/Patient.php b/seed/php-sdk/simple-fhir/src/Types/Patient.php
index 5d032c7635..638138bde1 100644
--- a/seed/php-sdk/simple-fhir/src/Types/Patient.php
+++ b/seed/php-sdk/simple-fhir/src/Types/Patient.php
@@ -3,11 +3,14 @@
 namespace Seed\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 use Seed\Core\Types\ArrayType;
 
 class Patient extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -31,6 +34,9 @@ class Patient extends SerializableType
      *   resourceType: string,
      *   name: string,
      *   scripts: array<Script>,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -39,5 +45,8 @@ public function __construct(
         $this->resourceType = $values['resourceType'];
         $this->name = $values['name'];
         $this->scripts = $values['scripts'];
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-sdk/simple-fhir/src/Types/Practitioner.php b/seed/php-sdk/simple-fhir/src/Types/Practitioner.php
index 6ac780ddfa..35c8337bac 100644
--- a/seed/php-sdk/simple-fhir/src/Types/Practitioner.php
+++ b/seed/php-sdk/simple-fhir/src/Types/Practitioner.php
@@ -3,10 +3,13 @@
 namespace Seed\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 
 class Practitioner extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -23,6 +26,9 @@ class Practitioner extends SerializableType
      * @param array{
      *   resourceType: string,
      *   name: string,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -30,5 +36,8 @@ public function __construct(
     ) {
         $this->resourceType = $values['resourceType'];
         $this->name = $values['name'];
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-sdk/simple-fhir/src/Types/Script.php b/seed/php-sdk/simple-fhir/src/Types/Script.php
index 28b3c5df2b..9603ca6ed1 100644
--- a/seed/php-sdk/simple-fhir/src/Types/Script.php
+++ b/seed/php-sdk/simple-fhir/src/Types/Script.php
@@ -3,10 +3,13 @@
 namespace Seed\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Traits\BaseResource;
 use Seed\Core\Json\JsonProperty;
 
 class Script extends SerializableType
 {
+    use BaseResource;
+
     /**
      * @var string $resourceType
      */
@@ -23,6 +26,9 @@ class Script extends SerializableType
      * @param array{
      *   resourceType: string,
      *   name: string,
+     *   id: string,
+     *   relatedResources: array<Account|Patient|Practitioner|Script>,
+     *   memo: Memo,
      * } $values
      */
     public function __construct(
@@ -30,5 +36,8 @@ public function __construct(
     ) {
         $this->resourceType = $values['resourceType'];
         $this->name = $values['name'];
+        $this->id = $values['id'];
+        $this->relatedResources = $values['relatedResources'];
+        $this->memo = $values['memo'];
     }
 }
diff --git a/seed/php-sdk/trace/src/Playlist/Traits/PlaylistCreateRequest.php b/seed/php-sdk/trace/src/Playlist/Traits/PlaylistCreateRequest.php
new file mode 100644
index 0000000000..3dd5b623fa
--- /dev/null
+++ b/seed/php-sdk/trace/src/Playlist/Traits/PlaylistCreateRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Seed\Playlist\Traits;
+
+use Seed\Core\Json\JsonProperty;
+use Seed\Core\Types\ArrayType;
+
+trait PlaylistCreateRequest
+{
+    /**
+     * @var string $name
+     */
+    #[JsonProperty('name')]
+    public string $name;
+
+    /**
+     * @var array<string> $problems
+     */
+    #[JsonProperty('problems'), ArrayType(['string'])]
+    public array $problems;
+}
diff --git a/seed/php-sdk/trace/src/Playlist/Types/Playlist.php b/seed/php-sdk/trace/src/Playlist/Types/Playlist.php
index 8b16caa92f..9bcebf5a28 100644
--- a/seed/php-sdk/trace/src/Playlist/Types/Playlist.php
+++ b/seed/php-sdk/trace/src/Playlist/Types/Playlist.php
@@ -3,10 +3,13 @@
 namespace Seed\Playlist\Types;
 
 use Seed\Core\Json\SerializableType;
+use Seed\Playlist\Traits\PlaylistCreateRequest;
 use Seed\Core\Json\JsonProperty;
 
 class Playlist extends SerializableType
 {
+    use PlaylistCreateRequest;
+
     /**
      * @var string $playlistId
      */
@@ -23,6 +26,8 @@ class Playlist extends SerializableType
      * @param array{
      *   playlistId: string,
      *   ownerId: string,
+     *   name: string,
+     *   problems: array<string>,
      * } $values
      */
     public function __construct(
@@ -30,5 +35,7 @@ public function __construct(
     ) {
         $this->playlistId = $values['playlistId'];
         $this->ownerId = $values['ownerId'];
+        $this->name = $values['name'];
+        $this->problems = $values['problems'];
     }
 }
diff --git a/seed/php-sdk/undiscriminated-unions/tests/Seed/Core/ScalarTypesTestWithTrait.php b/seed/php-sdk/undiscriminated-unions/tests/Seed/Core/ScalarTypesTestWithTrait.php
deleted file mode 100644
index 76ad5ca33a..0000000000
--- a/seed/php-sdk/undiscriminated-unions/tests/Seed/Core/ScalarTypesTestWithTrait.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace Seed\Tests\Core;
-
-use PHPUnit\Framework\TestCase;
-use Seed\Core\SerializableType;
-use Seed\Core\JsonProperty;
-use Seed\Core\ArrayType;
-use Seed\Core\Union;
-
-trait IntegerPropertyTrait
-{
-    /**
-     * @var int $integerProperty
-     */
-    #[JsonProperty('integer_property')]
-    public int $integerProperty;
-}
-
-class ScalarTypesTestTypeWithTrait extends SerializableType
-{
-    use IntegerPropertyTrait;
-
-    /**
-     * @var float $floatProperty
-     */
-    #[JsonProperty('float_property')]
-    public float $floatProperty;
-    /**
-     * @var float $otherFloatProperty
-     */
-    #[JsonProperty('other_float_property')]
-    public float $otherFloatProperty;
-
-    /**
-     * @var bool $booleanProperty
-     */
-    #[JsonProperty('boolean_property')]
-    public bool $booleanProperty;
-
-    /**
-     * @var string $stringProperty
-     */
-    #[JsonProperty('string_property')]
-    public string $stringProperty;
-
-    /**
-     * @var array<int|float> $intFloatArray
-     */
-    #[ArrayType([new Union('integer', 'float')])]
-    #[JsonProperty('int_float_array')]
-    public array $intFloatArray;
-
-    /**
-     * @var array<float> $floatArray
-     */
-    #[ArrayType(['float'])]
-    #[JsonProperty('float_array')]
-    public array $floatArray;
-
-    /**
-     * @var bool|null $nullableBooleanProperty
-     */
-    #[JsonProperty('nullable_boolean_property')]
-    public ?bool $nullableBooleanProperty;
-
-    /**
-     * @param array{
-     *   integerProperty: int,
-     *   floatProperty: float,
-     *   otherFloatProperty: float,
-     *   booleanProperty: bool,
-     *   stringProperty: string,
-     *   intFloatArray: array<int|float>,
-     *   floatArray: array<float>,
-     *   nullableBooleanProperty?: bool|null,
-     * } $values
-     */
-    public function __construct(
-        array $values,
-    ) {
-        $this->integerProperty = $values['integerProperty'];
-        $this->floatProperty = $values['floatProperty'];
-        $this->otherFloatProperty = $values['otherFloatProperty'];
-        $this->booleanProperty = $values['booleanProperty'];
-        $this->stringProperty = $values['stringProperty'];
-        $this->intFloatArray = $values['intFloatArray'];
-        $this->floatArray = $values['floatArray'];
-        $this->nullableBooleanProperty = $values['nullableBooleanProperty'] ?? null;
-    }
-}
-
-class ScalarTypesTestWithTrait extends TestCase
-{
-    public function testAllScalarTypesIncludingTraitProperty(): void
-    {
-        // Create test data
-        $data = [
-            'integer_property' => 42,
-            'float_property' => 3.14159,
-            'other_float_property' => 3,
-            'boolean_property' => true,
-            'string_property' => 'Hello, World!',
-            'int_float_array' => [1, 2.5, 3, 4.75],
-            'float_array' => [1, 2, 3, 4] // ensure we handle "integer-looking" floats
-        ];
-
-        $json = json_encode($data, JSON_THROW_ON_ERROR);
-
-        $object = ScalarTypesTestTypeWithTrait::fromJson($json);
-
-        $serializedJson = $object->toJson();
-
-        $this->assertJsonStringEqualsJsonString($json, $serializedJson, 'Serialized JSON does not match original JSON for ScalarTypesTestWithTrait.');
-
-        // Check scalar properties
-        $this->assertEquals(42, $object->integerProperty, 'integer_property should be 42.');
-        $this->assertEquals(3.14159, $object->floatProperty, 'float_property should be 3.14159.');
-        $this->assertTrue($object->booleanProperty, 'boolean_property should be true.');
-        $this->assertEquals('Hello, World!', $object->stringProperty, 'string_property should be "Hello, World!".');
-        $this->assertNull($object->nullableBooleanProperty, 'nullable_boolean_property should be null.');
-
-        // Check int_float_array
-        $this->assertEquals([1, 2.5, 3, 4.75], $object->intFloatArray, 'int_float_array should match the original data.');
-    }
-}
\ No newline at end of file