updated UserModel, UserModelTest & UserTest

application/Models/Aauth/UserModel.php

@@ -89,13 +89,18 @@ class UserModel extends Model
 	{
 		parent::__construct();
 
-		$this->config  = (object) array_merge((array) new AauthConfig(), (array) $config);
+		if (is_null($config))
+		{
+			$config = new \Config\Aauth();
+		}
+
+		$this->config  = $config;
 		$this->table   = $this->config->dbTableUsers;
 		$this->DBGroup = $this->config->dbProfile;
 
-		$this->validationRules['email']    = 'required|if_exist|valid_email|is_unique[' . $this->table . '.email,id,{id}]';
+		$this->validationRules['email']    = 'required|if_exist|valid_email|is_unique[' . $this->table . '.email,id,{$id}]';
 		$this->validationRules['password'] = 'required|if_exist|min_length[' . $this->config->passwordMin . ']|max_length[' . $this->config->passwordMax . ']';
-		$this->validationRules['username'] = 'if_exist|is_unique[' . $this->table . '.username,id,{id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]';
+		$this->validationRules['username'] = 'if_exist|is_unique[' . $this->table . '.username,id,{$id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]';
 
 		$this->validationMessages = [
 			'email'    => [
@@ -117,7 +122,7 @@ class UserModel extends Model
 
 		if ($this->config->loginUseUsername)
 		{
-			$this->validationRules['username'] = 'required|if_exist|is_unique[' . $this->table . '.username,id,{id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]';
+			$this->validationRules['username'] = 'required|if_exist|is_unique[' . $this->table . '.username,id,{$id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]';
 
 			$this->validationMessages['username']['required'] = lang('Aauth.requiredUsername');
 		}

tests/Aauth/Database/UserModelTest.php

@@ -1,7 +1,8 @@
 <?php namespace Tests\Aauth\Database;
 
+use Config\Aauth as AauthConfig;
 use CodeIgniter\Test\CIDatabaseTestCase;
-use App\Models\Aauth\UserModel as UserModel;
+use App\Models\Aauth\UserModel;
 
 class UserModelTest extends CIDatabaseTestCase
 {
@@ -84,8 +85,8 @@ class UserModelTest extends CIDatabaseTestCase
 
 	public function testLoginUseUsernameDummy()
 	{
-		$config = new \Config\Aauth();
-		$config->loginUseUsername = TRUE;
+		$config = new AauthConfig();
+		$config->loginUseUsername = true;
 
 		$this->model = new UserModel($this->db, null, $config);
 		$newUser = $this->model->insert(['email' => 'test@test.local', 'password' => 'password123456']);

tests/Aauth/Libraries/Aauth/UserTest.php

@@ -83,7 +83,6 @@ class UserTest extends CIDatabaseTestCase
 
 		$this->library->clearInfos();
     	$this->assertFalse($this->library->updateUser(2, 'admin@example.com', null, null));
-    	print_r($this->library->getUser(2));
 	    $this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]);
 
 		$this->library->clearErrors();