Merge pull request #50 from amocrm/hotfix/issue#49

fix filters
amocrm · Jul 3, 2020 · 4c7f614 · 4c7f614
2 parents ab50331 + cb4d404
commit 4c7f614
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/src/AmoCRM/Filters/CompaniesFilter.php b/src/AmoCRM/Filters/CompaniesFilter.php
@@ -2,14 +2,15 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
 use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrNumericFilterTrait;
 use AmoCRM\Filters\Traits\ArrayOrStringFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait;
 
-class CompaniesFilter extends BaseEntityFilter implements HasPagesInterface
+class CompaniesFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use OrderTrait;
     use PagesFilterTrait;

diff --git a/src/AmoCRM/Filters/ContactsFilter.php b/src/AmoCRM/Filters/ContactsFilter.php
@@ -2,14 +2,15 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
 use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrNumericFilterTrait;
 use AmoCRM\Filters\Traits\ArrayOrStringFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait;
 
-class ContactsFilter extends BaseEntityFilter implements HasPagesInterface
+class ContactsFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use OrderTrait;
     use PagesFilterTrait;

diff --git a/src/AmoCRM/Filters/CustomersFilter.php b/src/AmoCRM/Filters/CustomersFilter.php
@@ -2,14 +2,15 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
 use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrNumericFilterTrait;
 use AmoCRM\Filters\Traits\ArrayOrStringFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait;
 
-class CustomersFilter extends BaseEntityFilter implements HasPagesInterface
+class CustomersFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use OrderTrait;
     use PagesFilterTrait;

diff --git a/src/AmoCRM/Filters/Interfaces/HasOrderInterface.php b/src/AmoCRM/Filters/Interfaces/HasOrderInterface.php
@@ -2,8 +2,6 @@
 
 namespace AmoCRM\Filters\Interfaces;
 
-use AmoCRM\Filters\Traits\PagesFilterTrait;
-
 /**
  * Интерфейс для фильтров, которые поддерживают постраничную навигацию
  * @package AmoCRM\Filters\Interfaces
@@ -19,10 +17,10 @@ interface HasOrderInterface
      *
      * @return $this
      */
-    public function setOrder(string $field, string $direction = self::SORT_ASC): self;
+    public function setOrder(string $field, string $direction = self::SORT_ASC);
 
     /**
-     * @return array
+     * @return null|array
      */
-    public function getOrder(): array;
+    public function getOrder(): ?array;
 }
diff --git a/src/AmoCRM/Filters/LeadsFilter.php b/src/AmoCRM/Filters/LeadsFilter.php
@@ -2,14 +2,15 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
 use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrNumericFilterTrait;
 use AmoCRM\Filters\Traits\ArrayOrStringFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait;
 
-class LeadsFilter extends BaseEntityFilter implements HasPagesInterface
+class LeadsFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use OrderTrait;
     use PagesFilterTrait;

diff --git a/src/AmoCRM/Filters/NotesFilter.php b/src/AmoCRM/Filters/NotesFilter.php
@@ -2,13 +2,14 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
 use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrNumericFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait;
 
-class NotesFilter extends BaseEntityFilter implements HasPagesInterface
+class NotesFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use OrderTrait;
     use PagesFilterTrait;

diff --git a/src/AmoCRM/Filters/TasksFilter.php b/src/AmoCRM/Filters/TasksFilter.php
@@ -2,12 +2,14 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
+use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrNumericFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 use AmoCRM\Filters\Traits\IntOrIntRangeFilterTrait;
 
-class TasksFilter
+class TasksFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use OrderTrait;
     use PagesFilterTrait;

diff --git a/src/AmoCRM/Filters/UnsortedFilter.php b/src/AmoCRM/Filters/UnsortedFilter.php
@@ -2,12 +2,13 @@
 
 namespace AmoCRM\Filters;
 
+use AmoCRM\Filters\Interfaces\HasOrderInterface;
 use AmoCRM\Filters\Interfaces\HasPagesInterface;
 use AmoCRM\Filters\Traits\ArrayOrStringFilterTrait;
 use AmoCRM\Filters\Traits\OrderTrait;
 use AmoCRM\Filters\Traits\PagesFilterTrait;
 
-class UnsortedFilter extends BaseEntityFilter implements HasPagesInterface
+class UnsortedFilter extends BaseEntityFilter implements HasPagesInterface, HasOrderInterface
 {
     use PagesFilterTrait;
     use OrderTrait;