sibds / yii2-trash-behavior

TrashBehavior.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      * @var callable the value that will be assigned to the attributes. This should be a valid
      * PHP callable whose return value will be assigned to the current attribute(s).
      */
-     public $value;
+        public $value;
 
     /**
      * @inheritdoc

Spacing +14 added lines, -14 removed lines

@@ -30,12 +30,12 @@ 
      * @var mixed The value to set for removed model.
      * Default is 1.
      */
-    public $removedFlag=1;
+    public $removedFlag = 1;
     /**
      * @var mixed The value to set for restored model.
      * Default is 0.
      */
-    public $restoredFlag=0;
+    public $restoredFlag = 0;
 
     /**
      * @var callable the value that will be assigned to the attributes. This should be a valid
@@ -57,18 +57,18 @@ 
         }
     }
 
-    public function events(){
+    public function events() {
         return ArrayHelper::merge([
             ActiveRecord::EVENT_BEFORE_INSERT => 'checkNewRecord',
         ], parent::events());
     }
 
-    public function checkNewRecord($events){
+    public function checkNewRecord($events) {
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if($owner->hasAttribute($this->trashAttribute))
-            if(empty($owner->{$this->trashAttribute})||is_null($owner->{$this->trashAttribute}))
+        if ($owner->hasAttribute($this->trashAttribute))
+            if (empty($owner->{$this->trashAttribute})||is_null($owner->{$this->trashAttribute}))
                 $owner->{$this->trashAttribute} = $this->restoredFlag;
     }
 
@@ -77,15 +77,15 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if ($this->value === null) {
-            if($owner->{$this->trashAttribute}==$this->restoredFlag)
+        if ($this->value===null) {
+            if ($owner->{$this->trashAttribute}==$this->restoredFlag)
             {
                 $event->isValid = false;
-                $owner->{$this->trashAttribute}=$this->removedFlag;
+                $owner->{$this->trashAttribute} = $this->removedFlag;
                 $owner->save(false);
 
                 return $this->removedFlag;
-            }else{
+            } else {
                 return true;
             }
             return false;
@@ -99,16 +99,16 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        $owner->{$this->trashAttribute}=$this->restoredFlag;
+        $owner->{$this->trashAttribute} = $this->restoredFlag;
 
         $owner->save(false);
     }
 
-    public function getIsRemoved(){
+    public function getIsRemoved() {
         return $this->owner->{$this->trashAttribute}==$this->removedFlag;
     }
 
-    public function fullTrashAttribute($removed=false){
-        return [$this->trashAttribute=>($removed?$this->removedFlag:$this->restoredFlag)];
+    public function fullTrashAttribute($removed = false) {
+        return [ $this->trashAttribute=>($removed ? $this->removedFlag : $this->restoredFlag) ];
     }
 }
\ No newline at end of file

Braces +4 added lines, -3 removed lines

@@ -67,9 +67,10 @@ 
         /* @var $owner BaseActiveRecord */
         $owner = $this->owner;
 
-        if($owner->hasAttribute($this->trashAttribute))
-            if(empty($owner->{$this->trashAttribute})||is_null($owner->{$this->trashAttribute}))
+        if($owner->hasAttribute($this->trashAttribute)) {
+                    if(empty($owner->{$this->trashAttribute})||is_null($owner->{$this->trashAttribute}))
                 $owner->{$this->trashAttribute} = $this->restoredFlag;
+        }
     }
 
     protected function getValue($event)
@@ -85,7 +86,7 @@ 
                 $owner->save(false);
 
                 return $this->removedFlag;
-            }else{
+            } else{
                 return true;
             }
             return false;

TrashQuery.php

Indentation +5 added lines, -5 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 use yii\db\ActiveQuery;
 
 class TrashQuery extends ActiveQuery {
-    public function behaviors(){
+    public function behaviors() {
         return [
             TrashQueryBehavior::className(),
         ];

TrashQueryBehavior.php

Indentation +5 added lines, -5 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     public function withRemoved() {
         $model = new $this->owner->modelClass();
 
-        return $this->owner->where([$model->trashAttribute=>[$model->removedFlag,$model->restoredFlag]]);
+        return $this->owner->where([ $model->trashAttribute=>[ $model->removedFlag, $model->restoredFlag ] ]);
     }
 
     public function onlyActive() {