From dd1b6ea61df520889850be01e5af937ee1ce238a Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 25 Mar 2024 16:55:33 +0500 Subject: [PATCH] fix tests, update deps --- composer.json | 4 ++-- src/AmoCRM/Client/AmoCRMApiRequest.php | 2 +- .../Sources/SourceServicesCollection.php | 1 - .../Sources/SourceServicesPagesCollection.php | 1 - src/AmoCRM/EntitiesServices/Sources.php | 1 - src/AmoCRM/Filters/LeadsFilter.php | 19 +++++++++++-------- .../BirthdayCustomFieldValueCollection.php | 1 - .../CategoryCustomFieldValueCollection.php | 1 - .../CheckboxCustomFieldValueCollection.php | 1 - .../DateCustomFieldValueCollection.php | 1 - .../DateTimeCustomFieldValueCollection.php | 1 - .../LegalEntityCustomFieldValueCollection.php | 1 - ...LinkedEntityCustomFieldValueCollection.php | 1 - .../MultiselectCustomFieldValueCollection.php | 1 - .../MultitextCustomFieldValueCollection.php | 1 - .../NumericCustomFieldValueCollection.php | 1 - ...OrgLegalNameCustomFieldValueCollection.php | 1 - .../PayerCustomFieldValueCollection.php | 1 - .../PriceCustomFieldValueCollection.php | 1 - .../RadiobuttonCustomFieldValueCollection.php | 1 - .../SelectCustomFieldValueCollection.php | 1 - ...SmartAddressCustomFieldValueCollection.php | 1 - ...treetAddressCustomFieldValueCollection.php | 1 - .../SupplierCustomFieldValueCollection.php | 1 - .../TextCustomFieldValueCollection.php | 1 - .../TextareaCustomFieldValueCollection.php | 1 - ...TrackingDataCustomFieldValueCollection.php | 1 - .../UrlCustomFieldValueCollection.php | 1 - .../BirthdayCustomFieldValueModel.php | 1 - .../CategoryCustomFieldValueModel.php | 1 - .../ValueModels/DateCustomFieldValueModel.php | 12 ++++++++---- .../MultiselectCustomFieldValueModel.php | 1 - .../NumericCustomFieldValueModel.php | 1 - .../OrgLegalNameCustomFieldValueModel.php | 1 - .../PriceCustomFieldValueModel.php | 1 - .../RadiobuttonCustomFieldValueModel.php | 1 - .../SmartAddressCustomFieldValueModel.php | 1 - .../StreetAdressCustomFieldValueModel.php | 1 - .../ValueModels/TextCustomFieldValueModel.php | 1 - .../TextareaCustomFieldValueModel.php | 1 - .../TrackingDataCustomFieldValueModel.php | 1 - .../ValueModels/UrlCustomFieldValueModel.php | 1 - .../Models/Sources/SourceServiceModel.php | 1 - .../Models/Sources/SourceServicePageModel.php | 1 - src/AmoCRM/Models/Traits/MutateTagsTrait.php | 2 -- .../AmoCRM/Client/AmoCRMApiClientTest.php | 7 +++++++ .../Cases/AmoCRM/Filters/LeadsFilterTest.php | 9 +++++++++ .../DateCustomFieldValueModelTest.php | 3 ++- tests/Cases/AmoCRM/Models/NoteModelTest.php | 3 ++- tests/Cases/NoteTypes/CallInNoteTest.php | 2 +- tests/Cases/NoteTypes/CommonNoteTest.php | 2 +- 51 files changed, 44 insertions(+), 61 deletions(-) diff --git a/composer.json b/composer.json index 6ba9a469..3ff61e8f 100644 --- a/composer.json +++ b/composer.json @@ -27,12 +27,12 @@ "fig/http-message-util": "1.*", "ramsey/uuid": "^3 || ^4", "lcobucci/jwt": "^3.4.6 || ^4.0.4", - "nesbot/carbon": "^2.52", + "nesbot/carbon": "^2.52 || ^3.0.0", "ext-fileinfo": "*" }, "require-dev": { "phpunit/phpunit": "7.* || 8.* || 9.*", - "squizlabs/php_codesniffer": "3.5.*" + "squizlabs/php_codesniffer": "^3.5.2" }, "autoload": { "psr-4": { diff --git a/src/AmoCRM/Client/AmoCRMApiRequest.php b/src/AmoCRM/Client/AmoCRMApiRequest.php index 6cd829b6..53e5adea 100644 --- a/src/AmoCRM/Client/AmoCRMApiRequest.php +++ b/src/AmoCRM/Client/AmoCRMApiRequest.php @@ -36,7 +36,7 @@ class AmoCRMApiRequest public const CONNECT_TIMEOUT = 5; public const REQUEST_TIMEOUT = 20; //TODO Do not forget to change this on each release - public const LIBRARY_VERSION = '1.6.1'; + public const LIBRARY_VERSION = '1.7.0'; public const USER_AGENT = 'amoCRM-API-Library/' . self::LIBRARY_VERSION; public const SUCCESS_STATUSES = [ diff --git a/src/AmoCRM/Collections/Sources/SourceServicesCollection.php b/src/AmoCRM/Collections/Sources/SourceServicesCollection.php index eed9113f..36fc22e9 100644 --- a/src/AmoCRM/Collections/Sources/SourceServicesCollection.php +++ b/src/AmoCRM/Collections/Sources/SourceServicesCollection.php @@ -14,6 +14,5 @@ */ class SourceServicesCollection extends BaseApiCollection { - public const ITEM_CLASS = SourceServiceModel::class; } diff --git a/src/AmoCRM/Collections/Sources/SourceServicesPagesCollection.php b/src/AmoCRM/Collections/Sources/SourceServicesPagesCollection.php index d8d03c8a..472437d3 100644 --- a/src/AmoCRM/Collections/Sources/SourceServicesPagesCollection.php +++ b/src/AmoCRM/Collections/Sources/SourceServicesPagesCollection.php @@ -13,6 +13,5 @@ */ class SourceServicesPagesCollection extends BaseApiCollection { - public const ITEM_CLASS = SourceServicePageModel::class; } diff --git a/src/AmoCRM/EntitiesServices/Sources.php b/src/AmoCRM/EntitiesServices/Sources.php index 7e22dc9a..315a9ebf 100644 --- a/src/AmoCRM/EntitiesServices/Sources.php +++ b/src/AmoCRM/EntitiesServices/Sources.php @@ -27,7 +27,6 @@ */ class Sources extends BaseEntity implements HasDeleteMethodInterface { - /** * @var string */ diff --git a/src/AmoCRM/Filters/LeadsFilter.php b/src/AmoCRM/Filters/LeadsFilter.php index 885dbc5c..434aba52 100755 --- a/src/AmoCRM/Filters/LeadsFilter.php +++ b/src/AmoCRM/Filters/LeadsFilter.php @@ -9,6 +9,7 @@ use AmoCRM\Filters\Traits\OrderTrait; use AmoCRM\Filters\Traits\PagesFilterTrait; use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait; +use TypeError; use function array_filter; use function array_map; @@ -312,13 +313,13 @@ public function setStatuses(?array $statuses): LeadsFilter $statusesFilter = []; foreach ($statuses as $status) { - if (!isset($status['status_id']) || !isset($status['pipeline_id'])) { + if (!isset($status['status_id'], $status['pipeline_id'])) { continue; } $statusesFilter[] = [ - 'status_id' => (int)$status['status_id'] ?? null, - 'pipeline_id' => (int)$status['pipeline_id'] ?? null, + 'status_id' => !empty($status['status_id']) ? (int)$status['status_id'] : null, + 'pipeline_id' => !empty($status['pipeline_id']) ? (int)$status['pipeline_id'] : null, ]; } @@ -401,12 +402,16 @@ public function getQuery(): ?string } /** - * @param string|null $query + * @param string|int|null $query * * @return LeadsFilter */ - public function setQuery(?string $query): self + public function setQuery($query): self { + if (!is_string($query) && !is_numeric($query)) { + throw new TypeError('Invalid query type'); + } + if (!empty($query)) { $this->query = (string)$query; } @@ -481,8 +486,6 @@ public function buildFilter(): array $filter['order'] = $this->getOrder(); } - $filter = $this->buildPagesFilter($filter); - - return $filter; + return $this->buildPagesFilter($filter); } } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/BirthdayCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/BirthdayCustomFieldValueCollection.php index 62b0e427..6b852fd0 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/BirthdayCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/BirthdayCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class BirthdayCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CategoryCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CategoryCustomFieldValueCollection.php index 983afa06..9a5c7956 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CategoryCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CategoryCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class CategoryCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CheckboxCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CheckboxCustomFieldValueCollection.php index 164ea180..f7abbc3a 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CheckboxCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/CheckboxCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class CheckboxCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateCustomFieldValueCollection.php index 19608fac..eb45313f 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class DateCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateTimeCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateTimeCustomFieldValueCollection.php index 70f8d217..7e721b14 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateTimeCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/DateTimeCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class DateTimeCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LegalEntityCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LegalEntityCustomFieldValueCollection.php index bcd03644..d62c7e16 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LegalEntityCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LegalEntityCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class LegalEntityCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LinkedEntityCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LinkedEntityCustomFieldValueCollection.php index b1bdbc3f..7436a2b5 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LinkedEntityCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/LinkedEntityCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class LinkedEntityCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultiselectCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultiselectCustomFieldValueCollection.php index 296b6c1a..8996d013 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultiselectCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultiselectCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class MultiselectCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultitextCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultitextCustomFieldValueCollection.php index 1e4cd883..9744307c 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultitextCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MultitextCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class MultitextCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/NumericCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/NumericCustomFieldValueCollection.php index 45ac9722..0be2468b 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/NumericCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/NumericCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class NumericCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/OrgLegalNameCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/OrgLegalNameCustomFieldValueCollection.php index 0e6ae189..c78d8495 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/OrgLegalNameCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/OrgLegalNameCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class OrgLegalNameCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PayerCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PayerCustomFieldValueCollection.php index f907be9c..c9fab186 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PayerCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PayerCustomFieldValueCollection.php @@ -11,5 +11,4 @@ */ class PayerCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PriceCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PriceCustomFieldValueCollection.php index b4af0dda..c6502e15 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PriceCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/PriceCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class PriceCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/RadiobuttonCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/RadiobuttonCustomFieldValueCollection.php index 12527482..0b475446 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/RadiobuttonCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/RadiobuttonCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class RadiobuttonCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SelectCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SelectCustomFieldValueCollection.php index e78c25a5..ed934a57 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SelectCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SelectCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class SelectCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SmartAddressCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SmartAddressCustomFieldValueCollection.php index ae31688b..00f48be7 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SmartAddressCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SmartAddressCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class SmartAddressCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/StreetAddressCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/StreetAddressCustomFieldValueCollection.php index 8085ac5c..c5f04111 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/StreetAddressCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/StreetAddressCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class StreetAddressCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SupplierCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SupplierCustomFieldValueCollection.php index 0174b05b..7f149287 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SupplierCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/SupplierCustomFieldValueCollection.php @@ -11,5 +11,4 @@ */ class SupplierCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextCustomFieldValueCollection.php index f47a25d8..af81a94f 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class TextCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextareaCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextareaCustomFieldValueCollection.php index 1884f14f..43b8043e 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextareaCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TextareaCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class TextareaCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TrackingDataCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TrackingDataCustomFieldValueCollection.php index 16192d84..84ca2ee3 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TrackingDataCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/TrackingDataCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class TrackingDataCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/UrlCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/UrlCustomFieldValueCollection.php index 3519ddc2..999b0073 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/UrlCustomFieldValueCollection.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/UrlCustomFieldValueCollection.php @@ -9,5 +9,4 @@ */ class UrlCustomFieldValueCollection extends BaseCustomFieldValueCollection { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/BirthdayCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/BirthdayCustomFieldValueModel.php index 458a6e73..8f83248f 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/BirthdayCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/BirthdayCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class BirthdayCustomFieldValueModel extends DateCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/CategoryCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/CategoryCustomFieldValueModel.php index 7af56964..ca530cb2 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/CategoryCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/CategoryCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class CategoryCustomFieldValueModel extends BaseEnumCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/DateCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/DateCustomFieldValueModel.php index 9d2669b0..2be69aaf 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/DateCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/DateCustomFieldValueModel.php @@ -1,5 +1,7 @@ value = $dateTimeValue; } + + $dateTimeValue = Carbon::createFromTimestamp($fieldValue); + $this->value = $dateTimeValue; } return $this; diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/MultiselectCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/MultiselectCustomFieldValueModel.php index f56bfa52..74b55a0c 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/MultiselectCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/MultiselectCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class MultiselectCustomFieldValueModel extends BaseEnumCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/NumericCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/NumericCustomFieldValueModel.php index 60ab9720..50e8f914 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/NumericCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/NumericCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class NumericCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/OrgLegalNameCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/OrgLegalNameCustomFieldValueModel.php index 1ab3f682..d271d563 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/OrgLegalNameCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/OrgLegalNameCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class OrgLegalNameCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/PriceCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/PriceCustomFieldValueModel.php index 630de18f..df6f1269 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/PriceCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/PriceCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class PriceCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/RadiobuttonCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/RadiobuttonCustomFieldValueModel.php index 6a11009a..c9fb87ba 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/RadiobuttonCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/RadiobuttonCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class RadiobuttonCustomFieldValueModel extends BaseEnumCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/SmartAddressCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/SmartAddressCustomFieldValueModel.php index 2e3d3c86..18e77f24 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/SmartAddressCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/SmartAddressCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class SmartAddressCustomFieldValueModel extends BaseEnumCodeCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/StreetAdressCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/StreetAdressCustomFieldValueModel.php index dc4522ca..2b153147 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/StreetAdressCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/StreetAdressCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class StreetAdressCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextCustomFieldValueModel.php index c596963a..d09d0d86 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class TextCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextareaCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextareaCustomFieldValueModel.php index a509a6da..7339180f 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextareaCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TextareaCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class TextareaCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TrackingDataCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TrackingDataCustomFieldValueModel.php index 2c340185..9f617289 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TrackingDataCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/TrackingDataCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class TrackingDataCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/UrlCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/UrlCustomFieldValueModel.php index ba483535..3afd59f0 100644 --- a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/UrlCustomFieldValueModel.php +++ b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/UrlCustomFieldValueModel.php @@ -11,5 +11,4 @@ */ class UrlCustomFieldValueModel extends BaseCustomFieldValueModel { - } diff --git a/src/AmoCRM/Models/Sources/SourceServiceModel.php b/src/AmoCRM/Models/Sources/SourceServiceModel.php index 2661f0c3..a8522232 100644 --- a/src/AmoCRM/Models/Sources/SourceServiceModel.php +++ b/src/AmoCRM/Models/Sources/SourceServiceModel.php @@ -8,7 +8,6 @@ class SourceServiceModel extends BaseApiModel implements Arrayable { - /** * @var string */ diff --git a/src/AmoCRM/Models/Sources/SourceServicePageModel.php b/src/AmoCRM/Models/Sources/SourceServicePageModel.php index 82311882..4cdcc31a 100644 --- a/src/AmoCRM/Models/Sources/SourceServicePageModel.php +++ b/src/AmoCRM/Models/Sources/SourceServicePageModel.php @@ -7,7 +7,6 @@ class SourceServicePageModel extends BaseApiModel implements Arrayable { - /** * @var string */ diff --git a/src/AmoCRM/Models/Traits/MutateTagsTrait.php b/src/AmoCRM/Models/Traits/MutateTagsTrait.php index 420274c4..2f996a72 100644 --- a/src/AmoCRM/Models/Traits/MutateTagsTrait.php +++ b/src/AmoCRM/Models/Traits/MutateTagsTrait.php @@ -4,8 +4,6 @@ namespace AmoCRM\Models\Traits; -use AmoCRM\Models\Interfaces\ComplexTagsManagerInterface; - /** * Trait TagsTrait * diff --git a/tests/Cases/AmoCRM/Client/AmoCRMApiClientTest.php b/tests/Cases/AmoCRM/Client/AmoCRMApiClientTest.php index e12d012c..e67ef73c 100644 --- a/tests/Cases/AmoCRM/Client/AmoCRMApiClientTest.php +++ b/tests/Cases/AmoCRM/Client/AmoCRMApiClientTest.php @@ -1,5 +1,9 @@ leadsFilter->setQuery($obj); + + $int = 123; + $this->leadsFilter->setQuery($int); } /** diff --git a/tests/Cases/AmoCRM/Models/CustomFieldsValues/ValueModel/DateCustomFieldValueModelTest.php b/tests/Cases/AmoCRM/Models/CustomFieldsValues/ValueModel/DateCustomFieldValueModelTest.php index 34db4404..eac253fe 100644 --- a/tests/Cases/AmoCRM/Models/CustomFieldsValues/ValueModel/DateCustomFieldValueModelTest.php +++ b/tests/Cases/AmoCRM/Models/CustomFieldsValues/ValueModel/DateCustomFieldValueModelTest.php @@ -1,7 +1,8 @@