nkostadinov / yii2-taxonomy

components/terms/PropertyTerm.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use yii\db\Migration;
 use yii\db\Query;
 use yii\db\Schema;
-use yii\helpers\ArrayHelper;
 
 class PropertyTerm extends BaseTerm {
 

Braces +3 added lines, -2 removed lines

@@ -96,8 +96,9 @@
             ->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)
-            $result[$v['term']] = $v['value'];
+        foreach($query->all() as $v) {
+                    $result[$v['term']] = $v['value'];
+        }
         return isset($result) ? $result : [];
     }
 }

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 : [];
     }

controllers/DefController.php

Doc Comments +6 added lines, -3 removed lines

@@ -19,6 +19,9 @@ 
 
 class Migrator extends \yii\console\controllers\MigrateController
 {
+    /**
+     * @param string $id
+     */
     public function __construct($id, $module, $config = [])
     {
         parent::__construct($id, $module, $config); // TODO: Change the autogenerated stub
@@ -64,7 +67,7 @@ 
 
     /**
      * Lists all TaxonomyDef models.
-     * @return mixed
+     * @return string
      * @throws InvalidConfigException
      */
     public function actionIndex()
@@ -84,7 +87,7 @@ 
     /**
      * Displays a single TaxonomyDef model.
      * @param integer $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -157,7 +160,7 @@ 
      * Deletes an existing TaxonomyDef model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use nkostadinov\taxonomy\models\TaxonomyDefSearch;
 use yii\base\InvalidConfigException;
 use yii\data\ActiveDataProvider;
-use yii\helpers\Url;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
     {
         ob_start();
         //$this->migrationPath = Yii::getAlias($migrationPath);
-        if($this->beforeAction('up'))
+        if ($this->beforeAction('up'))
             $this->migrateUp($class);
         $result = ob_get_contents();
         return $result;
@@ -38,7 +38,7 @@ 
     {
         ob_start();
         //$this->migrationPath = Yii::getAlias($migrationPath);
-        if($this->beforeAction('down'))
+        if ($this->beforeAction('down'))
             $this->migrateDown($class);
         $result = ob_get_contents();
         return $result;
@@ -69,7 +69,7 @@ 
      */
     public function actionIndex()
     {
-        if(!$this->getComponent()->isInstalled())
+        if (!$this->getComponent()->isInstalled())
             throw new InvalidConfigException("Please run the migration first!");
 
         $searchModel = new TaxonomyDefSearch();
@@ -192,7 +192,7 @@ 
 
     public function getComponent()
     {
-        if(\Yii::$app->has($this->module->component))
+        if (\Yii::$app->has($this->module->component))
             return \Yii::$app->{$this->module->component};
         else
             throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
@@ -200,12 +200,12 @@ 
 
     public function actionInstall()
     {
-        if(!$this->getComponent()->isInstalled() and \Yii::$app->request->isPost) {
+        if (!$this->getComponent()->isInstalled() and \Yii::$app->request->isPost) {
             //start installation
-            if($this->getComponent()) {
+            if ($this->getComponent()) {
                 $this->getComponent()->install();
 
-                $this->redirect(['/'.$this->module->id . '/' . $this->id . '/index']);
+                $this->redirect(['/'.$this->module->id.'/'.$this->id.'/index']);
             } else
                 throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
         }

Braces +17 added lines, -12 removed lines

@@ -28,8 +28,9 @@ 
     {
         ob_start();
         //$this->migrationPath = Yii::getAlias($migrationPath);
-        if($this->beforeAction('up'))
-            $this->migrateUp($class);
+        if($this->beforeAction('up')) {
+                    $this->migrateUp($class);
+        }
         $result = ob_get_contents();
         return $result;
     }
@@ -38,8 +39,9 @@ 
     {
         ob_start();
         //$this->migrationPath = Yii::getAlias($migrationPath);
-        if($this->beforeAction('down'))
-            $this->migrateDown($class);
+        if($this->beforeAction('down')) {
+                    $this->migrateDown($class);
+        }
         $result = ob_get_contents();
         return $result;
     }
@@ -69,8 +71,9 @@ 
      */
     public function actionIndex()
     {
-        if(!$this->getComponent()->isInstalled())
-            throw new InvalidConfigException("Please run the migration first!");
+        if(!$this->getComponent()->isInstalled()) {
+                    throw new InvalidConfigException("Please run the migration first!");
+        }
 
         $searchModel = new TaxonomyDefSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -192,10 +195,11 @@ 
 
     public function getComponent()
     {
-        if(\Yii::$app->has($this->module->component))
-            return \Yii::$app->{$this->module->component};
-        else
-            throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
+        if(\Yii::$app->has($this->module->component)) {
+                    return \Yii::$app->{$this->module->component};
+        } else {
+                    throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
+        }
     }
 
     public function actionInstall()
@@ -206,8 +210,9 @@ 
                 $this->getComponent()->install();
 
                 $this->redirect(['/'.$this->module->id . '/' . $this->id . '/index']);
-            } else
-                throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
+            } else {
+                            throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
+            }
         }
         return $this->render('install');
     }

models/TaxonomyDefSearch.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace nkostadinov\taxonomy\models;
 
-use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use nkostadinov\taxonomy\models\TaxonomyDef;

behaviors/TagQuery.php

Spacing +2 added lines, -2 removed lines

@@ -18,9 +18,9 @@
     {
         $this->joinTables();
 
-        if(!empty($tags))
+        if (!empty($tags))
             $this->getQuery()
-                ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $tags ]);
+                ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $tags]);
 
         return $this->getQuery();
     }

