Simplify Query related interface

thephpleague · May 22, 2024 · 00bbff9 · 00bbff9
1 parent 19e27c1
commit 00bbff9
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 65 deletions.
diff --git a/src/Query/Constraint/Column.php b/src/Query/Constraint/Column.php
@@ -78,13 +78,4 @@ public function filter(iterable $value): Iterator
             default => new ArrayIterator($value),
         }, $this);
     }
-
-    public function filterArray(iterable $value): array
-    {
-        return array_filter(
-            !is_array($value) ? iterator_to_array($value) : $value,
-            $this,
-            ARRAY_FILTER_USE_BOTH
-        );
-    }
 }
diff --git a/src/Query/Constraint/Criteria.php b/src/Query/Constraint/Criteria.php
@@ -122,15 +122,6 @@ public function filter(iterable $value): Iterator
         }, $this);
     }
 
-    public function filterArray(iterable $values): array
-    {
-        return array_filter(
-            !is_array($values) ? iterator_to_array($values) : $values,
-            $this,
-            ARRAY_FILTER_USE_BOTH
-        );
-    }
-
     /**
      * @param ConditionExtended ...$predicates
      */

diff --git a/src/Query/Constraint/TwoColumns.php b/src/Query/Constraint/TwoColumns.php
@@ -91,13 +91,4 @@ public function filter(iterable $value): Iterator
             default => new ArrayIterator($value),
         }, $this);
     }
-
-    public function filterArray(iterable $value): array
-    {
-        return array_filter(
-            !is_array($value) ? iterator_to_array($value) : $value,
-            $this,
-            ARRAY_FILTER_USE_BOTH
-        );
-    }
 }
diff --git a/src/Query/Limit.php b/src/Query/Limit.php
@@ -55,14 +55,4 @@ public function slice(iterable $value): LimitIterator
             $this->length,
         );
     }
-
-    public function sliceArray(iterable $values): array
-    {
-        return array_slice(
-            !is_array($values) ? iterator_to_array($values) : $values,
-            $this->offset,
-            $this->length === -1 ? null : $this->length,
-            true
-        );
-    }
 }
diff --git a/src/Query/Ordering/Column.php b/src/Query/Ordering/Column.php
@@ -103,12 +103,4 @@ public function seek(int $offset): void
 
         return $it;
     }
-
-    public function sortArray(iterable $value): array
-    {
-        $sorted = !is_array($value) ? iterator_to_array($value) : $value;
-        uasort($sorted, $this);
-
-        return $sorted;
-    }
 }
diff --git a/src/Query/Ordering/MultiSort.php b/src/Query/Ordering/MultiSort.php
@@ -121,20 +121,4 @@ public function seek(int $offset): void
 
         return $it;
     }
-
-    public function sortArray(iterable $value): array
-    {
-        if (!is_array($value)) {
-            $value = iterator_to_array($value);
-        }
-
-        if ([] === $this->sorts) {
-            return $value;
-        }
-
-        $sorted = $value;
-        uasort($sorted, $this);
-
-        return $sorted;
-    }
 }
diff --git a/src/Query/Predicate.php b/src/Query/Predicate.php
@@ -29,6 +29,4 @@ interface Predicate
     public function __invoke(mixed $value, string|int $key): bool;
 
     public function filter(iterable $value): Iterator;
-
-    public function filterArray(iterable $value): array;
 }
diff --git a/src/Query/Sort.php b/src/Query/Sort.php
@@ -30,6 +30,4 @@ interface Sort
     public function __invoke(mixed $valueA, mixed $valueB): int;
 
     public function sort(iterable $value): Iterator;
-
-    public function sortArray(iterable $value): array;
 }