sibds / yii2-activerecord

ActiveRecord.php

Spacing +6 added lines, -6 removed lines

@@ -102,12 +102,12 @@ 
     }
 
 
-    public function lock(){
+    public function lock() {
         $this->status = self::STATUS_LOCK;
         $this->save();
     }
 
-    public function unlock(){
+    public function unlock() {
         $this->status = self::STATUS_DEFAULT;
         $this->save();
     }
@@ -116,13 +116,13 @@ 
      * Duplicate entries in the table.
      * @return $this|null
      */
-    public function duplicate(){
-        $this->isNewRecord=true;
+    public function duplicate() {
+        $this->isNewRecord = true;
 
-        foreach($this->primaryKey() as $key)
+        foreach ($this->primaryKey() as $key)
             $this->$key = null;
 
-        if($this->save()){
+        if ($this->save()) {
             return $this;
         }
         return null;

Braces +12 added lines, -8 removed lines

@@ -62,8 +62,8 @@ 
         // If table not have fields, then behavior not use
         $behaviors = [];
         //Check timestamp
-        if ($this->hasAttribute($this->createdAtAttribute) && $this->hasAttribute($this->updatedAtAttribute))
-            $behaviors['timestamp'] = [
+        if ($this->hasAttribute($this->createdAtAttribute) && $this->hasAttribute($this->updatedAtAttribute)) {
+                    $behaviors['timestamp'] = [
                 'class' => TimestampBehavior::className(),
                 'attributes' => [
                     ActiveRecord::EVENT_BEFORE_INSERT => [$this->createdAtAttribute, $this->updatedAtAttribute],
@@ -71,14 +71,16 @@ 
                 ],
 
             ];
+        }
 
         //Check blameable
-        if ($this->hasAttribute($this->createdByAttribute) && $this->hasAttribute($this->updatedByAttribute))
-            $behaviors['blameable'] = [
+        if ($this->hasAttribute($this->createdByAttribute) && $this->hasAttribute($this->updatedByAttribute)) {
+                    $behaviors['blameable'] = [
                 'class' => UserDataBehavior::className(),
                 'createdByAttribute' => $this->createdByAttribute,
                 'updatedByAttribute' => $this->updatedByAttribute,
             ];
+        }
 
         //Check trash
         if ($this->hasAttribute($this->removedAttribute)) {
@@ -94,9 +96,10 @@ 
     public function beforeSave($insert)
     {
         if ($insert) {
-            if ($this->hasAttribute($this->lockedAttribute))
-                if (empty($this->{$this->lockedAttribute}) || is_null($this->{$this->lockedAttribute}))
+            if ($this->hasAttribute($this->lockedAttribute)) {
+                            if (empty($this->{$this->lockedAttribute}) || is_null($this->{$this->lockedAttribute}))
                     $this->{$this->lockedAttribute} = self::STATUS_UNLOCK;
+            }
         }
 
         return parent::beforeSave($insert);
@@ -120,8 +123,9 @@ 
     public function duplicate(){
         $this->isNewRecord=true;
 
-        foreach($this->primaryKey() as $key)
-            $this->$key = null;
+        foreach($this->primaryKey() as $key) {
+                    $this->$key = null;
+        }
 
         if($this->save()){
             return $this;

UserDataBehavior.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: vadim
- * Date: 26.05.15
- * Time: 15:12
- */
+     * Created by PhpStorm.
+     * User: vadim
+     * Date: 26.05.15
+     * Time: 15:12
+     */
 
 namespace sibds\behaviors;
 

Braces +12 added lines, -8 removed lines

@@ -22,8 +22,9 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute))
-            return $owner->hasOne(User::className(), ['id' => $this->createdByAttribute]);
+        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute)) {
+                    return $owner->hasOne(User::className(), ['id' => $this->createdByAttribute]);
+        }
 
         return null;
     }
@@ -37,8 +38,9 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute))
-            return $this->createUser ? $this->createUser->username : '- no user -';
+        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute)) {
+                    return $this->createUser ? $this->createUser->username : '- no user -';
+        }
 
         return null;
     }
@@ -52,8 +54,9 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute))
-            return $this->hasOne(User::className(), ['id' => $this->updatedByAttribute]);
+        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute)) {
+                    return $this->hasOne(User::className(), ['id' => $this->updatedByAttribute]);
+        }
 
         return null;
     }
@@ -67,8 +70,9 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute))
-            return $this->createUser ? $this->updateUser->username : '- no user -';
+        if ($owner->hasAttribute($this->createdByAttribute) && $owner->hasAttribute($this->updatedByAttribute)) {
+                    return $this->createUser ? $this->updateUser->username : '- no user -';
+        }
 
         return null;
     }