Completed
Push — master ( 3cba80...c479cb )
by Nikola
12s
created
behaviors/TagQuery.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@
 block discarded – undo
18 18
     {
19 19
         $this->joinTables();
20 20
 
21
-        if(!empty($tags))
21
+        if (!empty($tags))
22 22
             $this->getQuery()
23
-                ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $tags ]);
23
+                ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $tags]);
24 24
 
25 25
         return $this->getQuery();
26 26
     }
Please login to merge, or discard this patch.
behaviors/BaseTermBehavior.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
 
23 23
         /** @var ActiveRecord $this->owner */
24 24
         $this->getQuery()
25
-            ->leftJoin($this->taxonomy->table, $this->taxonomy->table . '.object_id = ' . $model::tableName() . '.id')
26
-            ->leftJoin(TaxonomyTerms::tableName(), TaxonomyTerms::tableName() . '.id = ' . $this->taxonomy->table . '.term_id');
25
+            ->leftJoin($this->taxonomy->table, $this->taxonomy->table.'.object_id = '.$model::tableName().'.id')
26
+            ->leftJoin(TaxonomyTerms::tableName(), TaxonomyTerms::tableName().'.id = '.$this->taxonomy->table.'.term_id');
27 27
     }
28 28
 
29 29
     /**
Please login to merge, or discard this patch.
views/def/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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',
Please login to merge, or discard this patch.
views/def/update.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 /* @var $this yii\web\View */
6 6
 /* @var $model nkostadinov\taxonomy\models\TaxonomyDef */
7 7
 
8
-$this->title = 'Update Taxonomy Def: ' . ' ' . $model->name;
8
+$this->title = 'Update Taxonomy Def: '.' '.$model->name;
9 9
 $this->params['breadcrumbs'][] = ['label' => 'Taxonomy Defs', 'url' => ['index']];
10 10
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
11 11
 $this->params['breadcrumbs'][] = 'Update';
Please login to merge, or discard this patch.
controllers/DefController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     {
29 29
         ob_start();
30 30
         //$this->migrationPath = Yii::getAlias($migrationPath);
31
-        if($this->beforeAction('up'))
31
+        if ($this->beforeAction('up'))
32 32
             $this->migrateUp($class);
33 33
         $result = ob_get_contents();
34 34
         return $result;
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     {
39 39
         ob_start();
40 40
         //$this->migrationPath = Yii::getAlias($migrationPath);
41
-        if($this->beforeAction('down'))
41
+        if ($this->beforeAction('down'))
42 42
             $this->migrateDown($class);
43 43
         $result = ob_get_contents();
44 44
         return $result;
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
      */
70 70
     public function actionIndex()
71 71
     {
72
-        if(!$this->getComponent()->isInstalled())
72
+        if (!$this->getComponent()->isInstalled())
73 73
             throw new InvalidConfigException("Please run the migration first!");
74 74
 
75 75
         $searchModel = new TaxonomyDefSearch();
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
     public function getComponent()
194 194
     {
195
-        if(\Yii::$app->has($this->module->component))
195
+        if (\Yii::$app->has($this->module->component))
196 196
             return \Yii::$app->{$this->module->component};
197 197
         else
198 198
             throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
@@ -200,12 +200,12 @@  discard block
 block discarded – undo
200 200
 
201 201
     public function actionInstall()
202 202
     {
203
-        if(!$this->getComponent()->isInstalled() and \Yii::$app->request->isPost) {
203
+        if (!$this->getComponent()->isInstalled() and \Yii::$app->request->isPost) {
204 204
             //start installation
205
-            if($this->getComponent()) {
205
+            if ($this->getComponent()) {
206 206
                 $this->getComponent()->install();
207 207
 
208
-                $this->redirect(['/'.$this->module->id . '/' . $this->id . '/index']);
208
+                $this->redirect(['/'.$this->module->id.'/'.$this->id.'/index']);
209 209
             } else
210 210
                 throw new InvalidConfigException("Cannot find taxonomy component({$this->module->component})");
211 211
         }
Please login to merge, or discard this patch.
Taxonomy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
      */
63 63
     public function getTerm($termName, $reload = false)
64 64
     {
65
-        if(!isset($this->_taxonomy[$termName]) || $reload) {
65
+        if (!isset($this->_taxonomy[$termName]) || $reload) {
66 66
             $tax = TaxonomyDef::findOne(['name' => $termName]);
67 67
             \Yii::getLogger()->log("Initialising term $termName", Logger::LEVEL_INFO, 'nkostadinov.taxonomy.terms');
68 68
             $this->_taxonomy[$termName] = \Yii::createObject($tax->attributes);
Please login to merge, or discard this patch.
behaviors/PropertyQueryBehavior.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,13 +17,13 @@
 block discarded – undo
17 17
         $this->joinTables();
18 18
 
19 19
 
20
-        if(!empty($name))
20
+        if (!empty($name))
21 21
             $this->getQuery()
22
-                ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $name ]);
22
+                ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $name]);
23 23
 
24
-        if(!empty($value))
24
+        if (!empty($value))
25 25
             $this->getQuery()
26
-                ->andFilterWhere([ $this->taxonomy->table . '.value' => $value ]);
26
+                ->andFilterWhere([$this->taxonomy->table.'.value' => $value]);
27 27
 
28 28
         return $this->getQuery();
29 29
     }
Please login to merge, or discard this patch.
components/terms/PropertyTerm.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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,8 +66,8 @@  discard block
 block discarded – undo
66 66
                 } catch (Exception $e) {
67 67
                     $transaction->rollBack();
68 68
                 }
69
-            } elseif($this->updateOnExist) {
70
-                $this->getDb()->createCommand()->update($this->getTable(), [ 'value' => $value ], $data)->execute();
69
+            } elseif ($this->updateOnExist) {
70
+                $this->getDb()->createCommand()->update($this->getTable(), ['value' => $value], $data)->execute();
71 71
             }
72 72
         }
73 73
     }
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     public function removeTerm($object_id, $params = [])
76 76
     {
77 77
         $terms = $this->getTerms($object_id, isset($params['name']) ? $params['name'] : []);
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
 block discarded – undo
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,12 +93,12 @@  discard block
 block discarded – undo
93 93
     public function getTerms($object_id, $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]);
101
-        foreach($query->all() as $v)
100
+            ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $name]);
101
+        foreach ($query->all() as $v)
102 102
             $result[$v['term']] = $v['value'];
