@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function addTerm($object_id, $params) |
| 19 | 19 | { |
| 20 | - foreach($params as $item) { |
|
| 20 | + foreach ($params as $item) { |
|
| 21 | 21 | $term = $this->getTaxonomyTerm($item); |
| 22 | 22 | $data['term_id'] = $term->id; |
| 23 | 23 | $data['object_id'] = $object_id; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $this->getDb()->createCommand()->insert($this->table, $data)->execute(); |
| 30 | 30 | |
| 31 | 31 | $term->updateCounters(['total_count' => 1]); |
| 32 | - TaxonomyDef::updateAllCounters(['total_count' => 1], [ 'id' => $this->id ]); |
|
| 32 | + TaxonomyDef::updateAllCounters(['total_count' => 1], ['id' => $this->id]); |
|
| 33 | 33 | |
| 34 | 34 | $transaction->commit(); |
| 35 | 35 | } catch (Exception $e) { |
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | 175 | * @param integer $termId |
| 176 | - * @return array An array of TaxonomyTerms |
|
| 176 | + * @return \yii\db\BaseActiveRecord[] An array of TaxonomyTerms |
|
| 177 | 177 | */ |
| 178 | 178 | public function getChildren($termId) |
| 179 | 179 | { |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | { |
| 56 | 56 | $result = []; |
| 57 | 57 | |
| 58 | - foreach(TaxonomyTerms::findAll((array) $params) as $term) { |
|
| 58 | + foreach (TaxonomyTerms::findAll((array) $params) as $term) { |
|
| 59 | 59 | $data['term_id'] = $term->id; |
| 60 | 60 | $data['object_id'] = $object_id; |
| 61 | 61 | |
@@ -2,11 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace nkostadinov\taxonomy\behaviors; |
| 4 | 4 | |
| 5 | -use Yii; |
|
| 5 | +use Yii; |
|
| 6 | 6 | use yii\base\Behavior; |
| 7 | -use yii\base\Event; |
|
| 8 | -use yii\db\ActiveRecord; |
|
| 9 | -use yii\db\AfterSaveEvent; |
|
| 10 | 7 | |
| 11 | 8 | /** |
| 12 | 9 | * @author Nikolay Traykov |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace nkostadinov\taxonomy\models; |
| 4 | 4 | |
| 5 | -use Yii; |
|
| 6 | - |
|
| 7 | 5 | /** |
| 8 | 6 | * This is the model class for table "taxonomy". |
| 9 | 7 | * |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace nkostadinov\taxonomy\models; |
| 4 | 4 | |
| 5 | -use Yii; |
|
| 6 | - |
|
| 7 | 5 | /** |
| 8 | 6 | * This is the model class for table "taxonomy_terms". |
| 9 | 7 | * |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | class PropertyTerm extends BaseTerm |
| 19 | 19 | { |
| 20 | - public $templateFile = '@nkostadinov/taxonomy/migrations/template/properties.php' ; |
|
| 20 | + public $templateFile = '@nkostadinov/taxonomy/migrations/template/properties.php'; |
|
| 21 | 21 | |
| 22 | 22 | public $updateOnExist = true; |
| 23 | 23 | |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | 'value' => Schema::TYPE_STRING, |
| 34 | 34 | ]); |
| 35 | 35 | if ($migration->db->driverName === 'mysql') { |
| 36 | - $migration->addForeignKey('fk_' . $this->getTable() . '_' . $this->getRefTableName(), $this->getTable(), 'object_id', $this->getRefTableName(), 'id', 'CASCADE'); |
|
| 37 | - $migration->addForeignKey('fk_' . $this->getTable() . '_' . TaxonomyTerms::tableName(), $this->getTable(), 'term_id', TaxonomyTerms::tableName(), 'id', 'CASCADE'); |
|
| 36 | + $migration->addForeignKey('fk_'.$this->getTable().'_'.$this->getRefTableName(), $this->getTable(), 'object_id', $this->getRefTableName(), 'id', 'CASCADE'); |
|
| 37 | + $migration->addForeignKey('fk_'.$this->getTable().'_'.TaxonomyTerms::tableName(), $this->getTable(), 'term_id', TaxonomyTerms::tableName(), 'id', 'CASCADE'); |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function addTerm($object_id, $params) |
| 42 | 42 | { |
| 43 | - foreach($params as $item => $value) { |
|
| 43 | + foreach ($params as $item => $value) { |
|
| 44 | 44 | $term = TaxonomyTerms::findOne(['term' => $item, 'taxonomy_id' => $this->id]); |
| 45 | 45 | if (!isset($term)) { |
| 46 | 46 | $term = new TaxonomyTerms(); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } catch (Exception $e) { |
| 67 | 67 | $transaction->rollBack(); |
| 68 | 68 | } |
| 69 | - } elseif($this->updateOnExist) { |
|
| 69 | + } elseif ($this->updateOnExist) { |
|
| 70 | 70 | $this->getDb()->createCommand()->update($this->getTable(), ['value' => $value], $data)->execute(); |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | public function removeTerm($object_id, $params = []) |
| 76 | 76 | { |
| 77 | 77 | $terms = $this->getTerms($object_id, $params); |
| 78 | - foreach($terms as $term => $value) { |
|
| 78 | + foreach ($terms as $term => $value) { |
|
| 79 | 79 | $term = $this->getTaxonomyTerm($term); |
| 80 | 80 | $data['term_id'] = $term->id; |
| 81 | 81 | $data['object_id'] = $object_id; |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $this->getDb()->createCommand()->delete($this->getTable(), $data)->execute(); |
| 86 | 86 | |
| 87 | 87 | $term->updateCounters(['total_count' => -1]); |
| 88 | - TaxonomyDef::updateAllCounters(['total_count' => -1], [ 'id' => $this->id ]); |
|
| 88 | + TaxonomyDef::updateAllCounters(['total_count' => -1], ['id' => $this->id]); |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -93,11 +93,11 @@ discard block |
||
| 93 | 93 | public function getTerms($object_id = null, $name = []) |
| 94 | 94 | { |
| 95 | 95 | $query = (new Query()) |
| 96 | - ->select(TaxonomyTerms::tableName() . '.term, ' . $this->getTable() . '.value') |
|
| 96 | + ->select(TaxonomyTerms::tableName().'.term, '.$this->getTable().'.value') |
|
| 97 | 97 | ->from(TaxonomyTerms::tableName()) |
| 98 | - ->innerJoin($this->getTable(), $this->getTable() . '.term_id = taxonomy_terms.id and ' . $this->getTable() . '.object_id=:object_id', |
|
| 98 | + ->innerJoin($this->getTable(), $this->getTable().'.term_id = taxonomy_terms.id and '.$this->getTable().'.object_id=:object_id', |
|
| 99 | 99 | [':object_id' => $object_id]) |
| 100 | - ->andFilterWhere([TaxonomyTerms::tableName() . '.term' => $name]); |
|
| 100 | + ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $name]); |
|
| 101 | 101 | |
| 102 | 102 | return ArrayHelper::map($query->all(), 'term', 'value'); |
| 103 | 103 | } |