Braces +3 added lines, -2 removed lines

@@ -18,9 +18,10 @@
     {
         $this->joinTables();
 
-        if(!empty($tags))
-            $this->getQuery()
+        if(!empty($tags)) {
+                    $this->getQuery()
                 ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $tags ]);
+        }
 
         return $this->getQuery();
     }

behaviors/BaseTermBehavior.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 /**
-  * User: Phreak
+ * User: Phreak
  * Date: 13.02.2015
  * Time: 09:31 ч.
  */

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
 
         /** @var ActiveRecord $this->owner */
         $this->getQuery()
-            ->leftJoin($this->taxonomy->table, $this->taxonomy->table . '.object_id = ' . $model::tableName() . '.id')
-            ->leftJoin(TaxonomyTerms::tableName(), TaxonomyTerms::tableName() . '.id = ' . $this->taxonomy->table . '.term_id');
+            ->leftJoin($this->taxonomy->table, $this->taxonomy->table.'.object_id = '.$model::tableName().'.id')
+            ->leftJoin(TaxonomyTerms::tableName(), TaxonomyTerms::tableName().'.id = '.$this->taxonomy->table.'.term_id');
     }
 
     /**

views/def/index.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 $message = Yii::$app->session->getFlash('info');
 ?>
 <div class="taxonomy-def-index">
-    <?php if(isset($message))
+    <?php if (isset($message))
         echo Alert::widget([
             'options' => [
                 'class' => 'alert-info',

Braces +2 added lines, -1 removed lines

@@ -13,13 +13,14 @@
 $message = Yii::$app->session->getFlash('info');
 ?>
 <div class="taxonomy-def-index">
-    <?php if(isset($message))
+    <?php if(isset($message)) {
         echo Alert::widget([
             'options' => [
                 'class' => 'alert-info',
             ],
             'body' => nl2br($message),
         ]);
+}
     ?>
 
     <h1><?= Html::encode($this->title) ?></h1>

views/def/update.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /* @var $this yii\web\View */
 /* @var $model nkostadinov\taxonomy\models\TaxonomyDef */
 
-$this->title = 'Update Taxonomy Def: ' . ' ' . $model->name;
+$this->title = 'Update Taxonomy Def: '.' '.$model->name;
 $this->params['breadcrumbs'][] = ['label' => 'Taxonomy Defs', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = 'Update';

Taxonomy.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      */
     public function getTerm($termName, $reload = false)
     {
-        if(!isset($this->_taxonomy[$termName]) || $reload) {
+        if (!isset($this->_taxonomy[$termName]) || $reload) {
             $tax = TaxonomyDef::findOne(['name' => $termName]);
             \Yii::getLogger()->log("Initialising term $termName", Logger::LEVEL_INFO, 'nkostadinov.taxonomy.terms');
             $this->_taxonomy[$termName] = \Yii::createObject($tax->attributes);

behaviors/PropertyQueryBehavior.php

Spacing +4 added lines, -4 removed lines

@@ -17,13 +17,13 @@
         $this->joinTables();
 
 
-        if(!empty($name))
+        if (!empty($name))
             $this->getQuery()
-                ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $name ]);
+                ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $name]);
 
-        if(!empty($value))
+        if (!empty($value))
             $this->getQuery()
-                ->andFilterWhere([ $this->taxonomy->table . '.value' => $value ]);
+                ->andFilterWhere([$this->taxonomy->table.'.value' => $value]);
 
         return $this->getQuery();
     }

Braces +6 added lines, -4 removed lines

@@ -17,13 +17,15 @@
         $this->joinTables();
 
 
-        if(!empty($name))
-            $this->getQuery()
+        if(!empty($name)) {
+                    $this->getQuery()
                 ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $name ]);
+        }
 
-        if(!empty($value))
-            $this->getQuery()
+        if(!empty($value)) {
+                    $this->getQuery()
                 ->andFilterWhere([ $this->taxonomy->table . '.value' => $value ]);
+        }
 
         return $this->getQuery();
     }