103 103
         return isset($result) ? $result : [];
104 104
     }
Please login to merge, or discard this patch.
components/terms/BaseTerm.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 
36 36
     public function removeTerm($object_id, $params = [])
37 37
     {
38
-        if(empty($params)) {
38
+        if (empty($params)) {
39 39
             $params = $this->getTerms($object_id);
40 40
         }
41 41
 
42
-        foreach($params as $item) {
42
+        foreach ($params as $item) {
43 43
             $term = $this->getTaxonomyTerm($item);
44 44
             $data['term_id'] = $term->id;
45 45
             $data['object_id'] = $object_id;
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                 $this->getDb()->createCommand()->delete($this->table, $data)->execute();
50 50
 
51 51
                 $term->updateCounters(['total_count' => -1]);
52
-                Taxonomydef::updateAllCounters(['total_count' => -1], [ 'id' => $this->id ]);
52
+                Taxonomydef::updateAllCounters(['total_count' => -1], ['id' => $this->id]);
53 53
             }
54 54
         }
55 55
     }
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
57 57
     public function getTerms($object_id, $name = [])
58 58
     {
59 59
         $query = (new Query())
60
-            ->select(TaxonomyTerms::tableName() . '.term')
60
+            ->select(TaxonomyTerms::tableName().'.term')
61 61
             ->from(TaxonomyTerms::tableName())
62
-            ->innerJoin($this->table, $this->table . '.term_id = taxonomy_terms.id and ' . $this->table . '.object_id=:object_id',
62
+            ->innerJoin($this->table, $this->table.'.term_id = taxonomy_terms.id and '.$this->table.'.object_id=:object_id',
63 63
                 [':object_id' => $object_id])
64 64
             ->andFilterWhere(['taxonomy_terms.term' => $name]);
65 65
         
66 66
         $result = [];
67
-        foreach($query->all() as $v)
67
+        foreach ($query->all() as $v)
68 68
             $result[] = $v['term'];
69 69
         return $result;
70 70
     }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     }
111 111
 
112 112
     public function canInstall() {
113
-        if(!$this->getTable())
113
+        if (!$this->getTable())
114 114
             return 'Missing "table" property';
115 115
         return true;
116 116
     }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
     public function getTaxonomyTerm($name, $create = true)
119 119
     {
120 120
         $term = TaxonomyTerms::findOne(['term'=>$name, 'taxonomy_id' => $this->id]);
121
-        if($create and !isset($term))
121
+        if ($create and !isset($term))
122 122
         {
123 123
             $term = new TaxonomyTerms();
124 124
             $term->taxonomy_id = $this->id;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
     public function getRefTableName()
133 133
     {
134
-        if(strpos($this->refTable, '\\') === FALSE) //not an AR class but a table name
134
+        if (strpos($this->refTable, '\\') === FALSE) //not an AR class but a table name
135 135
             return $this->refTable;
136 136
         else
137 137
             return call_user_func([$this->refTable, 'tableName']);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         if (!preg_match('/^\w+$/', $this->name)) {
153 153
             throw new Exception('The migration name should contain letters, digits and/or underscore characters only.');
154 154
         }
155
-        $name = 'm' . gmdate('ymd_His') . '_' . $this->name;
155
+        $name = 'm'.gmdate('ymd_His').'_'.$this->name;
156 156
         return $name;
157 157
     }
158 158
 
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     {
161 161
 
162 162
         $name = $this->getMigrationFile();
163
-        $file = Yii::getAlias($this->migrationPath . DIRECTORY_SEPARATOR . $name . '.php');
163
+        $file = Yii::getAlias($this->migrationPath.DIRECTORY_SEPARATOR.$name.'.php');
164 164
 
165 165
         //$data = get_object_vars($this);
166 166
         $data = [];
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         $data['migration'] = $name;
172 172
 
173 173
         $this->migration = $name;
174
-        $content = Yii::$app->getView()->renderFile(Yii::getAlias($this->templateFile), [ 'data' => $data ]);
174
+        $content = Yii::$app->getView()->renderFile(Yii::getAlias($this->templateFile), ['data' => $data]);
175 175
         file_put_contents($file, $content);
176 176
         return $name;
177 177
     }
Please login to merge, or discard this patch.