Upgrade to 3.1.0

kirby/src/Cms/Collection.php

@@ -230,6 +230,38 @@ class Collection extends BaseCollection
         return $this->parent;
     }
 
+    /**
+     * Runs a combination of filterBy, sortBy, not
+     * offset, limit, search and paginate on the collection.
+     * Any part of the query is optional.
+     *
+     * @param array $query
+     * @return self
+     */
+    public function query(array $query = [])
+    {
+        $paginate = $query['paginate'] ?? null;
+        $search   = $query['search'] ?? null;
+
+        unset($query['paginate']);
+
+        $result = parent::query($query);
+
+        if (empty($search) === false) {
+            if (is_array($search) === true) {
+                $result = $result->search($search['query'] ?? null, $search['options'] ?? []);
+            } else {
+                $result = $result->search($search);
+            }
+        }
+
+        if (empty($paginate) === false) {
+            $result = $result->paginate($paginate);
+        }
+
+        return $result;
+    }
+
     /**
      * Removes an object
      *