Move filters into collection class.

Author: dereuromark

phpstan.neon

@@ -14,7 +14,6 @@ parameters:
 		- identifier: missingType.iterableValue
 		- identifier: missingType.generics
 		- identifier: trait.unused
-		- '#Access to an undefined property Cake\\ORM\\BehaviorRegistry::\$Search#'
 		- '#Negated boolean expression is always false.#'
 		- '#Parameter \#1 \$.+ of function call_user_func_array expects .+, array.+ given.#'
 

src/Model/Filter/QueuedJobsCollection.php

@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+
+namespace Queue\Model\Filter;
+
+use Cake\Http\Exception\NotImplementedException;
+use Cake\I18n\DateTime;
+use Cake\ORM\Query\SelectQuery;
+use Search\Model\Filter\FilterCollection;
+
+class QueuedJobsCollection extends FilterCollection {
+
+	/**
+	 * @return void
+	 */
+	public function initialize(): void {
+		$this
+			->value('job_task')
+			->like('search', [
+				'before' => true,
+				'after' => true,
+				'field' => ['job_group', 'reference', 'status'],
+			])
+			->add('status', 'Search.Callback', [
+				'callback' => function (SelectQuery $query, array $args, $filter) {
+					$status = $args['status'];
+					if ($status === 'completed') {
+						$query->where(['completed IS NOT' => null]);
+
+						return true;
+					}
+					if ($status === 'in_progress') {
+						$query->where([
+							'completed IS' => null,
+							'OR' => [
+								'notbefore <=' => new DateTime(),
+								'notbefore IS' => null,
+							],
+						]);
+
+						return true;
+					}
+					if ($status === 'scheduled') {
+						$query->where(['completed IS' => null, 'notbefore >' => new DateTime()]);
+
+						return true;
+					}
+
+					throw new NotImplementedException('Invalid status type');
+				},
+			]);
+	}
+
+}

src/Model/Table/QueuedJobsTable.php

@@ -7,7 +7,6 @@
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\EventInterface;
-use Cake\Http\Exception\NotImplementedException;
 use Cake\I18n\DateTime;
 use Cake\ORM\Query\SelectQuery;
 use Cake\ORM\Table;
@@ -16,11 +15,11 @@
 use InvalidArgumentException;
 use Queue\Config\JobConfig;
 use Queue\Model\Entity\QueuedJob;
+use Queue\Model\Filter\QueuedJobsCollection;
 use Queue\Queue\Config;
 use Queue\Queue\TaskFinder;
 use Queue\Utility\Memory;
 use RuntimeException;
-use Search\Manager;
 
 /**
  * @author [email protected]
@@ -116,7 +115,9 @@ public function initialize(array $config): void {
 
 		$this->addBehavior('Timestamp');
 		if (Configure::read('Queue.isSearchEnabled') !== false && Plugin::isLoaded('Search')) {
-			$this->addBehavior('Search.Search');
+			$this->addBehavior('Search.Search', [
+				'collectionClass' => QueuedJobsCollection::class,
+			]);
 		}
 
 		$this->belongsTo('WorkerProcesses', [
@@ -143,46 +144,6 @@ public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObj
 		}
 	}
 
-	/**
-	 * @return \Search\Manager
-	 */
-	public function searchManager(): Manager {
-		$searchManager = $this->behaviors()->Search->searchManager();
-		$searchManager
-			->value('job_task')
-			->like('search', ['fields' => ['job_group', 'reference', 'status'], 'before' => true, 'after' => true])
-			->add('status', 'Search.Callback', [
-				'callback' => function (SelectQuery $query, array $args, $filter) {
-					$status = $args['status'];
-					if ($status === 'completed') {
-						$query->where(['completed IS NOT' => null]);
-
-						return true;
-					}
-					if ($status === 'in_progress') {
-						$query->where([
-							'completed IS' => null,
-							'OR' => [
-								'notbefore <=' => new DateTime(),
-								'notbefore IS' => null,
-							],
-						]);
-
-						return true;
-					}
-					if ($status === 'scheduled') {
-						$query->where(['completed IS' => null, 'notbefore >' => new DateTime()]);
-
-						return true;
-					}
-
-					throw new NotImplementedException('Invalid status type');
-				},
-			]);
-
-		return $searchManager;
-	}
-
 	/**
 	 * Default validation rules.
 	 *