@@ -66,7 +66,7 @@ |
||
66 | 66 | if ($column->getName() != $initial->getName()) { |
67 | 67 | //Renaming is separate operation |
68 | 68 | $this->run("sp_rename ?, ?, 'COLUMN'", [ |
69 | - $table->getName() . '.' . $initial->getName(), |
|
69 | + $table->getName().'.'.$initial->getName(), |
|
70 | 70 | $column->getName() |
71 | 71 | ]); |
72 | 72 | } |
@@ -22,10 +22,10 @@ |
||
22 | 22 | $statement = []; |
23 | 23 | |
24 | 24 | $statement[] = 'FOREIGN KEY'; |
25 | - $statement[] = '(' . $this->table->driver()->identifier($this->column) . ')'; |
|
25 | + $statement[] = '('.$this->table->driver()->identifier($this->column).')'; |
|
26 | 26 | |
27 | - $statement[] = 'REFERENCES ' . $this->table->driver()->identifier($this->foreignTable); |
|
28 | - $statement[] = '(' . $this->table->driver()->identifier($this->foreignKey) . ')'; |
|
27 | + $statement[] = 'REFERENCES '.$this->table->driver()->identifier($this->foreignTable); |
|
28 | + $statement[] = '('.$this->table->driver()->identifier($this->foreignKey).')'; |
|
29 | 29 | |
30 | 30 | $statement[] = "ON DELETE {$this->deleteRule}"; |
31 | 31 | $statement[] = "ON UPDATE {$this->updateRule}"; |
@@ -163,7 +163,7 @@ |
||
163 | 163 | { |
164 | 164 | //Temporary table is required to copy data over |
165 | 165 | $temporary = clone $this; |
166 | - $temporary->setName('spiral_temp_' . $this->getName() . '_' . uniqid()); |
|
166 | + $temporary->setName('spiral_temp_'.$this->getName().'_'.uniqid()); |
|
167 | 167 | |
168 | 168 | //We don't need any index in temporary table |
169 | 169 | foreach ($temporary->getIndexes() as $index) { |
@@ -108,7 +108,7 @@ |
||
108 | 108 | { |
109 | 109 | if (is_array($this->value)) { |
110 | 110 | //Array were mocked |
111 | - return '(' . trim(str_repeat('?, ', count($this->value)), ', ') . ')'; |
|
111 | + return '('.trim(str_repeat('?, ', count($this->value)), ', ').')'; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | return '?'; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | return $this->options['pivotAlias']; |
98 | 98 | } |
99 | 99 | |
100 | - return $this->getAlias() . '_pivot'; |
|
100 | + return $this->getAlias().'_pivot'; |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | //Pivot table joining (INNER in post selection) |
116 | 116 | $pivotOuterKey = $this->getPivotKey(RecordEntity::THOUGHT_OUTER_KEY); |
117 | - $selector->innerJoin($this->pivotTable() . ' AS ' . $this->pivotAlias(), [ |
|
117 | + $selector->innerJoin($this->pivotTable().' AS '.$this->pivotAlias(), [ |
|
118 | 118 | $pivotOuterKey => $this->getKey(RecordEntity::OUTER_KEY) |
119 | 119 | ]); |
120 | 120 | |
@@ -156,14 +156,14 @@ discard block |
||
156 | 156 | { |
157 | 157 | $selector->join( |
158 | 158 | $this->joinType(), |
159 | - $this->pivotTable() . ' AS ' . $this->pivotAlias(), |
|
159 | + $this->pivotTable().' AS '.$this->pivotAlias(), |
|
160 | 160 | [$this->getPivotKey(RecordEntity::THOUGHT_INNER_KEY) => $this->getParentKey()] |
161 | 161 | ); |
162 | 162 | |
163 | 163 | $this->pivotConditions($selector); |
164 | 164 | |
165 | 165 | $pivotOuterKey = $this->getPivotKey(RecordEntity::THOUGHT_OUTER_KEY); |
166 | - $selector->join($this->joinType(), $this->getTable() . ' AS ' . $this->getAlias(), [ |
|
166 | + $selector->join($this->joinType(), $this->getTable().' AS '.$this->getAlias(), [ |
|
167 | 167 | $pivotOuterKey => $this->getKey(RecordEntity::OUTER_KEY) |
168 | 168 | ]); |
169 | 169 | |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | return null; |
206 | 206 | } |
207 | 207 | |
208 | - return $this->pivotAlias() . '.' . $this->definition[$key]; |
|
208 | + return $this->pivotAlias().'.'.$this->definition[$key]; |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | /** |
@@ -301,10 +301,10 @@ discard block |
||
301 | 301 | protected function deduplicate(array &$data) |
302 | 302 | { |
303 | 303 | $criteria = $data[ORM::PIVOT_DATA][$this->definition[RecordEntity::THOUGHT_INNER_KEY]] |
304 | - . '.' . $data[ORM::PIVOT_DATA][$this->definition[RecordEntity::THOUGHT_OUTER_KEY]]; |
|
304 | + . '.'.$data[ORM::PIVOT_DATA][$this->definition[RecordEntity::THOUGHT_OUTER_KEY]]; |
|
305 | 305 | |
306 | 306 | if (!empty($this->definition[RecordEntity::MORPH_KEY])) { |
307 | - $criteria .= ':' . $data[ORM::PIVOT_DATA][$this->definition[RecordEntity::MORPH_KEY]]; |
|
307 | + $criteria .= ':'.$data[ORM::PIVOT_DATA][$this->definition[RecordEntity::MORPH_KEY]]; |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | if (isset($this->duplicates[$criteria])) { |
@@ -74,7 +74,7 @@ |
||
74 | 74 | */ |
75 | 75 | protected function clarifySelector(RecordSelector $selector) |
76 | 76 | { |
77 | - $selector->join($this->joinType(), $this->getTable() . ' AS ' . $this->getAlias(), [ |
|
77 | + $selector->join($this->joinType(), $this->getTable().' AS '.$this->getAlias(), [ |
|
78 | 78 | $this->getKey(RecordEntity::OUTER_KEY) => $this->getParentKey() |
79 | 79 | ]); |
80 | 80 |
@@ -154,8 +154,8 @@ |
||
154 | 154 | { |
155 | 155 | $offset = count($this->dataColumns); |
156 | 156 | foreach ($columns as $column) { |
157 | - $columnAlias = 'c' . (++$this->countColumns); |
|
158 | - $this->dataColumns[] = $table . '.' . $column . ' AS ' . $columnAlias; |
|
157 | + $columnAlias = 'c'.(++$this->countColumns); |
|
158 | + $this->dataColumns[] = $table.'.'.$column.' AS '.$columnAlias; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | return $offset; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $arguments[0] = $this->prepare($arguments[0]); |
130 | 130 | |
131 | 131 | //Routing where |
132 | - call_user_func_array([$this->query, 'and' . ucfirst($this->target)], $arguments); |
|
132 | + call_user_func_array([$this->query, 'and'.ucfirst($this->target)], $arguments); |
|
133 | 133 | |
134 | 134 | return $this; |
135 | 135 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | $arguments[0] = $this->prepare($arguments[0]); |
160 | 160 | |
161 | 161 | //Routing where |
162 | - call_user_func_array([$this->query, 'or' . ucfirst($this->target)], $arguments); |
|
162 | + call_user_func_array([$this->query, 'or'.ucfirst($this->target)], $arguments); |
|
163 | 163 | |
164 | 164 | return $this; |
165 | 165 | } |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | } |
281 | 281 | |
282 | 282 | //New alias is pretty simple and short |
283 | - return $this->alias = 'd' . decoct(++self::$counter); |
|
283 | + return $this->alias = 'd'.decoct(++self::$counter); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | if (empty($this->parent)) { |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $alias = $this->container; |
291 | 291 | } else { |
292 | 292 | //Let's use parent alias to continue chain |
293 | - $alias = $this->parent->getAlias() . '_' . $this->container; |
|
293 | + $alias = $this->parent->getAlias().'_'.$this->container; |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | return $alias; |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | return null; |
329 | 329 | } |
330 | 330 | |
331 | - return $this->getAlias() . '.' . $this->schema[ORM::M_PRIMARY_KEY]; |
|
331 | + return $this->getAlias().'.'.$this->schema[ORM::M_PRIMARY_KEY]; |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | /** |
@@ -852,7 +852,7 @@ discard block |
||
852 | 852 | return null; |
853 | 853 | } |
854 | 854 | |
855 | - return $this->getAlias() . '.' . $this->definition[$key]; |
|
855 | + return $this->getAlias().'.'.$this->definition[$key]; |
|
856 | 856 | } |
857 | 857 | |
858 | 858 | /** |
@@ -867,7 +867,7 @@ discard block |
||
867 | 867 | throw new LoaderException("Unable to get parent key, no parent loader provided."); |
868 | 868 | } |
869 | 869 | |
870 | - return $this->parent->getAlias() . '.' . $this->definition[RecordEntity::INNER_KEY]; |
|
870 | + return $this->parent->getAlias().'.'.$this->definition[RecordEntity::INNER_KEY]; |
|
871 | 871 | } |
872 | 872 | |
873 | 873 | /** |