nkostadinov / yii2-taxonomy

components/terms/CategoryTerm.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace nkostadinov\taxonomy\components\terms;
 
-use insight\core\helpers\ArrayHelper;
 use nkostadinov\taxonomy\components\interfaces\IHierarchicalTerm;
 use nkostadinov\taxonomy\models\TaxonomyDef;
 use nkostadinov\taxonomy\models\TaxonomyTerms;

Spacing +5 added lines, -5 removed lines

@@ -11,14 +11,14 @@ 
 
 class CategoryTerm extends TagTerm implements IHierarchicalTerm
 {
-    public $templateFile = '@nkostadinov/taxonomy/migrations/template/category.php' ;
+    public $templateFile = '@nkostadinov/taxonomy/migrations/template/category.php';
 
     public function getTerms($object_id, $name = [])
     {
         $query = (new Query())
-            ->select(TaxonomyTerms::tableName() . '.term')
+            ->select(TaxonomyTerms::tableName().'.term')
             ->from(TaxonomyTerms::tableName())
-            ->innerJoin($this->table, $this->table . '.term_id = taxonomy_terms.id',
+            ->innerJoin($this->table, $this->table.'.term_id = taxonomy_terms.id',
                 [':object_id' => $object_id])
             ->andFilterWhere(['taxonomy_terms.term' => $name]);
 
@@ -27,7 +27,7 @@ 
         }
 
         $result = [];
-        foreach($query->all() as $v) {
+        foreach ($query->all() as $v) {
             $result[] = $v['term'];
         }
 
@@ -38,7 +38,7 @@ 
     {
         $cachedParents = [];
 
-        $addTerm = function ($parent, $item) use ($object_id, &$cachedParents) {
+        $addTerm = function($parent, $item) use ($object_id, &$cachedParents) {
             $term = $this->getTaxonomyTerm($item);
             $data['term_id'] = $term->id;
             $data['object_id'] = $object_id;

components/terms/TagTerm.php

Spacing +3 added lines, -3 removed lines

@@ -13,11 +13,11 @@ 
 
 class TagTerm extends BaseTerm
 {
-    public $templateFile = '@nkostadinov/taxonomy/migrations/template/tag.php' ;
+    public $templateFile = '@nkostadinov/taxonomy/migrations/template/tag.php';
 
     public function addTerm($object_id, $params)
     {
-        foreach($params as $item) {
+        foreach ($params as $item) {
             $term = $this->getTaxonomyTerm($item);
             $data['term_id'] = $term->id;
             $data['object_id'] = $object_id;
@@ -29,7 +29,7 @@ 
                     $this->getDb()->createCommand()->insert($this->table, $data)->execute();
 
                     $term->updateCounters(['total_count' => 1]);
-                    TaxonomyDef::updateAllCounters(['total_count' => 1], [ 'id' => $this->id ]);
+                    TaxonomyDef::updateAllCounters(['total_count' => 1], ['id' => $this->id]);
 
                     $transaction->commit();
                 } catch (Exception $e) {

components/terms/PropertyTerm.php

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
 
 class PropertyTerm extends BaseTerm {
 
-    public $templateFile = '@nkostadinov/taxonomy/migrations/template/properties.php' ;
+    public $templateFile = '@nkostadinov/taxonomy/migrations/template/properties.php';
 
     public $updateOnExist = true;
 
@@ -33,14 +33,14 @@ 
             'value' => Schema::TYPE_STRING,
         ]);
         if ($migration->db->driverName === 'mysql') {
-            $migration->addForeignKey('fk_' . $this->getTable() . '_' . $this->getRefTableName(), $this->getTable(), 'object_id', $this->getRefTableName(), 'id', 'CASCADE');
-            $migration->addForeignKey('fk_' . $this->getTable() . '_' . TaxonomyTerms::tableName(), $this->getTable(), 'term_id', TaxonomyTerms::tableName(), 'id', 'CASCADE');
+            $migration->addForeignKey('fk_'.$this->getTable().'_'.$this->getRefTableName(), $this->getTable(), 'object_id', $this->getRefTableName(), 'id', 'CASCADE');
+            $migration->addForeignKey('fk_'.$this->getTable().'_'.TaxonomyTerms::tableName(), $this->getTable(), 'term_id', TaxonomyTerms::tableName(), 'id', 'CASCADE');
         }
     }
 
     public function addTerm($object_id, $params)
     {
-        foreach($params as $item => $value) {
+        foreach ($params as $item => $value) {
             $term = TaxonomyTerms::findOne(['term' => $item, 'taxonomy_id' => $this->id]);
             if (!isset($term)) {
                 $term = new TaxonomyTerms();
@@ -66,8 +66,8 @@ 
                 } catch (Exception $e) {
                     $transaction->rollBack();
                 }
-            } elseif($this->updateOnExist) {
-                $this->getDb()->createCommand()->update($this->getTable(), [ 'value' => $value ], $data)->execute();
+            } elseif ($this->updateOnExist) {
+                $this->getDb()->createCommand()->update($this->getTable(), ['value' => $value], $data)->execute();
             }
         }
     }
@@ -75,7 +75,7 @@ 
     public function removeTerm($object_id, $params = [])
     {
         $terms = $this->getTerms($object_id, isset($params['name']) ? $params['name'] : []);
-        foreach($terms as $term => $value) {
+        foreach ($terms as $term => $value) {
             $term = $this->getTaxonomyTerm($term);
             $data['term_id'] = $term->id;
             $data['object_id'] = $object_id;
@@ -85,7 +85,7 @@ 
                 $this->getDb()->createCommand()->delete($this->getTable(), $data)->execute();
 
                 $term->updateCounters(['total_count' => -1]);
-                TaxonomyDef::updateAllCounters(['total_count' => -1], [ 'id' => $this->id ]);
+                TaxonomyDef::updateAllCounters(['total_count' => -1], ['id' => $this->id]);
             }
         }
     }
@@ -93,12 +93,12 @@ 
     public function getTerms($object_id, $name = [])
     {
         $query = (new Query())
-            ->select(TaxonomyTerms::tableName() . '.term, ' . $this->getTable() . '.value')
+            ->select(TaxonomyTerms::tableName().'.term, '.$this->getTable().'.value')
             ->from(TaxonomyTerms::tableName())
-            ->innerJoin($this->getTable(), $this->getTable() . '.term_id = taxonomy_terms.id and ' . $this->getTable() . '.object_id=:object_id',
+            ->innerJoin($this->getTable(), $this->getTable().'.term_id = taxonomy_terms.id and '.$this->getTable().'.object_id=:object_id',
                 [':object_id' => $object_id])
-            ->andFilterWhere([TaxonomyTerms::tableName() . '.term' => $name]);
-        foreach($query->all() as $v)
+            ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $name]);
+        foreach ($query->all() as $v)
             $result[$v['term']] = $v['value'];
         return isset($result) ? $result : [];
     }

components/terms/BaseTerm.php

Spacing +12 added lines, -12 removed lines

@@ -35,11 +35,11 @@ 
 
     public function removeTerm($object_id, $params = [])
     {
-        if(empty($params)) {
+        if (empty($params)) {
             $params = $this->getTerms($object_id);
         }
 
-        foreach($params as $item) {
+        foreach ($params as $item) {
             $term = $this->getTaxonomyTerm($item);
             $data['term_id'] = $term->id;
             $data['object_id'] = $object_id;
@@ -49,7 +49,7 @@ 
                 $this->getDb()->createCommand()->delete($this->table, $data)->execute();
 
                 $term->updateCounters(['total_count' => -1]);
-                Taxonomydef::updateAllCounters(['total_count' => -1], [ 'id' => $this->id ]);
+                Taxonomydef::updateAllCounters(['total_count' => -1], ['id' => $this->id]);
             }
         }
     }
@@ -57,14 +57,14 @@ 
     public function getTerms($object_id, $name = [])
     {
         $query = (new Query())
-            ->select(TaxonomyTerms::tableName() . '.term')
+            ->select(TaxonomyTerms::tableName().'.term')
             ->from(TaxonomyTerms::tableName())
-            ->innerJoin($this->table, $this->table . '.term_id = taxonomy_terms.id and ' . $this->table . '.object_id=:object_id',
+            ->innerJoin($this->table, $this->table.'.term_id = taxonomy_terms.id and '.$this->table.'.object_id=:object_id',
                 [':object_id' => $object_id])
             ->andFilterWhere(['taxonomy_terms.term' => $name]);
         
         $result = [];
-        foreach($query->all() as $v)
+        foreach ($query->all() as $v)
             $result[] = $v['term'];
         return $result;
     }
@@ -110,7 +110,7 @@ 
     }
 
     public function canInstall() {
-        if(!$this->getTable())
+        if (!$this->getTable())
             return 'Missing "table" property';
         return true;
     }
@@ -118,7 +118,7 @@ 
     public function getTaxonomyTerm($name, $create = true)
     {
         $term = TaxonomyTerms::findOne(['term'=>$name, 'taxonomy_id' => $this->id]);
-        if($create and !isset($term))
+        if ($create and !isset($term))
         {
             $term = new TaxonomyTerms();
             $term->taxonomy_id = $this->id;
@@ -131,7 +131,7 @@ 
 
     public function getRefTableName()
     {
-        if(strpos($this->refTable, '\\') === FALSE) //not an AR class but a table name
+        if (strpos($this->refTable, '\\') === FALSE) //not an AR class but a table name
             return $this->refTable;
         else
             return call_user_func([$this->refTable, 'tableName']);
@@ -152,7 +152,7 @@ 
         if (!preg_match('/^\w+$/', $this->name)) {
             throw new Exception('The migration name should contain letters, digits and/or underscore characters only.');
         }
-        $name = 'm' . gmdate('ymd_His') . '_' . $this->name;
+        $name = 'm'.gmdate('ymd_His').'_'.$this->name;
         return $name;
     }
 
@@ -160,7 +160,7 @@ 
     {
 
         $name = $this->getMigrationFile();
-        $file = Yii::getAlias($this->migrationPath . DIRECTORY_SEPARATOR . $name . '.php');
+        $file = Yii::getAlias($this->migrationPath.DIRECTORY_SEPARATOR.$name.'.php');
 
         //$data = get_object_vars($this);
         $data = [];
@@ -171,7 +171,7 @@ 
         $data['migration'] = $name;
 
         $this->migration = $name;
-        $content = Yii::$app->getView()->renderFile(Yii::getAlias($this->templateFile), [ 'data' => $data ]);
+        $content = Yii::$app->getView()->renderFile(Yii::getAlias($this->templateFile), ['data' => $data]);
         file_put_contents($file, $content);
         return $name;
     }

Braces +11 added lines, -7 removed lines

@@ -64,8 +64,9 @@ 
             ->andFilterWhere(['taxonomy_terms.term' => $name]);
         
         $result = [];
-        foreach($query->all() as $v)
-            $result[] = $v['term'];
+        foreach($query->all() as $v) {
+                    $result[] = $v['term'];
+        }
         return $result;
     }
 
@@ -110,8 +111,9 @@ 
     }
 
     public function canInstall() {
-        if(!$this->getTable())
-            return 'Missing "table" property';
+        if(!$this->getTable()) {
+                    return 'Missing "table" property';
+        }
         return true;
     }
 
@@ -131,10 +133,12 @@ 
 
     public function getRefTableName()
     {
-        if(strpos($this->refTable, '\\') === FALSE) //not an AR class but a table name
+        if(strpos($this->refTable, '\\') === FALSE) {
+            //not an AR class but a table name
             return $this->refTable;
-        else
-            return call_user_func([$this->refTable, 'tableName']);
+        } else {
+                    return call_user_func([$this->refTable, 'tableName']);
+        }
     }
 
     public function getTable()