Doc blocks and translation domain corrections

src/Controller/Component/UserToolComponent.php

@@ -364,6 +364,10 @@ public function mapAction() {
 		return $this->_mapAction($action);
 	}
 
+	/**
+	 * @param string $action
+	 * @return \Cake\Network\Response A response object containing the rendered view.
+	 */
 	protected function _directMapping($action) {
 		if (!method_exists($this, $action)) {
 			return false;
@@ -375,6 +379,12 @@ protected function _directMapping($action) {
 		return $this->_controller->render($action);
 	}
 
+	/**
+	 * Maps an action of the controller to the component
+	 *
+	 * @param string $action
+	 * @return bool|\Cake\Network\Response
+	 */
 	protected function _mapAction($action) {
 		$actionMap = $this->config('actionMap');
 		if (isset($actionMap[$action]) && method_exists($this, $actionMap[$action]['method'])) {
@@ -545,19 +555,18 @@ protected function _getUserEntity($userId) {
 	 * Logout
 	 *
 	 * @param array $options Options array.
-	 * @return void
+	 * @return \Cake\Network\Response
 	 */
 	public function logout($options = []) {
 		$options = Hash::merge($this->config('logout'), $options);
 		$Auth = $this->_getAuthObject();
 		$user = $Auth->user();
+
 		if (empty($user)) {
-			$this->_controller->redirect($this->_controller->referer());
-			return;
+			return $this->_controller->redirect($this->_controller->referer());
 		}
-		$this->handleFlashAndRedirect('success', $options);
-		$this->_controller->redirect($Auth->logout());
-		return;
+
+		return $this->handleFlashAndRedirect('success', $options);
 	}
 
 	/**

src/Model/Behavior/UserBehavior.php

@@ -595,7 +595,7 @@ protected function validationOldPassword($validator) {
 		$validator->provider('userTable', $this->_table);
 		$validator->add('old_password', 'notBlank', [
 			'rule' => 'notBlank',
-			'message' => __d('userTools', 'Enter your old password.')
+			'message' => __d('user_tools', 'Enter your old password.')
 		]);
 		$validator->add('old_password', 'oldPassword', [
 			'rule' => ['validateOldPassword', 'password'],

src/Template/UserTools/view.ctp

@@ -1,13 +1,13 @@
 <h2><?= h($user->username) ?></h2>
 <dl>
-	<dt><?= __('Username') ?></dt>
+	<dt><?= __d('user_tools', 'Username') ?></dt>
 	<dd><?= h($user->username) ?></dd>
-	<dt><?= __('Email') ?></dt>
+	<dt><?= __d('user_tools', 'Email') ?></dt>
 	<dd><?= h($user->email) ?></dd>
-	<dt><?= __('Active') ?></dt>
+	<dt><?= __d('user_tools', 'Active') ?></dt>
 	<dd><?= h($user->active) ?></dd>
-	<dt><?= __('Email Verified') ?></dt>
+	<dt><?= __d('user_tools', 'Email Verified') ?></dt>
 	<dd><?= h($user->email_verified) ?></dd>
-	<dt><?= __('Created') ?></dt>
+	<dt><?= __d('user_tools', 'Created') ?></dt>
 	<dd><?= h($user->created) ?></dd>
-</dl>
+</dl>