Closes BR-43

fix values model for chained_list type fix namespaces and chained_list field type value model factory
amocrm · May 18, 2022 · 92be057 · 92be057
1 parent 04e0140
commit 92be057
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 47 deletions.
diff --git a/examples/chained_list_custom_field_actions.php b/examples/chained_list_custom_field_actions.php
@@ -2,10 +2,10 @@
 
 /** @since Release Spring 2022 */
 
-use AmoCRM\AmoCRM\Models\CustomFields\ChainedListCustomFieldModel;
-use AmoCRM\AmoCRM\Models\CustomFields\ChainedLists;
-use AmoCRM\AmoCRM\Models\CustomFieldsValues\ChainedListCustomFieldValuesModel;
-use AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueCollections\ChainedListCustomFieldValueCollection;
+use AmoCRM\Models\CustomFields\ChainedListCustomFieldModel;
+use AmoCRM\Models\CustomFields\ChainedLists;
+use AmoCRM\Models\CustomFieldsValues\ChainedListCustomFieldValuesModel;
+use AmoCRM\Models\CustomFieldsValues\ValueCollections\ChainedListCustomFieldValueCollection;
 use AmoCRM\Client\AmoCRMApiClient;
 use AmoCRM\Collections\CustomFieldsValuesCollection;
 use AmoCRM\Exceptions\AmoCRMApiException;

diff --git a/examples/currencies_actions.php b/examples/currencies_actions.php
@@ -2,7 +2,7 @@
 
 /** @since Release Spring 2022 */
 
-use AmoCRM\AmoCRM\Filters\CurrenciesFilter;
+use AmoCRM\Filters\CurrenciesFilter;
 use AmoCRM\Client\AmoCRMApiClient;
 use AmoCRM\Exceptions\AmoCRMApiException;
 use League\OAuth2\Client\Token\AccessTokenInterface;

diff --git a/examples/monetary_custom_field_actions.php b/examples/monetary_custom_field_actions.php
@@ -2,7 +2,7 @@
 
 /** @since Release Spring 2022 */
 
-use AmoCRM\AmoCRM\Models\CustomFields\MonetaryCustomFieldModel;
+use AmoCRM\Models\CustomFields\MonetaryCustomFieldModel;
 use AmoCRM\Client\AmoCRMApiClient;
 use AmoCRM\Exceptions\AmoCRMApiException;
 use AmoCRM\Filters\LeadsFilter;
