From f57b3536a20ec71f2ac8a5315fda91f7fe92f3d7 Mon Sep 17 00:00:00 2001
From: slavcodev <slavcopost@gmail.com>
Date: Wed, 13 Nov 2013 11:41:25 +0200
Subject: [PATCH] Fixed apps rules

---
 apps/advanced/common/models/LoginForm.php     |  4 ++--
 apps/advanced/common/models/User.php          | 24 ++++++++++++------------
 apps/advanced/frontend/models/ContactForm.php |  4 ++--
 apps/basic/models/ContactForm.php             |  4 ++--
 apps/basic/models/LoginForm.php               |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/advanced/common/models/LoginForm.php b/apps/advanced/common/models/LoginForm.php
index 795c378..30fb39b 100644
--- a/apps/advanced/common/models/LoginForm.php
+++ b/apps/advanced/common/models/LoginForm.php
@@ -23,9 +23,9 @@ class LoginForm extends Model
 			// username and password are both required
 			[['username', 'password'], 'required'],
 			// password is validated by validatePassword()
-			[['password'], 'validatePassword'],
+			['password', 'validatePassword'],
 			// rememberMe must be a boolean value
-			[['rememberMe'], 'boolean'],
+			['rememberMe', 'boolean'],
 		];
 	}
 
diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php
index 85e5539..17bd630 100644
--- a/apps/advanced/common/models/User.php
+++ b/apps/advanced/common/models/User.php
@@ -104,18 +104,18 @@ class User extends ActiveRecord implements IdentityInterface
 	public function rules()
 	{
 		return [
-			[['username'], 'filter', 'filter' => 'trim'],
-			[['username'], 'required'],
-			[['username'], 'string', 'min' => 2, 'max' => 255],
-
-			[['email'], 'filter', 'filter' => 'trim'],
-			[['email'], 'required'],
-			[['email'], 'email'],
-			[['email'], 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'],
-			[['email'], 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'],
-
-			[['password'], 'required'],
-			[['password'], 'string', 'min' => 6],
+			['username', 'filter', 'filter' => 'trim'],
+			['username', 'required'],
+			['username', 'string', 'min' => 2, 'max' => 255],
+
+			['email', 'filter', 'filter' => 'trim'],
+			['email', 'required'],
+			['email', 'email'],
+			['email', 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'],
+			['email', 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'],
+
+			['password', 'required'],
+			['password', 'string', 'min' => 6],
 		];
 	}
 
diff --git a/apps/advanced/frontend/models/ContactForm.php b/apps/advanced/frontend/models/ContactForm.php
index 45b0da0..0a664ad 100644
--- a/apps/advanced/frontend/models/ContactForm.php
+++ b/apps/advanced/frontend/models/ContactForm.php
@@ -25,9 +25,9 @@ class ContactForm extends Model
 			// name, email, subject and body are required
 			[['name', 'email', 'subject', 'body'], 'required'],
 			// email has to be a valid email address
-			[['email'], 'email'],
+			['email', 'email'],
 			// verifyCode needs to be entered correctly
-			[['verifyCode'], 'captcha'],
+			['verifyCode', 'captcha'],
 		];
 	}
 
diff --git a/apps/basic/models/ContactForm.php b/apps/basic/models/ContactForm.php
index dbdde8b..1344562 100644
--- a/apps/basic/models/ContactForm.php
+++ b/apps/basic/models/ContactForm.php
@@ -25,9 +25,9 @@ class ContactForm extends Model
 			// name, email, subject and body are required
 			[['name', 'email', 'subject', 'body'], 'required'],
 			// email has to be a valid email address
-			[['email'], 'email'],
+			['email', 'email'],
 			// verifyCode needs to be entered correctly
-			[['verifyCode'], 'captcha'],
+			['verifyCode', 'captcha'],
 		];
 	}
 
diff --git a/apps/basic/models/LoginForm.php b/apps/basic/models/LoginForm.php
index cdff17b..ad854a2 100644
--- a/apps/basic/models/LoginForm.php
+++ b/apps/basic/models/LoginForm.php
@@ -23,9 +23,9 @@ class LoginForm extends Model
 			// username and password are both required
 			[['username', 'password'], 'required'],
 			// password is validated by validatePassword()
-			[['password'], 'validatePassword'],
+			['password', 'validatePassword'],
 			// rememberMe must be a boolean value
-			[['rememberMe'], 'boolean'],
+			['rememberMe', 'boolean'],
 		];
 	}