sibds / yii2-activerecord

BeforeQueryTrait.php

Braces +7 added lines, -6 removed lines

@@ -19,11 +19,12 @@
             }
         }
 
-        if ($obj->hasAttribute($obj->removedAttribute))
-            return (new DynamicQuery($obj))->findRemoved()->andFilterWhere($condition);
-        elseif ($obj->isNestedSet())
-            return (new DynamicQuery($obj))->andFilterWhere($condition);
-        else
-            return parent::find()->andFilterWhere($condition);
+        if ($obj->hasAttribute($obj->removedAttribute)) {
+                    return (new DynamicQuery($obj))->findRemoved()->andFilterWhere($condition);
+        } elseif ($obj->isNestedSet()) {
+                    return (new DynamicQuery($obj))->andFilterWhere($condition);
+        } else {
+                    return parent::find()->andFilterWhere($condition);
+        }
     }
 }

ActiveRecord.php

Spacing +4 added lines, -4 removed lines

@@ -101,20 +101,20 @@
             ];
         }
         
-        if($this->isNestedSet()){
+        if ($this->isNestedSet()) {
             $behaviors['tree'] = ArrayHelper::merge([
                 'class' => \creocoder\nestedsets\NestedSetsBehavior::className(),
                 'leftAttribute' => 'lft',
                 'rightAttribute' => 'rgt',
                 'depthAttribute' => 'depth',
-            ], ($this->hasAttribute('tree')?['treeAttribute' => 'tree']:[]));
+            ], ($this->hasAttribute('tree') ? ['treeAttribute' => 'tree'] : []));
         }
 
         return $behaviors;
     }
 
-    public function isNestedSet(){
-        return $this->hasAttribute('lft')&&$this->hasAttribute('rgt')&&$this->hasAttribute('depth');
+    public function isNestedSet() {
+        return $this->hasAttribute('lft') && $this->hasAttribute('rgt') && $this->hasAttribute('depth');
     }
 
     /**