Merge pull request #449 from wischerdson/master

Remove illuminate/support package
amocrm · May 18, 2022 · 18cd35c · 18cd35c
2 parents e0fb801 + 7883009
commit 18cd35c
Show file tree

Hide file tree

Showing 32 changed files with 153 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ composer.phar
 composer.lock
 .idea
 examples/.env
+.phpunit.result.cache
 /.DS_Store
diff --git a/composer.json b/composer.json
@@ -19,19 +19,18 @@
     "amocrm"
   ],
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.1 || >=8.0",
     "ext-json": "*",
     "amocrm/oauth2-amocrm": "^2.0",
     "guzzlehttp/guzzle": "6.* || 7.*",
-    "illuminate/support": "5.* || 6.* || 7.* || 8.* || 9.*",
     "symfony/dotenv": "3.* || 4.* || 5.* || 6.*",
     "fig/http-message-util": "1.*",
     "ramsey/uuid": "^3 || ^4",
     "lcobucci/jwt": "^3.4.6 || ^4.0.4",
     "nesbot/carbon": "^2.52"
   },
   "require-dev": {
-    "phpunit/phpunit": "7.*.* || 9.*.*",
+    "phpunit/phpunit": "7.* || 8.* || 9.*",
     "squizlabs/php_codesniffer": "3.5.*"
   },
   "autoload": {
@@ -45,7 +44,9 @@
       "AmoCRM\\Models\\": "src/AmoCRM/Models",
       "AmoCRM\\Collections\\": "src/AmoCRM/Collections",
       "AmoCRM\\Filters\\": "src/AmoCRM/Filters",
-      "AmoCRM\\Helpers\\": "src/AmoCRM/Helpers"
+      "AmoCRM\\Helpers\\": "src/AmoCRM/Helpers",
+      "AmoCRM\\Contracts\\": "src/AmoCRM/Contracts",
+      "AmoCRM\\Support\\": "src/AmoCRM/Support"
     }
   },
   "scripts": {

diff --git a/src/AmoCRM/Collections/BaseApiCollection.php b/src/AmoCRM/Collections/BaseApiCollection.php
@@ -5,7 +5,7 @@
 use AmoCRM\Models\BaseApiModel;
 use ArrayAccess;
 use ArrayIterator;
-use Illuminate\Support\Str;
+use AmoCRM\Support\Str;
 use InvalidArgumentException;
 use IteratorAggregate;
 use JsonSerializable;

diff --git a/src/AmoCRM/Contracts/Support/Arrayable.php b/src/AmoCRM/Contracts/Support/Arrayable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace AmoCRM\Contracts\Support;
+
+interface Arrayable
+{
+    /**
+     * Get the instance as an array.
+     *
+     * @return array
+     */
+    public function toArray();
+}
diff --git a/src/AmoCRM/Models/AccountSettings/AmojoRights.php b/src/AmoCRM/Models/AccountSettings/AmojoRights.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Models\AccountSettings;
 
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class AmojoRights implements Arrayable
 {

diff --git a/src/AmoCRM/Models/AccountSettings/DateTimeSettings.php b/src/AmoCRM/Models/AccountSettings/DateTimeSettings.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Models\AccountSettings;
 
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class DateTimeSettings implements Arrayable
 {

diff --git a/src/AmoCRM/Models/AccountSettings/InvoicesSettings.php b/src/AmoCRM/Models/AccountSettings/InvoicesSettings.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Models\AccountSettings;
 
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class InvoicesSettings implements Arrayable
 {

diff --git a/src/AmoCRM/Models/AccountSettings/TaskType.php b/src/AmoCRM/Models/AccountSettings/TaskType.php
@@ -3,7 +3,7 @@
 namespace AmoCRM\Models\AccountSettings;
 
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class TaskType extends BaseApiModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/AccountSettings/UsersGroup.php b/src/AmoCRM/Models/AccountSettings/UsersGroup.php
@@ -3,7 +3,7 @@
 namespace AmoCRM\Models\AccountSettings;
 
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class UsersGroup extends BaseApiModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/BaseApiModel.php b/src/AmoCRM/Models/BaseApiModel.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Models;
 
-use Illuminate\Support\Str;
+use AmoCRM\Support\Str;
 
 use function is_callable;
 

diff --git a/src/AmoCRM/Models/Chats/Templates/Buttons/AbstractButtonModel.php b/src/AmoCRM/Models/Chats/Templates/Buttons/AbstractButtonModel.php
@@ -7,7 +7,7 @@
 use AmoCRM\Enum\Chats\Templates\Buttons\ButtonsEnums;
 use AmoCRM\Exceptions\InvalidArgumentException;
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 /**
  * Class AbstractButtonModel

diff --git a/src/AmoCRM/Models/CustomFields/EnumModel.php b/src/AmoCRM/Models/CustomFields/EnumModel.php
@@ -3,7 +3,7 @@
 namespace AmoCRM\Models\CustomFields;
 
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 /**
  * Class EnumModel

diff --git a/src/AmoCRM/Models/CustomFields/NestedModel.php b/src/AmoCRM/Models/CustomFields/NestedModel.php
@@ -4,7 +4,7 @@
 
 use AmoCRM\Exceptions\InvalidArgumentException;
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 use function is_null;
 use function preg_match;

diff --git a/src/AmoCRM/Models/CustomFields/RequiredStatusModel.php b/src/AmoCRM/Models/CustomFields/RequiredStatusModel.php
@@ -3,7 +3,7 @@
 namespace AmoCRM\Models\CustomFields;
 
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 /**
  * Class RequiredStatusModel

diff --git a/src/AmoCRM/Models/Customers/Statuses/StatusModel.php b/src/AmoCRM/Models/Customers/Statuses/StatusModel.php
@@ -5,7 +5,7 @@
 use AmoCRM\Models\BaseApiModel;
 use AmoCRM\Models\Interfaces\HasIdInterface;
 use AmoCRM\Models\Traits\RequestIdTrait;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class StatusModel extends BaseApiModel implements Arrayable, HasIdInterface
 {

diff --git a/src/AmoCRM/Models/Leads/Pipelines/PipelineModel.php b/src/AmoCRM/Models/Leads/Pipelines/PipelineModel.php
@@ -9,7 +9,7 @@
 use AmoCRM\Models\Interfaces\HasIdInterface;
 use AmoCRM\Models\Leads\Pipelines\Statuses\StatusModel;
 use AmoCRM\Models\Traits\RequestIdTrait;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class PipelineModel extends BaseApiModel implements Arrayable, HasIdInterface
 {

diff --git a/src/AmoCRM/Models/Leads/Pipelines/Statuses/StatusModel.php b/src/AmoCRM/Models/Leads/Pipelines/Statuses/StatusModel.php
@@ -5,7 +5,7 @@
 use AmoCRM\Models\BaseApiModel;
 use AmoCRM\Models\Interfaces\HasIdInterface;
 use AmoCRM\Models\Traits\RequestIdTrait;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class StatusModel extends BaseApiModel implements Arrayable, HasIdInterface
 {

diff --git a/src/AmoCRM/Models/NoteModel.php b/src/AmoCRM/Models/NoteModel.php
@@ -5,7 +5,7 @@
 use AmoCRM\Models\Factories\NoteFactory;
 use AmoCRM\Models\Interfaces\HasIdInterface;
 use AmoCRM\Models\Traits\RequestIdTrait;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 /**
  * Class NoteModel

diff --git a/src/AmoCRM/Models/SourceModel.php b/src/AmoCRM/Models/SourceModel.php
@@ -5,7 +5,7 @@
 use AmoCRM\Collections\Sources\SourceServicesCollection;
 use AmoCRM\Models\Interfaces\HasIdInterface;
 use AmoCRM\Models\Traits\RequestIdTrait;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class SourceModel extends BaseApiModel implements Arrayable, HasIdInterface
 {

diff --git a/src/AmoCRM/Models/Sources/SourceServiceModel.php b/src/AmoCRM/Models/Sources/SourceServiceModel.php
@@ -4,7 +4,7 @@
 
 use AmoCRM\Collections\Sources\SourceServicesPagesCollection;
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class SourceServiceModel extends BaseApiModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/Sources/SourceServicePageModel.php b/src/AmoCRM/Models/Sources/SourceServicePageModel.php
@@ -3,7 +3,7 @@
 namespace AmoCRM\Models\Sources;
 
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class SourceServicePageModel extends BaseApiModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/TagModel.php b/src/AmoCRM/Models/TagModel.php
@@ -9,7 +9,7 @@
 use AmoCRM\Models\Interfaces\EntityApiInterface;
 use AmoCRM\Models\Interfaces\HasIdInterface;
 use AmoCRM\Models\Traits\RequestIdTrait;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 use function in_array;
 

diff --git a/src/AmoCRM/Models/Unsorted/AcceptUnsortedModel.php b/src/AmoCRM/Models/Unsorted/AcceptUnsortedModel.php
@@ -6,7 +6,7 @@
 use AmoCRM\Collections\CompaniesCollection;
 use AmoCRM\Collections\ContactsCollection;
 use AmoCRM\Collections\Leads\LeadsCollection;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 /**
  * Class AcceptUnsortedModel

diff --git a/src/AmoCRM/Models/Unsorted/ChatsMetadata.php b/src/AmoCRM/Models/Unsorted/ChatsMetadata.php
@@ -4,7 +4,7 @@
 
 use AmoCRM\Models\Unsorted\Interfaces\UnsortedMetadataInterface;
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class ChatsMetadata extends BaseApiModel implements Arrayable, UnsortedMetadataInterface
 {

diff --git a/src/AmoCRM/Models/Unsorted/DeclineUnsortedModel.php b/src/AmoCRM/Models/Unsorted/DeclineUnsortedModel.php
@@ -6,7 +6,7 @@
 use AmoCRM\Collections\CompaniesCollection;
 use AmoCRM\Collections\ContactsCollection;
 use AmoCRM\Collections\Leads\LeadsCollection;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class DeclineUnsortedModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/Unsorted/FormsMetadata.php b/src/AmoCRM/Models/Unsorted/FormsMetadata.php
@@ -4,7 +4,7 @@
 
 use AmoCRM\Models\BaseApiModel;
 use AmoCRM\Models\Unsorted\Interfaces\UnsortedMetadataInterface;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 use function array_key_exists;
 use function is_null;

diff --git a/src/AmoCRM/Models/Unsorted/LinkUnsortedModel.php b/src/AmoCRM/Models/Unsorted/LinkUnsortedModel.php
@@ -6,7 +6,7 @@
 use AmoCRM\Collections\CompaniesCollection;
 use AmoCRM\Collections\ContactsCollection;
 use AmoCRM\Collections\Leads\LeadsCollection;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class LinkUnsortedModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/Unsorted/MailMetadata.php b/src/AmoCRM/Models/Unsorted/MailMetadata.php
@@ -4,7 +4,7 @@
 
 use AmoCRM\Models\Unsorted\Interfaces\UnsortedMetadataInterface;
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class MailMetadata extends BaseApiModel implements Arrayable, UnsortedMetadataInterface
 {

diff --git a/src/AmoCRM/Models/Unsorted/SipMetadata.php b/src/AmoCRM/Models/Unsorted/SipMetadata.php
@@ -4,7 +4,7 @@
 
 use AmoCRM\Models\Unsorted\Interfaces\UnsortedMetadataInterface;
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 use function is_scalar;
 

diff --git a/src/AmoCRM/Models/Unsorted/UnsortedSummaryModel.php b/src/AmoCRM/Models/Unsorted/UnsortedSummaryModel.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Models\Unsorted;
 
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class UnsortedSummaryModel implements Arrayable
 {

diff --git a/src/AmoCRM/Models/Widgets/SettingTemplateModel.php b/src/AmoCRM/Models/Widgets/SettingTemplateModel.php
@@ -3,7 +3,7 @@
 namespace AmoCRM\Models\Widgets;
 
 use AmoCRM\Models\BaseApiModel;
-use Illuminate\Contracts\Support\Arrayable;
+use AmoCRM\Contracts\Support\Arrayable;
 
 class SettingTemplateModel extends BaseApiModel implements Arrayable
 {