Merge pull request #294 from RonasIT/293-delete-deprecated

[293]: delete deprecated SearchTrait methods, update visibility

Author: DenTray

src/Traits/EntityControlTrait.php

@@ -48,7 +48,7 @@ public function force($value = true): self
         return $this;
     }
 
-    public function setModel($modelClass): self
+    protected function setModel($modelClass): self
     {
         $this->model = new $modelClass();
 

src/Traits/SearchTrait.php

@@ -40,7 +40,7 @@ protected function setAdditionalReservedFilters(...$filterNames)
         array_push($this->reservedFilters, ...$filterNames);
     }
 
-    public function paginate(): LengthAwarePaginator
+    protected function paginate(): LengthAwarePaginator
     {
         $defaultPerPage = config('defaults.items_per_page');
         $perPage = Arr::get($this->filter, 'per_page', $defaultPerPage);
@@ -138,10 +138,10 @@ public function searchQuery(array $filter = []): self
                     $this->filterLess($field, true, $fieldName);
                 } elseif (Str::endsWith($fieldName, '_from')) {
                     $field = Str::replace('_from', '', $fieldName);
-                    $this->filterFrom($field, false, $fieldName);
+                    $this->filterGreater($field, false, $fieldName);
                 } elseif (Str::endsWith($fieldName, '_to')) {
                     $field = Str::replace('_to', '', $fieldName);
-                    $this->filterTo($field, false, $fieldName);
+                    $this->filterLess($field, false, $fieldName);
                 } elseif (Str::endsWith($fieldName, '_in_list')) {
                     $field = Str::replace('_in_list', '', $fieldName);
                     $this->filterByList($field, $fieldName);
@@ -169,7 +169,7 @@ public function getSearchResults(): LengthAwarePaginator
         return $this->wrapPaginatedData($data);
     }
 
-    public function wrapPaginatedData(Collection $data): LengthAwarePaginator
+    protected function wrapPaginatedData(Collection $data): LengthAwarePaginator
     {
         $total = $data->count();
 
@@ -183,7 +183,7 @@ public function wrapPaginatedData(Collection $data): LengthAwarePaginator
         return $this->getModifiedPaginator($paginator);
     }
 
-    public function getModifiedPaginator(LengthAwarePaginator $paginator): LengthAwarePaginator
+    protected function getModifiedPaginator(LengthAwarePaginator $paginator): LengthAwarePaginator
     {
         $collection = $paginator->getCollection();
 
@@ -215,30 +215,6 @@ protected function getDesc(bool $isDesc): string
         return ($isDesc) ? 'DESC' : 'ASC';
     }
 
-    /** @deprecated use filterGreater instead */
-    public function filterMoreThan(string $field, $value): self
-    {
-        return $this->filterValue($field, '>', $value);
-    }
-
-    /** @deprecated use filterLess instead */
-    public function filterLessThan(string $field, $value): self
-    {
-        return $this->filterValue($field, '<', $value);
-    }
-
-    /** @deprecated use filterGreater instead */
-    public function filterMoreOrEqualThan(string $field, $value): self
-    {
-        return $this->filterValue($field, '>=', $value);
-    }
-
-    /** @deprecated use filterLess instead */
-    public function filterLessOrEqualThan(string $field, $value): self
-    {
-        return $this->filterValue($field, '<=', $value);
-    }
-
     public function filterValue(string $field, string $sign, $value): self
     {
         if (!empty($value)) {
@@ -290,12 +266,6 @@ protected function getQuerySearchCallback(string $field, string $mask): Closure
         };
     }
 
-    /** @deprecated use filterGreater instead */
-    public function filterFrom(string $field, bool $isStrict = true, ?string $filterName = null): self
-    {
-        return $this->filterGreater($field, $isStrict, $filterName);
-    }
-
     public function filterGreater(string $field, bool $isStrict = true, ?string $filterName = null): self
     {
         $filterName = empty($filterName) ? 'from' : $filterName;
@@ -308,12 +278,6 @@ public function filterGreater(string $field, bool $isStrict = true, ?string $fil
         return $this;
     }
 
-    /** @deprecated use filterLess instead */
-    public function filterTo(string $field, bool $isStrict = true, ?string $filterName = null): self
-    {
-        return $this->filterLess($field, $isStrict, $filterName);
-    }
-
     public function filterLess(string $field, bool $isStrict = true, ?string $filterName = null): self
     {
         $filterName = (empty($filterName)) ? 'to' : $filterName;

tests/SearchTraitTest.php

@@ -274,24 +274,37 @@ public function testSearchQueryWithListFilters()
             ->getSearchResults();
     }
 
-    public function testSearchQueryWithFiltersFunctions()
+    public function testSearchQueryWithChainedFilters()
     {
         $this->shouldSettablePropertiesBeResetProperty->setValue($this->testRepositoryClass, false);
 
         $this->mockGetSearchResultWithFilters(self::$selectResult);
 
+        $this->callEncapsulatedMethod(
+            $this->testRepositoryClass,
+            'setAdditionalReservedFilters',
+            'date_greater',
+            'date_less',
+            'updated_at_greater',
+            'updated_at_less',
+        );
+
         $this->testRepositoryClass
             ->searchQuery([
                 'user_id_in_list' => [1, 2],
                 'user_id_not_in_list' => [3, 4],
                 'name' => 'text_name',
+                'date_greater' => Carbon::now(),
+                'date_less' => Carbon::now(),
+                'updated_at_greater' => Carbon::now(),
+                'updated_at_less' => Carbon::now(),
             ])
-            ->filterMoreOrEqualThan('date', Carbon::now())
-            ->filterLessOrEqualThan('date', Carbon::now())
-            ->filterMoreOrEqualThan('created_at', Carbon::now())
-            ->filterLessOrEqualThan('created_at', Carbon::now())
-            ->filterMoreThan('updated_at', Carbon::now())
-            ->filterLessThan('updated_at', Carbon::now())
+            ->filterGreater('date', false, 'date_greater')
+            ->filterLess('date', false, 'date_less')
+            ->filterValue('created_at', '>=', Carbon::now())
+            ->filterValue('created_at', '<=', Carbon::now())
+            ->filterGreater('updated_at', true, 'updated_at_greater')
+            ->filterLess('updated_at', true, 'updated_at_less')
             ->getSearchResults();
     }
 }