| @@ -19,6 +19,9 @@ discard block | ||
| 19 | 19 | |
| 20 | 20 | class Migrator extends \yii\console\controllers\MigrateController | 
| 21 | 21 |  { | 
| 22 | + /** | |
| 23 | + * @param string $id | |
| 24 | + */ | |
| 22 | 25 | public function __construct($id, $module, $config = []) | 
| 23 | 26 |      { | 
| 24 | 27 | parent::__construct($id, $module, $config); // TODO: Change the autogenerated stub | 
| @@ -64,7 +67,7 @@ discard block | ||
| 64 | 67 | |
| 65 | 68 | /** | 
| 66 | 69 | * Lists all TaxonomyDef models. | 
| 67 | - * @return mixed | |
| 70 | + * @return string | |
| 68 | 71 | * @throws InvalidConfigException | 
| 69 | 72 | */ | 
| 70 | 73 | public function actionIndex() | 
| @@ -84,7 +87,7 @@ discard block | ||
| 84 | 87 | /** | 
| 85 | 88 | * Displays a single TaxonomyDef model. | 
| 86 | 89 | * @param integer $id | 
| 87 | - * @return mixed | |
| 90 | + * @return string | |
| 88 | 91 | */ | 
| 89 | 92 | public function actionView($id) | 
| 90 | 93 |      { | 
| @@ -157,7 +160,7 @@ discard block | ||
| 157 | 160 | * Deletes an existing TaxonomyDef model. | 
| 158 | 161 | * If deletion is successful, the browser will be redirected to the 'index' page. | 
| 159 | 162 | * @param integer $id | 
| 160 | - * @return mixed | |
| 163 | + * @return \yii\web\Response | |
| 161 | 164 | */ | 
| 162 | 165 | public function actionDelete($id) | 
| 163 | 166 |      { | 
| @@ -28,8 +28,9 @@ discard block | ||
| 28 | 28 |      { | 
| 29 | 29 | ob_start(); | 
| 30 | 30 | //$this->migrationPath = Yii::getAlias($migrationPath); | 
| 31 | -        if($this->beforeAction('up')) | |
| 32 | - $this->migrateUp($class); | |
| 31 | +        if($this->beforeAction('up')) { | |
| 32 | + $this->migrateUp($class); | |
| 33 | + } | |
| 33 | 34 | $result = ob_get_contents(); | 
| 34 | 35 | return $result; | 
| 35 | 36 | } | 
| @@ -38,8 +39,9 @@ discard block | ||
| 38 | 39 |      { | 
| 39 | 40 | ob_start(); | 
| 40 | 41 | //$this->migrationPath = Yii::getAlias($migrationPath); | 
| 41 | -        if($this->beforeAction('down')) | |
| 42 | - $this->migrateDown($class); | |
| 42 | +        if($this->beforeAction('down')) { | |
| 43 | + $this->migrateDown($class); | |
| 44 | + } | |
| 43 | 45 | $result = ob_get_contents(); | 
| 44 | 46 | return $result; | 
| 45 | 47 | } | 
| @@ -69,8 +71,9 @@ discard block | ||
| 69 | 71 | */ | 
| 70 | 72 | public function actionIndex() | 
| 71 | 73 |      { | 
| 72 | - if(!$this->getComponent()->isInstalled()) | |
| 73 | -            throw new InvalidConfigException("Please run the migration first!"); | |
| 74 | +        if(!$this->getComponent()->isInstalled()) { | |
| 75 | +                    throw new InvalidConfigException("Please run the migration first!"); | |
| 76 | + } | |
| 74 | 77 | |
| 75 | 78 | $searchModel = new TaxonomyDefSearch(); | 
| 76 | 79 | $dataProvider = $searchModel->search(Yii::$app->request->queryParams); | 
| @@ -192,10 +195,11 @@ discard block | ||
| 192 | 195 | |
| 193 | 196 | public function getComponent() | 
| 194 | 197 |      { | 
| 195 | - if(\Yii::$app->has($this->module->component)) | |
| 196 | -            return \Yii::$app->{$this->module->component}; | |
| 197 | - else | |
| 198 | -            throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})"); | |
| 198 | +        if(\Yii::$app->has($this->module->component)) { | |
| 199 | +                    return \Yii::$app->{$this->module->component}; | |
| 200 | +        } else { | |
| 201 | +                    throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})"); | |
| 202 | + } | |
| 199 | 203 | } | 
| 200 | 204 | |
| 201 | 205 | public function actionInstall() | 
| @@ -206,8 +210,9 @@ discard block | ||
| 206 | 210 | $this->getComponent()->install(); | 
| 207 | 211 | |
| 208 | 212 | $this->redirect(['/'.$this->module->id . '/' . $this->id . '/index']); | 
| 209 | - } else | |
| 210 | -                throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})"); | |
| 213 | +            } else { | |
| 214 | +                            throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})"); | |
| 215 | + } | |
| 211 | 216 | } | 
| 212 | 217 |          return $this->render('install'); | 
| 213 | 218 | } | 
| @@ -18,9 +18,10 @@ | ||
| 18 | 18 |      { | 
| 19 | 19 | $this->joinTables(); | 
| 20 | 20 | |
| 21 | - if(!empty($tags)) | |
| 22 | - $this->getQuery() | |
| 21 | +        if(!empty($tags)) { | |
| 22 | + $this->getQuery() | |
| 23 | 23 | ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $tags ]); | 
| 24 | + } | |
| 24 | 25 | |
| 25 | 26 | return $this->getQuery(); | 
| 26 | 27 | } | 
| @@ -42,8 +42,9 @@ discard block | ||
| 42 | 42 | |
| 43 | 43 | public function removeTerm($object_id, $params = []) | 
| 44 | 44 |      { | 
| 45 | - if(empty($params)) | |
| 46 | - $params = $this->getTerms($object_id); | |
| 45 | +        if(empty($params)) { | |
| 46 | + $params = $this->getTerms($object_id); | |
| 47 | + } | |
| 47 | 48 |          foreach($params as $item) { | 
| 48 | 49 | $term = $this->getTaxonomyTerm($item); | 
| 49 | 50 | $data['term_id'] = $term->id; | 
| @@ -68,8 +69,9 @@ discard block | ||
| 68 | 69 | [':object_id' => $object_id]) | 
| 69 | 70 | ->andFilterWhere(['taxonomy_terms.term' => $name]); | 
| 70 | 71 | $result = []; | 
| 71 | - foreach($query->all() as $v) | |
| 72 | - $result[] = $v['term']; | |
| 72 | +        foreach($query->all() as $v) { | |
| 73 | + $result[] = $v['term']; | |
| 74 | + } | |
| 73 | 75 | return $result; | 
| 74 | 76 | } | 
| 75 | 77 | } | 
| @@ -74,8 +74,9 @@ discard block | ||
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | 76 |      public function canInstall() { | 
| 77 | - if(!$this->getTable()) | |
| 78 | - return 'Missing "table" property'; | |
| 77 | +        if(!$this->getTable()) { | |
| 78 | + return 'Missing "table" property'; | |
| 79 | + } | |
| 79 | 80 | return true; | 
| 80 | 81 | } | 
| 81 | 82 | |
| @@ -95,10 +96,12 @@ discard block | ||
| 95 | 96 | |
| 96 | 97 | public function getRefTableName() | 
| 97 | 98 |      { | 
| 98 | - if(strpos($this->refTable, '\\') === FALSE) //not an AR class but a table name | |
| 99 | +        if(strpos($this->refTable, '\\') === FALSE) { | |
| 100 | + //not an AR class but a table name | |
| 99 | 101 | return $this->refTable; | 
| 100 | - else | |
| 101 | - return call_user_func([$this->refTable, 'tableName']); | |
| 102 | +        } else { | |
| 103 | + return call_user_func([$this->refTable, 'tableName']); | |
| 104 | + } | |
| 102 | 105 | } | 
| 103 | 106 | |
| 104 | 107 | public function getTable() | 
| @@ -96,8 +96,9 @@ | ||
| 96 | 96 | ->innerJoin($this->getTable(), $this->getTable() . '.term_id = taxonomy_terms.id and ' . $this->getTable() . '.object_id=:object_id', | 
| 97 | 97 | [':object_id' => $object_id]) | 
| 98 | 98 | ->andFilterWhere([TaxonomyTerms::tableName() . '.term' => $name]); | 
| 99 | - foreach($query->all() as $v) | |
| 100 | - $result[$v['term']] = $v['value']; | |
| 99 | +        foreach($query->all() as $v) { | |
| 100 | + $result[$v['term']] = $v['value']; | |
| 101 | + } | |
| 101 | 102 | return isset($result) ? $result : []; | 
| 102 | 103 | } | 
| 103 | 104 | } | 
| @@ -13,13 +13,14 @@ | ||
| 13 | 13 |  $message = Yii::$app->session->getFlash('info'); | 
| 14 | 14 | ?> | 
| 15 | 15 | <div class="taxonomy-def-index"> | 
| 16 | - <?php if(isset($message)) | |
| 16 | +    <?php if(isset($message)) { | |
| 17 | 17 | echo Alert::widget([ | 
| 18 | 18 | 'options' => [ | 
| 19 | 19 | 'class' => 'alert-info', | 
| 20 | 20 | ], | 
| 21 | 21 | 'body' => nl2br($message), | 
| 22 | 22 | ]); | 
| 23 | +} | |
| 23 | 24 | ?> | 
| 24 | 25 | |
| 25 | 26 | <h1><?= Html::encode($this->title) ?></h1> |