sibds / yii2-activerecord

ActiveRecord.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 
 namespace sibds\components;
 
-use Yii;
 use yii\behaviors\TimestampBehavior;
 use sibds\behaviors\UserDataBehavior;
 use sibds\behaviors\TrashBehavior;

Doc Comments +3 added lines

@@ -148,6 +148,9 @@
         return ArrayHelper::map($query->all(), $keyField, $valueField);
     }
 
+    /**
+     * @param string $t
+     */
     public static function is_closure($t) {
         return is_object($t) && ($t instanceof Closure);
     }

Spacing +5 added lines, -5 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');
     }
 
     /**
@@ -141,7 +141,7 @@ 
     public static function listAll($keyField = 'id', $valueField = 'name', $asArray = true)
     {
         $query = static::find();        
-        if ($asArray&&!self::is_closure($valueField)) {
+        if ($asArray && !self::is_closure($valueField)) {
             $query->select([$keyField, $valueField])->asArray();
         }
 

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);
+        }
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         foreach ($class->getProperties(\ReflectionProperty::IS_STATIC) as $property) {
             if (strpos($property->getName(), 'BEFORE_QUERY') !== false && is_array($property->getValue($obj))) {
                 $params = $property->getValue($obj);
-                foreach($params as $key => $value){
+                foreach ($params as $key => $value) {
                     $params[$obj::tableName().'.'.$key] = $value;
                     unset($params[$key]);
                 }

DynamicQuery.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             $behaviors[] = TrashQueryBehavior::className();
         }
 
-        if($model->hasAttribute('lft')&&$model->hasAttribute('rgt')&&$model->hasAttribute('depth')){
+        if ($model->hasAttribute('lft') && $model->hasAttribute('rgt') && $model->hasAttribute('depth')) {
             $behaviors[] = NestedSetsQueryBehavior::className();
         }
 

LockedBehavior.php

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
         $owner = $this->owner;
 
         $owner->{$this->lockedAttribute} = $this->valueLock;
-        if(!$owner->validate())
-            throw new \yii\db\Exception('Error saving model! Validating not comlete: ' . implode('; ', $owner->firstErrors));
+        if(!$owner->validate()) {
+                    throw new \yii\db\Exception('Error saving model! Validating not comlete: ' . implode('; ', $owner->firstErrors));
+        }
         $owner->save();
     }
 
@@ -53,8 +54,9 @@ 
         $owner = $this->owner;
 
         $owner->{$this->lockedAttribute} = $this->valueUnlock;
-        if(!$owner->validate())
-            throw new \yii\db\Exception('Error saving model! Validating not comlete: ' . implode('; ', $owner->firstErrors));
+        if(!$owner->validate()) {
+                    throw new \yii\db\Exception('Error saving model! Validating not comlete: ' . implode('; ', $owner->firstErrors));
+        }
 
         $owner->save();
     }

Spacing +4 added lines, -4 removed lines

@@ -42,8 +42,8 @@ 
         $owner = $this->owner;
 
         $owner->{$this->lockedAttribute} = $this->valueLock;
-        if(!$owner->validate())
-            throw new \yii\db\Exception('Error saving model! Validating not comlete: ' . implode('; ', $owner->firstErrors));
+        if (!$owner->validate())
+            throw new \yii\db\Exception('Error saving model! Validating not comlete: '.implode('; ', $owner->firstErrors));
         $owner->save();
     }
 
@@ -53,8 +53,8 @@ 
         $owner = $this->owner;
 
         $owner->{$this->lockedAttribute} = $this->valueUnlock;
-        if(!$owner->validate())
-            throw new \yii\db\Exception('Error saving model! Validating not comlete: ' . implode('; ', $owner->firstErrors));
+        if (!$owner->validate())
+            throw new \yii\db\Exception('Error saving model! Validating not comlete: '.implode('; ', $owner->firstErrors));
 
         $owner->save();
     }

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;