Merge d00818d into 0c49ab0

.travis.yml

@@ -3,13 +3,18 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
+
+allow_failures:
+  - php: 7.0
 
 before_script:
   - composer install --dev
   - cp phpunit.xml.dist phpunit.xml
 
 script:
-  - phpunit Test/TestCase/AllUserToolsTest.php
+  - phpunit
 
 notifications:
   email: false

composer.json

@@ -15,7 +15,7 @@
 	"require": {
 		"php": ">=5.4.16",
 		"cakephp/plugin-installer": "*",
-		"cakephp/cakephp": "~3.0.0"
+		"cakephp/cakephp": "~3.0.2"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "*"

src/Model/Behavior/UserBehavior.php

@@ -506,8 +506,8 @@ public function removeExpiredRegistrations($conditions = []) {
 	public function changePassword(Entity $entity) {
 		$validator = $this->_table->validator('default');
 		$validator->provider('userTable', $this->_table);
-		$validator->add('old_password', 'notEmpty', [
-			'rule' => 'notEmpty',
+		$validator->add('old_password', 'notBlank', [
+			'rule' => 'notBlank',
 			'message' => __d('userTools', 'Enter your old password.')
 		]);
 		$validator->add('old_password', 'oldPassword', [

src/Validation/UsersValidator.php

@@ -32,8 +32,8 @@ public function __construct() {
  */
 	public function validateUserName() {
 		$this->add('username', [
-			'notEmpty' => [
-				'rule' => 'notEmpty',
+			'notBlank' => [
+				'rule' => 'notBlank',
 				'message' => __d('user_tools', 'An username is required.')
 			],
 			'length' => [

src/View/Helper/AuthHelper.php

@@ -94,7 +94,7 @@ public function isMe($userId, $field = 'id') {
  * @return mixed
  */
 	public function user($key) {
-		return $this->_userData->{$key};
+		return $this->_userData[$key];
 	}
 
 /**