Fix up deprecations.

dereuromark · Nov 11, 2021 · fc7c83f · fc7c83f
1 parent 92101a3
commit fc7c83f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/src/Controller/Admin/LoadHelperTrait.php b/src/Controller/Admin/LoadHelperTrait.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Queue\Controller\Admin;
+
+use Cake\Core\Configure;
+
+trait LoadHelperTrait {
+
+	/**
+	 * @return void
+	 */
+	protected function loadHelpers(): void {
+		$helpers = [
+			'Time' => ['class' => 'Tools.Time', 'engine' => 'Tools\Utility\FrozenTime'],
+			'Tools.Format',
+			'Tools.Text',
+			'Shim.Configure',
+		];
+
+		$version = Configure::version();
+		if (version_compare($version, '4.3.0') >= 0) {
+			$this->viewBuilder()->addHelpers($helpers);
+		} else {
+			$this->viewBuilder()->setHelpers($helpers);
+		}
+	}
+
+}
diff --git a/src/Controller/Admin/QueueController.php b/src/Controller/Admin/QueueController.php
@@ -13,6 +13,8 @@
  */
 class QueueController extends AppController {
 
+	use LoadHelperTrait;
+
 	/**
 	 * @var string
 	 */
@@ -24,7 +26,7 @@ class QueueController extends AppController {
 	public function initialize(): void {
 		parent::initialize();
 
-		$this->viewBuilder()->setHelpers(['Tools.Time' => ['engine' => 'Tools\Utility\FrozenTime'], 'Tools.Format', 'Tools.Text', 'Shim.Configure'], false);
+		$this->loadHelpers();
 	}
 
 	/**

diff --git a/src/Controller/Admin/QueueProcessesController.php b/src/Controller/Admin/QueueProcessesController.php
@@ -14,6 +14,8 @@
  */
 class QueueProcessesController extends AppController {
 
+	use LoadHelperTrait;
+
 	/**
 	 * @var array
 	 */
@@ -29,7 +31,7 @@ class QueueProcessesController extends AppController {
 	public function initialize(): void {
 		parent::initialize();
 
-		$this->viewBuilder()->setHelpers(['Tools.Time' => ['engine' => 'Tools\Utility\FrozenTime'], 'Tools.Format', 'Tools.Text', 'Shim.Configure'], false);
+		$this->loadHelpers();
 	}
 
 	/**

diff --git a/src/Controller/Admin/QueuedJobsController.php b/src/Controller/Admin/QueuedJobsController.php
@@ -19,6 +19,8 @@
  */
 class QueuedJobsController extends AppController {
 
+	use LoadHelperTrait;
+
 	/**
 	 * @var array
 	 */
@@ -41,7 +43,7 @@ public function initialize(): void {
 		}
 
 		$this->enableSearch();
-		$this->viewBuilder()->setHelpers(['Tools.Time' => ['engine' => 'Tools\Utility\FrozenTime'], 'Tools.Format', 'Tools.Text', 'Shim.Configure'], false);
+		$this->loadHelpers();
 	}
 
 	/**