From 3c1fe6692eec008264f0c918478f02005725be4e Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Thu, 10 Apr 2025 17:29:26 +0100 Subject: [PATCH 1/6] chore: add purified_description to custom field models --- src/Model/Shared/CustomField.php | 26 +++++++++++++++++++ .../Ticket/TicketCustomFieldData.php | 3 ++- .../DataFixtures/User/UserCustomFieldData.php | 3 ++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/Model/Shared/CustomField.php b/src/Model/Shared/CustomField.php index ed9e4858..94fcb6ee 100644 --- a/src/Model/Shared/CustomField.php +++ b/src/Model/Shared/CustomField.php @@ -108,6 +108,12 @@ abstract class CustomField extends BaseModel */ private $description; + /** + * @var string|null + * @SerializedName("purified_description") + */ + private $purifiedDescription; + /** * @var int|null * @SerializedName("type") @@ -385,6 +391,26 @@ public function setDescription(?string $description): self return $this; } + /** + * @return string|null + */ + public function getPurifiedDescription(): ?string + { + return $this->purified_description; + } + + /** + * @param string|null $description + * @return self + */ + public function setPurifiedDescription(?string $description): self + { + $this->purified_description = $description; + + return $this; + } + + /** * @return int|null */ diff --git a/test/DataFixtures/Ticket/TicketCustomFieldData.php b/test/DataFixtures/Ticket/TicketCustomFieldData.php index d7a3f2b7..01da3e8d 100644 --- a/test/DataFixtures/Ticket/TicketCustomFieldData.php +++ b/test/DataFixtures/Ticket/TicketCustomFieldData.php @@ -13,7 +13,8 @@ class TicketCustomFieldData extends BaseModelData public const DATA = [ 'id' => 1, 'name' => 'Related Product/Service', - 'description' => 'Please select an option if this ticket is related to one of your products/services.', + 'description' => '

Please select an option if this ticket is related to one of your products/services.

', + 'purified_description' => '

Please select an option if this ticket is related to one of your products/services.

', 'type' => 5, 'depends_on_field_id' => null, 'depends_on_option_id' => null, diff --git a/test/DataFixtures/User/UserCustomFieldData.php b/test/DataFixtures/User/UserCustomFieldData.php index faeb1cde..1505f8fc 100644 --- a/test/DataFixtures/User/UserCustomFieldData.php +++ b/test/DataFixtures/User/UserCustomFieldData.php @@ -13,7 +13,8 @@ class UserCustomFieldData extends BaseModelData public const DATA = [ 'id' => 1, 'name' => 'test', - 'description' => 'custom', + 'description' => '

Custom

', + 'purified_description' => '

Custom

', 'type' => 0, 'depends_on_field_id' => null, 'depends_on_option_id' => null, From 6f97491530fcb51cfa0d323651981d9e538ff442 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Thu, 10 Apr 2025 17:24:13 +0100 Subject: [PATCH 2/6] fix phpcs --- test/Unit/Config/ApiContextTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Unit/Config/ApiContextTest.php b/test/Unit/Config/ApiContextTest.php index cc303e3a..b6289bd9 100644 --- a/test/Unit/Config/ApiContextTest.php +++ b/test/Unit/Config/ApiContextTest.php @@ -94,7 +94,7 @@ public function provideGetApiUrlCases(): iterable yield [$apiContext, 'http://localhost:80/test/test/api/']; - $apiContext = (new ApiContext(self::HOST, self::TOKEN)); + $apiContext = new ApiContext(self::HOST, self::TOKEN); yield [$apiContext, 'https://localhost:443/api/']; @@ -120,7 +120,7 @@ public function provideGetApiPathCases(): iterable yield [$apiContext, '/test/test/api/']; - $apiContext = (new ApiContext(self::HOST, self::TOKEN)); + $apiContext = new ApiContext(self::HOST, self::TOKEN); yield [$apiContext, '/api/']; } From d1ad698eac76557a19710cc5324caaa8e976ce67 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Thu, 10 Apr 2025 17:38:35 +0100 Subject: [PATCH 3/6] add to translations too --- src/Model/Shared/CustomField.php | 1 - .../Ticket/TicketCustomFieldTranslation.php | 25 +++++++++++++++++++ src/Model/User/UserCustomFieldTranslation.php | 25 +++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/Model/Shared/CustomField.php b/src/Model/Shared/CustomField.php index 94fcb6ee..0c6c4161 100644 --- a/src/Model/Shared/CustomField.php +++ b/src/Model/Shared/CustomField.php @@ -410,7 +410,6 @@ public function setPurifiedDescription(?string $description): self return $this; } - /** * @return int|null */ diff --git a/src/Model/Ticket/TicketCustomFieldTranslation.php b/src/Model/Ticket/TicketCustomFieldTranslation.php index 8944e89c..85eb9cd1 100644 --- a/src/Model/Ticket/TicketCustomFieldTranslation.php +++ b/src/Model/Ticket/TicketCustomFieldTranslation.php @@ -31,6 +31,12 @@ class TicketCustomFieldTranslation extends BaseTranslation */ private $description; + /** + * @var string|null + * @SerializedName("purified_description") + */ + private $purifiedDescription; + /** * @var string|null * @SerializedName("regex_error_message") @@ -113,6 +119,25 @@ public function setDescription(?string $description): self return $this; } + /** + * @return string|null + */ + public function getPurifiedDescription(): ?string + { + return $this->purified_description; + } + + /** + * @param string|null $description + * @return self + */ + public function setPurifiedDescription(?string $description): self + { + $this->purified_description = $description; + + return $this; + } + /** * @return string|null */ diff --git a/src/Model/User/UserCustomFieldTranslation.php b/src/Model/User/UserCustomFieldTranslation.php index b3841057..aa41211d 100644 --- a/src/Model/User/UserCustomFieldTranslation.php +++ b/src/Model/User/UserCustomFieldTranslation.php @@ -31,6 +31,12 @@ class UserCustomFieldTranslation extends BaseTranslation */ private $description; + /** + * @var string|null + * @SerializedName("purified_description") + */ + private $purifiedDescription; + /** * @var string|null * @SerializedName("regex_error_message") @@ -113,6 +119,25 @@ public function setDescription(?string $description): self return $this; } + /** + * @return string|null + */ + public function getPurifiedDescription(): ?string + { + return $this->purified_description; + } + + /** + * @param string|null $description + * @return self + */ + public function setPurifiedDescription(?string $description): self + { + $this->purified_description = $description; + + return $this; + } + /** * @return string|null */ From 42aa54e1fa02c7ec7b2cd32f224527b576562ec5 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:59:16 +0100 Subject: [PATCH 4/6] fix --- src/Model/Ticket/TicketCustomFieldTranslation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Ticket/TicketCustomFieldTranslation.php b/src/Model/Ticket/TicketCustomFieldTranslation.php index 85eb9cd1..cfb05e63 100644 --- a/src/Model/Ticket/TicketCustomFieldTranslation.php +++ b/src/Model/Ticket/TicketCustomFieldTranslation.php @@ -124,7 +124,7 @@ public function setDescription(?string $description): self */ public function getPurifiedDescription(): ?string { - return $this->purified_description; + return $this->purifiedDescription; } /** @@ -133,7 +133,7 @@ public function getPurifiedDescription(): ?string */ public function setPurifiedDescription(?string $description): self { - $this->purified_description = $description; + $this->purifiedDescription = $description; return $this; } From 1549bedd8416c54cc093adecb03aedef0e054027 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Fri, 11 Apr 2025 11:02:00 +0100 Subject: [PATCH 5/6] fix --- src/Model/User/UserCustomFieldTranslation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/User/UserCustomFieldTranslation.php b/src/Model/User/UserCustomFieldTranslation.php index aa41211d..a5551f02 100644 --- a/src/Model/User/UserCustomFieldTranslation.php +++ b/src/Model/User/UserCustomFieldTranslation.php @@ -124,7 +124,7 @@ public function setDescription(?string $description): self */ public function getPurifiedDescription(): ?string { - return $this->purified_description; + return $this->purifiedDescription; } /** @@ -133,7 +133,7 @@ public function getPurifiedDescription(): ?string */ public function setPurifiedDescription(?string $description): self { - $this->purified_description = $description; + $this->purifiedDescription = $description; return $this; } From c13bb750871a36d6e3677253f1b5bbed575a74d9 Mon Sep 17 00:00:00 2001 From: Jay Shah <602425+jshah4517@users.noreply.github.com> Date: Fri, 11 Apr 2025 11:03:37 +0100 Subject: [PATCH 6/6] fix --- src/Model/Shared/CustomField.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Shared/CustomField.php b/src/Model/Shared/CustomField.php index 0c6c4161..9c9ce3f6 100644 --- a/src/Model/Shared/CustomField.php +++ b/src/Model/Shared/CustomField.php @@ -396,7 +396,7 @@ public function setDescription(?string $description): self */ public function getPurifiedDescription(): ?string { - return $this->purified_description; + return $this->purifiedDescription; } /** @@ -405,7 +405,7 @@ public function getPurifiedDescription(): ?string */ public function setPurifiedDescription(?string $description): self { - $this->purified_description = $description; + $this->purifiedDescription = $description; return $this; }