Remove deprecations.

dereuromark · Mar 20, 2024 · 8840bc2 · 8840bc2
1 parent bfb57d2
commit 8840bc2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/src/Controller/Admin/TranslateDomainsController.php b/src/Controller/Admin/TranslateDomainsController.php
@@ -24,10 +24,9 @@ class TranslateDomainsController extends TranslateAppController {
 	 * @return \Cake\Http\Response|null|void
 	 */
 	public function index() {
-		$this->paginate = [
-			'contain' => ['TranslateProjects'],
-		];
-		$translateDomains = $this->paginate();
+		$query = $this->TranslateDomains->find()
+			->contain(['TranslateProjects']);
+		$translateDomains = $this->paginate($query);
 
 		$this->set(compact('translateDomains'));
 		//$this->set('_serialize', ['translateDomains']);

diff --git a/src/Controller/Admin/TranslateStringsController.php b/src/Controller/Admin/TranslateStringsController.php
@@ -41,10 +41,6 @@ public function initialize(): void {
 	 * @return \Cake\Http\Response|null|void
 	 */
 	public function index() {
-		$this->paginate = [
-			'contain' => [],
-		];
-
 		$query = $this->TranslateStrings->find('search', ['search' => $this->request->getQuery()]);
 		$translateStrings = $this->paginate($query);
 

diff --git a/src/Controller/Admin/TranslateTermsController.php b/src/Controller/Admin/TranslateTermsController.php
@@ -37,11 +37,8 @@ public function initialize(): void {
 	 * @return \Cake\Http\Response|null|void
 	 */
 	public function index() {
-		$this->paginate = [
-			'contain' => ['TranslateStrings', 'TranslateLanguages'],
-		];
-
-		$query = $this->TranslateTerms->find('search', ['search' => $this->request->getQuery()]);
+		$query = $this->TranslateTerms->find('search', ['search' => $this->request->getQuery()])
+			->contain(['TranslateStrings', 'TranslateLanguages']);
 		$translateTerms = $this->paginate($query);
 
 		$this->set(compact('translateTerms'));