From 044fe3633e05a38f2d17036edf8ef30d68f67f2f Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Mon, 30 Jun 2014 08:24:48 +0400
Subject: [PATCH 1/2] Advanced app `User` model code style fixes

---
 apps/advanced/common/models/User.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php
index b4ca611d9a..1f513e6e60 100644
--- a/apps/advanced/common/models/User.php
+++ b/apps/advanced/common/models/User.php
@@ -1,9 +1,9 @@
 <?php
 namespace common\models;
 
+use Yii;
 use yii\base\NotSupportedException;
 use yii\db\ActiveRecord;
-use Yii;
 use yii\web\IdentityInterface;
 
 /**
@@ -25,7 +25,6 @@ class User extends ActiveRecord implements IdentityInterface
 {
     const STATUS_DELETED = 0;
     const STATUS_ACTIVE = 10;
-
     const ROLE_USER = 10;
 
     /**
@@ -85,7 +84,7 @@ class User extends ActiveRecord implements IdentityInterface
     /**
      * Finds user by username
      *
-     * @param  string      $username
+     * @param string $username
      * @return static|null
      */
     public static function findByUsername($username)
@@ -96,12 +95,12 @@ class User extends ActiveRecord implements IdentityInterface
     /**
      * Finds user by password reset token
      *
-     * @param  string      $token password reset token
+     * @param string $token password reset token
      * @return static|null
      */
     public static function findByPasswordResetToken($token)
     {
-        $expire = \Yii::$app->params['user.passwordResetTokenExpire'];
+        $expire = Yii::$app->params['user.passwordResetTokenExpire'];
         $parts = explode('_', $token);
         $timestamp = (int) end($parts);
         if ($timestamp + $expire < time()) {
@@ -142,7 +141,7 @@ class User extends ActiveRecord implements IdentityInterface
     /**
      * Validates password
      *
-     * @param  string  $password password to validate
+     * @param string $password password to validate
      * @return boolean if password provided is valid for current user
      */
     public function validatePassword($password)

From fed61f7d96c7e1478c177d8c5aa36d3c92bec03d Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Mon, 30 Jun 2014 08:41:36 +0400
Subject: [PATCH 2/2] Advanced app `User` model code style fixes

---
 apps/advanced/common/models/User.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php
index 1f513e6e60..aa3be87878 100644
--- a/apps/advanced/common/models/User.php
+++ b/apps/advanced/common/models/User.php
@@ -3,6 +3,7 @@ namespace common\models;
 
 use Yii;
 use yii\base\NotSupportedException;
+use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
 use yii\web\IdentityInterface;
 
@@ -41,13 +42,7 @@ class User extends ActiveRecord implements IdentityInterface
     public function behaviors()
     {
         return [
-            'timestamp' => [
-                'class' => 'yii\behaviors\TimestampBehavior',
-                'attributes' => [
-                    ActiveRecord::EVENT_BEFORE_INSERT => ['created_at', 'updated_at'],
-                    ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'],
-                ],
-            ],
+            TimestampBehavior::className(),
         ];
     }