From 6006d62d15901a39327769622d71e3e8d099fee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrik=20S=C3=B6dergren?= <ulrik@digitalfotografen.se>
Date: Mon, 24 Apr 2017 10:57:46 +0200
Subject: [PATCH] Patch of bug #544 Changed all setError calls back to error
 calls

This fails on one test.
UsersShellTest::testResetAllPasswordsNoPassingParams

This test expects a call to the setError method
I guess there was a plan to implement the setError method.
---
 src/Shell/UsersShell.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Shell/UsersShell.php b/src/Shell/UsersShell.php
index 27e704418..bfdea13be 100644
--- a/src/Shell/UsersShell.php
+++ b/src/Shell/UsersShell.php
@@ -112,7 +112,7 @@ public function resetAllPasswords()
     {
         $password = Hash::get($this->args, 0);
         if (empty($password)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a password.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a password.'));
         }
         $hashedPassword = $this->_generatedHashedPassword($password);
         $this->Users->updateAll(['password' => $hashedPassword], ['id IS NOT NULL']);
@@ -135,10 +135,10 @@ public function resetPassword()
         $username = Hash::get($this->args, 0);
         $password = Hash::get($this->args, 1);
         if (empty($username)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a username.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a username.'));
         }
         if (empty($password)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a password.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a password.'));
         }
         $data = [
             'password' => $password
@@ -163,10 +163,10 @@ public function changeRole()
         $username = Hash::get($this->args, 0);
         $role = Hash::get($this->args, 1);
         if (empty($username)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a username.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a username.'));
         }
         if (empty($role)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a role.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a role.'));
         }
         $data = [
             'role' => $role
@@ -215,7 +215,7 @@ public function passwordEmail()
     {
         $reference = Hash::get($this->args, 0);
         if (empty($reference)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a username or email.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a username or email.'));
         }
         $resetUser = $this->Users->resetToken($reference, [
             'expiration' => Configure::read('Users.Token.expiration'),
@@ -227,7 +227,7 @@ public function passwordEmail()
             $this->out($msg);
         } else {
             $msg = __d('CakeDC/Users', 'The password token could not be generated. Please try again');
-            $this->setError($msg);
+            $this->error($msg);
         }
     }
 
@@ -241,7 +241,7 @@ protected function _changeUserActive($active)
     {
         $username = Hash::get($this->args, 0);
         if (empty($username)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a username.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a username.'));
         }
         $data = [
             'active' => $active
@@ -316,7 +316,7 @@ protected function _updateUser($username, $data)
     {
         $user = $this->Users->find()->where(['username' => $username])->first();
         if (empty($user)) {
-            $this->setError(__d('CakeDC/Users', 'The user was not found.'));
+            $this->error(__d('CakeDC/Users', 'The user was not found.'));
         }
         $user = $this->Users->patchEntity($user, $data);
         collection($data)->filter(function ($value, $field) use ($user) {
@@ -338,7 +338,7 @@ public function deleteUser()
     {
         $username = Hash::get($this->args, 0);
         if (empty($username)) {
-            $this->setError(__d('CakeDC/Users', 'Please enter a username.'));
+            $this->error(__d('CakeDC/Users', 'Please enter a username.'));
         }
         $user = $this->Users->find()->where(['username' => $username])->first();
         if (isset($this->Users->SocialAccounts)) {
@@ -346,7 +346,7 @@ public function deleteUser()
         }
         $deleteUser = $this->Users->delete($user);
         if (!$deleteUser) {
-            $this->setError(__d('CakeDC/Users', 'The user {0} was not deleted. Please try again', $username));
+            $this->error(__d('CakeDC/Users', 'The user {0} was not deleted. Please try again', $username));
         }
         $this->out(__d('CakeDC/Users', 'The user {0} was deleted successfully', $username));
     }