From f7e9ab78a20d60719646e0c77d212ffc28dc46d0 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Tue, 15 Oct 2024 14:16:43 +0200 Subject: [PATCH] fix: Remvove Laravel deps call + add PHP>8.1 compliance --- composer.json | 2 +- src/Models/Answer.php | 1 + src/Models/ArcadiaMailDefault.php | 1 + src/Models/ArcadiaMailGame.php | 1 + src/Models/Customer.php | 3 ++- src/Models/Question.php | 1 + src/Traits/BaseEnum.php | 2 +- src/Utils.php | 3 +-- src/WordPress/WPCrmUser.php | 1 + 9 files changed, 10 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 936d23d..034de84 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "LDC CRM Client V4", "license": "MIT", - "version": "4.0.4", + "version": "4.0.5", "authors": [ { "name": "Jérémy Munsch", diff --git a/src/Models/Answer.php b/src/Models/Answer.php index 8f9f9d3..c75ad73 100644 --- a/src/Models/Answer.php +++ b/src/Models/Answer.php @@ -125,6 +125,7 @@ class Answer extends ClientModel * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return [ diff --git a/src/Models/ArcadiaMailDefault.php b/src/Models/ArcadiaMailDefault.php index 8f0d05a..eec8210 100644 --- a/src/Models/ArcadiaMailDefault.php +++ b/src/Models/ArcadiaMailDefault.php @@ -391,6 +391,7 @@ class ArcadiaMailDefault extends ClientModel * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return [ diff --git a/src/Models/ArcadiaMailGame.php b/src/Models/ArcadiaMailGame.php index 069f19e..2b9e482 100644 --- a/src/Models/ArcadiaMailGame.php +++ b/src/Models/ArcadiaMailGame.php @@ -334,6 +334,7 @@ class ArcadiaMailGame extends ClientModel * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return [ diff --git a/src/Models/Customer.php b/src/Models/Customer.php index e7c3f9d..8c819d2 100644 --- a/src/Models/Customer.php +++ b/src/Models/Customer.php @@ -355,7 +355,7 @@ class Customer extends ClientModel try { $properties['country'] = (\is_object($properties['country']) and get_class($properties['country']) === Country::class) ? - $properties['country']->value : (ctype_digit($properties['country']) ? + $properties['country']->value : (is_numeric(trim($properties['country'])) ? (int)$properties['country'] : $properties['country']); } catch (TypeError | \BadMethodCallException $e) { // * Cast anyway @@ -614,6 +614,7 @@ class Customer extends ClientModel * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return [ diff --git a/src/Models/Question.php b/src/Models/Question.php index 370e36f..51098df 100644 --- a/src/Models/Question.php +++ b/src/Models/Question.php @@ -298,6 +298,7 @@ class Question extends ClientModel * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return [ diff --git a/src/Traits/BaseEnum.php b/src/Traits/BaseEnum.php index c895a72..e9c6442 100644 --- a/src/Traits/BaseEnum.php +++ b/src/Traits/BaseEnum.php @@ -124,7 +124,7 @@ trait BaseEnum * Fetch enum using value. * * @param \LDC\LDCCRM\Traits\BaseEnum|integer|string $value - * @param string $field + * @param string $field * @return \LDC\LDCCRM\Traits\BaseEnum|null */ public static function make(self|int|string $value, string $field = 'value'): self|null diff --git a/src/Utils.php b/src/Utils.php index 6aee068..8da153f 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -9,7 +9,6 @@ use LDC\LDCCRM\Exceptions\SkipValidationException; use LDC\LDCCRM\Exceptions\ValidationException; use LDC\LDCCRM\Transport\Request; use Respect\Validation\Validator; -use Illuminate\Support\Str; /** * This is the LDCCRM utility class @@ -600,7 +599,7 @@ class Utils $route['uri'] = sprintf('%s?%s', $route['uri'], \http_build_query($query)); } return new Request( - HttpMethods::make(Str::lower($route['methods'][0]), 'name'), + HttpMethods::make(strtolower($route['methods'][0]), 'name'), $route['uri'], [], $data diff --git a/src/WordPress/WPCrmUser.php b/src/WordPress/WPCrmUser.php index a778d65..5270f7d 100644 --- a/src/WordPress/WPCrmUser.php +++ b/src/WordPress/WPCrmUser.php @@ -187,6 +187,7 @@ class WPCrmUser implements JsonSerializable * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return [