@@ -105,7 +105,7 @@ function (AccessTokenInterface $accessToken, string $baseDomain) {
 $monetaryValuesModel = new \AmoCRM\Models\CustomFieldsValues\MonetaryCustomFieldValuesModel();
 $monetaryValuesModel->setFieldId($monetaryCf->getId());
 $monetaryValuesModel->setValues(
-    (new \AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueCollections\MonetaryCustomFieldValueCollection())->add(
+    (new \AmoCRM\Models\CustomFieldsValues\ValueCollections\MonetaryCustomFieldValueCollection())->add(
         (new \AmoCRM\Models\CustomFieldsValues\ValueModels\MonetaryCustomFieldValueModel())->setValue(100)
     )
 );

diff --git a/src/AmoCRM/Client/AmoCRMApiClient.php b/src/AmoCRM/Client/AmoCRMApiClient.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Client;
 
-use AmoCRM\AmoCRM\EntitiesServices\Currencies;
+use AmoCRM\EntitiesServices\Currencies;
 use AmoCRM\EntitiesServices\Account;
 use AmoCRM\EntitiesServices\Calls;
 use AmoCRM\EntitiesServices\CatalogElements;

diff --git a/src/AmoCRM/Collections/CurrenciesCollection.php b/src/AmoCRM/Collections/CurrenciesCollection.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Collections;
+namespace AmoCRM\Collections;
 
-use AmoCRM\AmoCRM\Models\CurrencyModel;
-use AmoCRM\Collections\BaseApiCollection;
+use AmoCRM\Models\CurrencyModel;
 use AmoCRM\Collections\Interfaces\HasPagesInterface;
 use AmoCRM\Collections\Traits\PagesTrait;
 

diff --git a/src/AmoCRM/EntitiesServices/Currencies.php b/src/AmoCRM/EntitiesServices/Currencies.php
@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\EntitiesServices;
+namespace AmoCRM\EntitiesServices;
 
-use AmoCRM\AmoCRM\Collections\CurrenciesCollection;
-use AmoCRM\AmoCRM\Filters\CurrenciesFilter;
-use AmoCRM\AmoCRM\Models\CurrencyModel;
+use AmoCRM\Collections\CurrenciesCollection;
+use AmoCRM\Filters\CurrenciesFilter;
+use AmoCRM\Models\CurrencyModel;
 use AmoCRM\Client\AmoCRMApiClient;
 use AmoCRM\Client\AmoCRMApiRequest;
 use AmoCRM\Collections\BaseApiCollection;
-use AmoCRM\EntitiesServices\BaseEntity;
 use AmoCRM\EntitiesServices\Interfaces\HasPageMethodsInterface;
 use AmoCRM\EntitiesServices\Traits\PageMethodsTrait;
 use AmoCRM\Exceptions\NotAvailableForActionException;

diff --git a/src/AmoCRM/Filters/CurrenciesFilter.php b/src/AmoCRM/Filters/CurrenciesFilter.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Filters;
-
-use AmoCRM\Filters\PagesFilter;
+namespace AmoCRM\Filters;
 
 /**
  * @since Release Spring 2022

diff --git a/src/AmoCRM/Models/CurrencyModel.php b/src/AmoCRM/Models/CurrencyModel.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models;
-
-use AmoCRM\Models\BaseApiModel;
+namespace AmoCRM\Models;
 
 /**
  * @since Release Spring 2022

diff --git a/src/AmoCRM/Models/CustomFields/ChainedList.php b/src/AmoCRM/Models/CustomFields/ChainedList.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models\CustomFields;
+namespace AmoCRM\Models\CustomFields;
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;

diff --git a/src/AmoCRM/Models/CustomFields/ChainedListCustomFieldModel.php b/src/AmoCRM/Models/CustomFields/ChainedListCustomFieldModel.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models\CustomFields;
-
-use AmoCRM\Models\CustomFields\CustomFieldModel;
+namespace AmoCRM\Models\CustomFields;
 
 /**
  * Модель поля вложенных списков

diff --git a/src/AmoCRM/Models/CustomFields/ChainedLists.php b/src/AmoCRM/Models/CustomFields/ChainedLists.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models\CustomFields;
+namespace AmoCRM\Models\CustomFields;
 
 use Illuminate\Support\Collection;
 

diff --git a/src/AmoCRM/Models/CustomFields/Factories/CustomFieldModelFactory.php b/src/AmoCRM/Models/CustomFields/Factories/CustomFieldModelFactory.php
@@ -2,8 +2,8 @@
 
 namespace AmoCRM\Models\CustomFields\Factories;
 
-use AmoCRM\AmoCRM\Models\CustomFields\ChainedListCustomFieldModel;
-use AmoCRM\AmoCRM\Models\CustomFields\MonetaryCustomFieldModel;
+use AmoCRM\Models\CustomFields\ChainedListCustomFieldModel;
+use AmoCRM\Models\CustomFields\MonetaryCustomFieldModel;
 use AmoCRM\Models\CustomFields\OrgLegalNameCustomFieldModel;
 use AmoCRM\Models\CustomFields\TrackingDataCustomFieldModel;
 use AmoCRM\Models\CustomFields\BirthdayCustomFieldModel;

diff --git a/src/AmoCRM/Models/CustomFields/MonetaryCustomFieldModel.php b/src/AmoCRM/Models/CustomFields/MonetaryCustomFieldModel.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace AmoCRM\AmoCRM\Models\CustomFields;
-
-use AmoCRM\Models\CustomFields\CustomFieldModel;
+namespace AmoCRM\Models\CustomFields;
 
 /**
  * @since Release Spring 2022

diff --git a/src/AmoCRM/Models/CustomFieldsValues/ChainedListCustomFieldValuesModel.php b/src/AmoCRM/Models/CustomFieldsValues/ChainedListCustomFieldValuesModel.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models\CustomFieldsValues;
+namespace AmoCRM\Models\CustomFieldsValues;
 
 use AmoCRM\Models\CustomFields\CustomFieldModel;
-use AmoCRM\Models\CustomFieldsValues\BaseCustomFieldValuesModel;
 
 /**
  * @since Release Spring 2022

diff --git a/src/AmoCRM/Models/CustomFieldsValues/Factories/CustomFieldValueCollectionFactory.php b/src/AmoCRM/Models/CustomFieldsValues/Factories/CustomFieldValueCollectionFactory.php
@@ -2,8 +2,8 @@
 
 namespace AmoCRM\Models\CustomFieldsValues\Factories;
 
-use AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueCollections\ChainedListCustomFieldValueCollection;
-use AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueCollections\MonetaryCustomFieldValueCollection;
+use AmoCRM\Models\CustomFieldsValues\ValueCollections\ChainedListCustomFieldValueCollection;
+use AmoCRM\Models\CustomFieldsValues\ValueCollections\MonetaryCustomFieldValueCollection;
 use AmoCRM\Models\CustomFieldsValues\ValueCollections\LinkedEntityCustomFieldValueCollection;
 use AmoCRM\Models\CustomFieldsValues\ValueCollections\TrackingDataCustomFieldValueCollection;
 use AmoCRM\Helpers\CustomFieldHelper;

diff --git a/src/AmoCRM/Models/CustomFieldsValues/Factories/CustomFieldValueModelFactory.php b/src/AmoCRM/Models/CustomFieldsValues/Factories/CustomFieldValueModelFactory.php
@@ -2,7 +2,7 @@
 
 namespace AmoCRM\Models\CustomFieldsValues\Factories;
 
-use AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueModels\ChainedListCustomFieldValueModel;
+use AmoCRM\Models\CustomFieldsValues\ValueModels\ChainedListCustomFieldValueModel;
 use AmoCRM\Models\CustomFieldsValues\ValueModels\LinkedEntityCustomFieldValueModel;
 use AmoCRM\Models\CustomFieldsValues\ValueModels\MonetaryCustomFieldValueModel;
 use AmoCRM\Models\CustomFieldsValues\ValueModels\TrackingDataCustomFieldValueModel;

diff --git a/src/AmoCRM/Models/CustomFieldsValues/Factories/CustomFieldValuesModelFactory.php b/src/AmoCRM/Models/CustomFieldsValues/Factories/CustomFieldValuesModelFactory.php
@@ -2,6 +2,7 @@
 
 namespace AmoCRM\Models\CustomFieldsValues\Factories;
 
+use AmoCRM\Models\CustomFieldsValues\ChainedListCustomFieldValuesModel;
 use AmoCRM\Models\CustomFieldsValues\MonetaryCustomFieldValuesModel;
 use AmoCRM\Models\CustomFieldsValues\TrackingDataCustomFieldValuesModel;
 use AmoCRM\Models\CustomFields\CustomFieldModel;
@@ -114,7 +115,7 @@ public static function createModel(array $field): BaseCustomFieldValuesModel
                 $model = new MonetaryCustomFieldValuesModel();
                 break;
             case CustomFieldModel::TYPE_CHAINED_LIST:
-                $model = new MonetaryCustomFieldValuesModel();
+                $model = new ChainedListCustomFieldValuesModel();
                 break;
             default:
                 trigger_error(

diff --git a/...oCRM/Models/CustomFieldsValues/ValueCollections/ChainedListCustomFieldValueCollection.php b/...oCRM/Models/CustomFieldsValues/ValueCollections/ChainedListCustomFieldValueCollection.php
@@ -2,12 +2,11 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueCollections;
+namespace AmoCRM\Models\CustomFieldsValues\ValueCollections;
 
-use AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueModels\ChainedListCustomFieldValueModel;
+use AmoCRM\Models\CustomFieldsValues\ValueModels\ChainedListCustomFieldValueModel;
 use AmoCRM\Collections\BaseApiCollection;
 use AmoCRM\Exceptions\InvalidArgumentException;
-use AmoCRM\Models\CustomFieldsValues\ValueCollections\BaseCustomFieldValueCollection;
 
 use function array_map;
 

diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MonetaryCustomFieldValueCollection.php b/src/AmoCRM/Models/CustomFieldsValues/ValueCollections/MonetaryCustomFieldValueCollection.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueCollections;
-
-use AmoCRM\Models\CustomFieldsValues\ValueCollections\BaseCustomFieldValueCollection;
+namespace AmoCRM\Models\CustomFieldsValues\ValueCollections;
 
 /**
  * @since Release Spring 2022

diff --git a/src/AmoCRM/Models/CustomFieldsValues/ValueModels/ChainedListCustomFieldValueModel.php b/src/AmoCRM/Models/CustomFieldsValues/ValueModels/ChainedListCustomFieldValueModel.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AmoCRM\AmoCRM\Models\CustomFieldsValues\ValueModels;
-
-use AmoCRM\Models\CustomFieldsValues\ValueModels\BaseCustomFieldValueModel;
+namespace AmoCRM\Models\CustomFieldsValues\ValueModels;
 
 /**
  * @since Release Spring 2022