Remove deprecations

Author: dereuromark

src/Command/ResetCommand.php

@@ -72,7 +72,7 @@ protected function email(Arguments $args, ConsoleIo $io): void {
 		if (empty($this->params['dry-run'])) {
 			$count = $Users->updateAll(['email' => $email . ''], ['email !=' => $email]);
 		} else {
-			$count = $Users->find('all', ['conditions' => [CLASS_USERS . '.email !=' => $email]])->count();
+			$count = $Users->find('all', ...['conditions' => [CLASS_USERS . '.email !=' => $email]])->count();
 		}
 		$io->out($count . ' emails resetted - DONE');
 	}
@@ -126,7 +126,7 @@ public function pwd(Arguments $args, ConsoleIo $io): void {
 		if (empty($this->params['dry-run'])) {
 			$count = $Users->updateAll(['password' => $pwd], ['password !=' => $pwd]);
 		} else {
-			$count = $Users->find('all', ['conditions' => [CLASS_USERS . '.password !=' => $pwd]])->count();
+			$count = $Users->find('all', ...['conditions' => [CLASS_USERS . '.password !=' => $pwd]])->count();
 		}
 		$io->out($count . ' pwds resetted - DONE');
 	}

src/Controller/Admin/UptimeController.php

@@ -14,9 +14,9 @@ class UptimeController extends AppController {
 
 	/**
 	 * @param \Cake\Event\EventInterface $event
-	 * @return \Cake\Http\Response|null|void
+	 * @return void
 	 */
-	public function beforeFilter(EventInterface $event) {
+	public function beforeFilter(EventInterface $event): void {
 		parent::beforeFilter($event);
 
 		if ($this->components()->has('Auth') && method_exists($this->components()->get('Auth'), 'allow')) {

src/Controller/Component/SetupComponent.php

@@ -59,9 +59,9 @@ class SetupComponent extends Component {
 	/**
 	 * @param \Cake\Event\EventInterface $event
 	 * @throws \Exception
-	 * @return \Cake\Http\Response|null|void
+	 * @return void
 	 */
-	public function beforeFilter(EventInterface $event) {
+	public function beforeFilter(EventInterface $event): void {
 		/** @var \Cake\Controller\Controller $Controller */
 		$Controller = $event->getSubject();
 		$this->Controller = $Controller;
@@ -86,7 +86,7 @@ public function beforeFilter(EventInterface $event) {
 
 		// The following is only allowed with proper clearance
 		if (!$this->isAuthorized()) {
-			return null;
+			return;
 		}
 
 		// maintenance mode
@@ -99,7 +99,9 @@ public function beforeFilter(EventInterface $event) {
 				$this->Controller->Flash->error(__d('setup', 'Maintenance mode not {0}', $mode));
 			}
 
-			return $this->Controller->redirect($this->_cleanedUrl('maintenance'));
+			$event->setResult($this->Controller->redirect($this->_cleanedUrl('maintenance')));
+
+			return;
 		}
 
 		// debug mode
@@ -111,7 +113,9 @@ public function beforeFilter(EventInterface $event) {
 				$this->Controller->Flash->error(__d('setup', 'debug not set'));
 			}
 
-			return $this->Controller->redirect($this->_cleanedUrl('debug'));
+			$event->setResult($this->Controller->redirect($this->_cleanedUrl('debug')));
+
+			return;
 		}
 
 		// clear cache
@@ -125,7 +129,9 @@ public function beforeFilter(EventInterface $event) {
 				$this->Controller->Flash->error(__d('setup', 'cache not cleared'));
 			}
 
-			return $this->Controller->redirect($this->_cleanedUrl('clearcache'));
+			$event->setResult($this->Controller->redirect($this->_cleanedUrl('clearcache')));
+
+			return;
 		}
 
 		// clear session
@@ -136,7 +142,9 @@ public function beforeFilter(EventInterface $event) {
 				$this->Controller->Flash->error(__d('setup', 'session not cleared'));
 			}
 
-			return $this->Controller->redirect($this->_cleanedUrl('clearsession'));
+			$event->setResult($this->Controller->redirect($this->_cleanedUrl('clearsession')));
+
+			return;
 		}
 
 		// layout switch
@@ -146,7 +154,9 @@ public function beforeFilter(EventInterface $event) {
 			$this->setLayout($layout);
 			$this->Controller->Flash->success(__d('setup', 'layout {0} activated', $this->Controller->getRequest()->getQuery('layout')));
 
-			return $this->Controller->redirect($this->_cleanedUrl('layout'));
+			$event->setResult($this->Controller->redirect($this->_cleanedUrl('layout')));
+
+			return;
 		}
 
 		$this->issueMailing();