From b5f9dd49472f7c1fd955d540993d935a97d052fd Mon Sep 17 00:00:00 2001 From: alikhan Date: Thu, 9 Jan 2025 16:25:57 +0500 Subject: [PATCH 1/8] changed the minimum php version in the description --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ec4eab7..13c597b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Total Downloads](https://img.shields.io/packagist/dt/amocrm/amocrm-api-library.svg)](https://packagist.org/packages/amocrm/amocrm-api-library) В данном пакете представлен API клиент с поддержкой основных сущностей и авторизацией по протоколу OAuth 2.0 в amoCRM. -Для работы библиотеки требуется PHP версии не ниже 7.1. +Для работы библиотеки требуется PHP версии не ниже 7.4. ## Оглавление - [Установка](#установка) diff --git a/composer.json b/composer.json index fb55b7f..15b21d5 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "amocrm" ], "require": { - "php": ">=7.1 || >=8.0", + "php": ">=7.4 || >=8.0", "ext-json": "*", "amocrm/oauth2-amocrm": "^2.0", "guzzlehttp/guzzle": "6.* || 7.*", From c06a4f210eabcecf4dfc754cf4bb5f59e39dbcef Mon Sep 17 00:00:00 2001 From: alikhan Date: Fri, 10 Jan 2025 18:54:21 +0500 Subject: [PATCH 2/8] adding verification --- src/AmoCRM/Models/CallModel.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/AmoCRM/Models/CallModel.php b/src/AmoCRM/Models/CallModel.php index f1283da..185fb54 100644 --- a/src/AmoCRM/Models/CallModel.php +++ b/src/AmoCRM/Models/CallModel.php @@ -101,7 +101,7 @@ public function fromArray(array $call): CallModel $this->setPhone($call['phone']); } - if (isset($call['call_result'])) { + if (isset($call['call_result']) && $call['call_result']!= null) { $this->setCallResult($call['call_result']); } @@ -197,6 +197,14 @@ public function toApi(?string $requestId = "0"): array $call['updated_at'] = $updatedAt; } + if ($callStatus = $this->getCallStatus()) { + $call['call_status'] = $callStatus; + } + + if ($callResult = $this->getCallResult()) { + $call['call_result'] = $callResult; + } + return $call; } From 03362daba9cb97c01cdb82d4b73ac3c8e23084ec Mon Sep 17 00:00:00 2001 From: alikhan Date: Fri, 10 Jan 2025 19:03:25 +0500 Subject: [PATCH 3/8] mistake --- src/AmoCRM/Models/CallModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AmoCRM/Models/CallModel.php b/src/AmoCRM/Models/CallModel.php index 185fb54..e9956df 100644 --- a/src/AmoCRM/Models/CallModel.php +++ b/src/AmoCRM/Models/CallModel.php @@ -101,7 +101,7 @@ public function fromArray(array $call): CallModel $this->setPhone($call['phone']); } - if (isset($call['call_result']) && $call['call_result']!= null) { + if (isset($call['call_result'])) { $this->setCallResult($call['call_result']); } From 6378bfbf33e5b12ed77680034d57b51457dd1ef4 Mon Sep 17 00:00:00 2001 From: alikhan Date: Thu, 9 Jan 2025 16:25:57 +0500 Subject: [PATCH 4/8] changed the minimum php version in the description --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ec4eab7..13c597b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Total Downloads](https://img.shields.io/packagist/dt/amocrm/amocrm-api-library.svg)](https://packagist.org/packages/amocrm/amocrm-api-library) В данном пакете представлен API клиент с поддержкой основных сущностей и авторизацией по протоколу OAuth 2.0 в amoCRM. -Для работы библиотеки требуется PHP версии не ниже 7.1. +Для работы библиотеки требуется PHP версии не ниже 7.4. ## Оглавление - [Установка](#установка) diff --git a/composer.json b/composer.json index fb55b7f..15b21d5 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "amocrm" ], "require": { - "php": ">=7.1 || >=8.0", + "php": ">=7.4 || >=8.0", "ext-json": "*", "amocrm/oauth2-amocrm": "^2.0", "guzzlehttp/guzzle": "6.* || 7.*", From cbb92f4a8f738093f11deb75f826809b70f7f7d8 Mon Sep 17 00:00:00 2001 From: alikhan Date: Mon, 13 Jan 2025 15:07:34 +0500 Subject: [PATCH 5/8] Additional changes have been made for PR --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 007c2fe..386141b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,6 @@ os: linux dist: bionic php: - - 7.1 - - 7.2 - - 7.3 - 7.4 - 8.0 - 8.1 From 4b61c6112393e614fef71748417d93c10279e1c0 Mon Sep 17 00:00:00 2001 From: alikhan Date: Mon, 13 Jan 2025 19:46:37 +0500 Subject: [PATCH 6/8] change back --- README.md | 2 +- composer.json | 2 +- src/AmoCRM/Models/CallModel.php | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 13c597b..ec4eab7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Total Downloads](https://img.shields.io/packagist/dt/amocrm/amocrm-api-library.svg)](https://packagist.org/packages/amocrm/amocrm-api-library) В данном пакете представлен API клиент с поддержкой основных сущностей и авторизацией по протоколу OAuth 2.0 в amoCRM. -Для работы библиотеки требуется PHP версии не ниже 7.4. +Для работы библиотеки требуется PHP версии не ниже 7.1. ## Оглавление - [Установка](#установка) diff --git a/composer.json b/composer.json index 15b21d5..fb55b7f 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "amocrm" ], "require": { - "php": ">=7.4 || >=8.0", + "php": ">=7.1 || >=8.0", "ext-json": "*", "amocrm/oauth2-amocrm": "^2.0", "guzzlehttp/guzzle": "6.* || 7.*", diff --git a/src/AmoCRM/Models/CallModel.php b/src/AmoCRM/Models/CallModel.php index e9956df..f1283da 100644 --- a/src/AmoCRM/Models/CallModel.php +++ b/src/AmoCRM/Models/CallModel.php @@ -197,14 +197,6 @@ public function toApi(?string $requestId = "0"): array $call['updated_at'] = $updatedAt; } - if ($callStatus = $this->getCallStatus()) { - $call['call_status'] = $callStatus; - } - - if ($callResult = $this->getCallResult()) { - $call['call_result'] = $callResult; - } - return $call; } From 69f98c7a5c50e02d6a81132431bab5d7fad31bb7 Mon Sep 17 00:00:00 2001 From: alikhan Date: Fri, 17 Jan 2025 11:23:31 +0500 Subject: [PATCH 7/8] fixing a php compatibility conflict --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fb55b7f..5c2e4c4 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "fig/http-message-util": "1.*", "ramsey/uuid": "^3 || ^4", "lcobucci/jwt": "^3.4.6 || ^4.0.4", - "lcobucci/clock": "~2.0.0 || ^2.1.0", + "lcobucci/clock": "1.1.0 ||^2.0.0", "nesbot/carbon": "^2.52 || ^3.0.0", "ext-fileinfo": "*" }, From d395e304e0c6a24fe182230e6976c2ef4953ca5d Mon Sep 17 00:00:00 2001 From: alikhan Date: Fri, 17 Jan 2025 11:31:12 +0500 Subject: [PATCH 8/8] fixing a php compatibility conflict --- .travis.yml | 3 +++ README.md | 2 +- composer.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 386141b..007c2fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ os: linux dist: bionic php: + - 7.1 + - 7.2 + - 7.3 - 7.4 - 8.0 - 8.1 diff --git a/README.md b/README.md index 13c597b..ec4eab7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Total Downloads](https://img.shields.io/packagist/dt/amocrm/amocrm-api-library.svg)](https://packagist.org/packages/amocrm/amocrm-api-library) В данном пакете представлен API клиент с поддержкой основных сущностей и авторизацией по протоколу OAuth 2.0 в amoCRM. -Для работы библиотеки требуется PHP версии не ниже 7.4. +Для работы библиотеки требуется PHP версии не ниже 7.1. ## Оглавление - [Установка](#установка) diff --git a/composer.json b/composer.json index 4857acb..5c2e4c4 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "amocrm" ], "require": { - "php": ">=7.4 || >=8.0", + "php": ">=7.1 || >=8.0", "ext-json": "*", "amocrm/oauth2-amocrm": "^2.0", "guzzlehttp/guzzle": "6.* || 7.*",