Skip to content

Commit 59e586c

Browse files
committed
refactor: removes need for final DTOs
1 parent 59514c3 commit 59e586c

17 files changed

+37
-37
lines changed

src/Common/Contracts/WithArrayTransformationInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function toArray(): array;
2828
* @since 1.0.0
2929
*
3030
* @param TArrayShape $array The array data.
31-
* @return static The created instance.
31+
* @return self<TArrayShape> The created instance.
3232
*/
33-
public static function fromArray(array $array);
33+
public static function fromArray(array $array): self;
3434
}

src/Files/DTO/File.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @extends AbstractDataValueObject<FileArrayShape>
2929
*/
30-
final class File extends AbstractDataValueObject
30+
class File extends AbstractDataValueObject
3131
{
3232
public const KEY_FILE_TYPE = 'fileType';
3333
public const KEY_MIME_TYPE = 'mimeType';
@@ -425,7 +425,7 @@ public function toArray(): array
425425
*
426426
* @since n.e.x.t
427427
*/
428-
public static function fromArray(array $array): File
428+
public static function fromArray(array $array): self
429429
{
430430
static::validateFromArrayData($array, [self::KEY_FILE_TYPE]);
431431

src/Messages/DTO/Message.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ public function toArray(): array
125125
*
126126
* @since n.e.x.t
127127
*
128-
* @return Message The specific message class based on the role.
128+
* @return self The specific message class based on the role.
129129
*/
130-
final public static function fromArray(array $array): Message
130+
final public static function fromArray(array $array): self
131131
{
132132
static::validateFromArrayData($array, [self::KEY_ROLE, self::KEY_PARTS]);
133133

src/Messages/DTO/MessagePart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*
3535
* @extends AbstractDataValueObject<MessagePartArrayShape>
3636
*/
37-
final class MessagePart extends AbstractDataValueObject
37+
class MessagePart extends AbstractDataValueObject
3838
{
3939
public const KEY_TYPE = 'type';
4040
public const KEY_TEXT = 'text';
@@ -258,7 +258,7 @@ public function toArray(): array
258258
*
259259
* @since n.e.x.t
260260
*/
261-
public static function fromArray(array $array): MessagePart
261+
public static function fromArray(array $array): self
262262
{
263263
static::validateFromArrayData($array, [self::KEY_TYPE]);
264264

src/Messages/DTO/ModelMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @since n.e.x.t
1717
*/
18-
final class ModelMessage extends Message
18+
class ModelMessage extends Message
1919
{
2020
/**
2121
* Constructor.

src/Messages/DTO/SystemMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @since n.e.x.t
1717
*/
18-
final class SystemMessage extends Message
18+
class SystemMessage extends Message
1919
{
2020
/**
2121
* Constructor.

src/Messages/DTO/UserMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @since n.e.x.t
1616
*/
17-
final class UserMessage extends Message
17+
class UserMessage extends Message
1818
{
1919
/**
2020
* Constructor.

src/Operations/DTO/GenerativeAiOperation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @extends AbstractDataValueObject<GenerativeAiOperationArrayShape>
2626
*/
27-
final class GenerativeAiOperation extends AbstractDataValueObject implements OperationInterface
27+
class GenerativeAiOperation extends AbstractDataValueObject implements OperationInterface
2828
{
2929
public const KEY_ID = 'id';
3030
public const KEY_STATE = 'state';
@@ -170,7 +170,7 @@ public function toArray(): array
170170
*
171171
* @since n.e.x.t
172172
*/
173-
public static function fromArray(array $array): GenerativeAiOperation
173+
public static function fromArray(array $array): self
174174
{
175175
static::validateFromArrayData($array, [self::KEY_ID, self::KEY_STATE]);
176176

src/Results/DTO/Candidate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* @extends AbstractDataValueObject<CandidateArrayShape>
2424
*/
25-
final class Candidate extends AbstractDataValueObject
25+
class Candidate extends AbstractDataValueObject
2626
{
2727
public const KEY_MESSAGE = 'message';
2828
public const KEY_FINISH_REASON = 'finishReason';
@@ -146,7 +146,7 @@ public function toArray(): array
146146
*
147147
* @since n.e.x.t
148148
*/
149-
public static function fromArray(array $array): Candidate
149+
public static function fromArray(array $array): self
150150
{
151151
static::validateFromArrayData($array, [self::KEY_MESSAGE, self::KEY_FINISH_REASON, self::KEY_TOKEN_COUNT]);
152152

src/Results/DTO/GenerativeAiResult.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*
3030
* @extends AbstractDataValueObject<GenerativeAiResultArrayShape>
3131
*/
32-
final class GenerativeAiResult extends AbstractDataValueObject implements ResultInterface
32+
class GenerativeAiResult extends AbstractDataValueObject implements ResultInterface
3333
{
3434
public const KEY_ID = 'id';
3535
public const KEY_CANDIDATES = 'candidates';
@@ -417,7 +417,7 @@ public function toArray(): array
417417
*
418418
* @since n.e.x.t
419419
*/
420-
public static function fromArray(array $array): GenerativeAiResult
420+
public static function fromArray(array $array): self
421421
{
422422
static::validateFromArrayData($array, [self::KEY_ID, self::KEY_CANDIDATES, self::KEY_TOKEN_USAGE]);
423423

0 commit comments

Comments
 (0)