@@ -80,7 +80,7 @@ |
||
| 80 | 80 | |
| 81 | 81 | if (!$this->isSynced($this->parent, $this->instance)) { |
| 82 | 82 | //Syncing FKs before primary command been executed |
| 83 | - $innerCommand->onExecute(function ($innerCommand) use ($parentCommand) { |
|
| 83 | + $innerCommand->onExecute(function($innerCommand) use ($parentCommand) { |
|
| 84 | 84 | $parentCommand->addContext( |
| 85 | 85 | $this->key(Record::INNER_KEY), |
| 86 | 86 | $this->lookupKey(Record::OUTER_KEY, $this->parent, $innerCommand) |
@@ -153,11 +153,11 @@ |
||
| 153 | 153 | } |
| 154 | 154 | } elseif (!is_object($value)) { |
| 155 | 155 | throw new RelationException( |
| 156 | - "Must be an instance of '{$this->class}', '" . gettype($value) . "' given" |
|
| 156 | + "Must be an instance of '{$this->class}', '".gettype($value)."' given" |
|
| 157 | 157 | ); |
| 158 | 158 | } elseif (!is_a($value, $this->class, false)) { |
| 159 | 159 | throw new RelationException( |
| 160 | - "Must be an instance of '{$this->class}', '" . get_class($value) . "' given" |
|
| 160 | + "Must be an instance of '{$this->class}', '".get_class($value)."' given" |
|
| 161 | 161 | ); |
| 162 | 162 | } |
| 163 | 163 | } |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | $pivotData = $data[ORMInterface::PIVOT_DATA]; |
| 97 | 97 | |
| 98 | 98 | //Unique row criteria |
| 99 | - return $pivotData[$this->innerPivotKey] . '.' . $pivotData[$this->outerPivotKey]; |
|
| 99 | + return $pivotData[$this->innerPivotKey].'.'.$pivotData[$this->outerPivotKey]; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | } |
| 103 | 103 | \ No newline at end of file |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | return null; |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - return $this->getAlias() . '.' . $this->schema[$key]; |
|
| 237 | + return $this->getAlias().'.'.$this->schema[$key]; |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | protected function parentKey($key): string |
| 248 | 248 | { |
| 249 | - return $this->parent->getAlias() . '.' . $this->schema[$key]; |
|
| 249 | + return $this->parent->getAlias().'.'.$this->schema[$key]; |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
@@ -260,10 +260,10 @@ discard block |
||
| 260 | 260 | if (empty($this->options['alias'])) { |
| 261 | 261 | if ($this->isLoaded() && $this->isJoined()) { |
| 262 | 262 | //Let's create unique alias, we are able to do that for relations just loaded |
| 263 | - $this->options['alias'] = 'd' . decoct(++self::$countLevels); |
|
| 263 | + $this->options['alias'] = 'd'.decoct(++self::$countLevels); |
|
| 264 | 264 | } else { |
| 265 | 265 | //Let's use parent alias to continue chain |
| 266 | - $this->options['alias'] = $parent->getAlias() . '_' . $this->relation; |
|
| 266 | + $this->options['alias'] = $parent->getAlias().'_'.$this->relation; |
|
| 267 | 267 | } |
| 268 | 268 | } |
| 269 | 269 | } |
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | if ($this->isJoined()) { |
| 84 | 84 | $query->join( |
| 85 | 85 | $this->getMethod() == self::JOIN ? 'INNER' : 'LEFT', |
| 86 | - $this->pivotTable() . ' AS ' . $this->pivotAlias()) |
|
| 86 | + $this->pivotTable().' AS '.$this->pivotAlias()) |
|
| 87 | 87 | ->on( |
| 88 | 88 | $this->pivotKey(Record::THOUGHT_INNER_KEY), |
| 89 | 89 | $this->parentKey(Record::INNER_KEY) |
| 90 | 90 | ); |
| 91 | 91 | } else { |
| 92 | 92 | $query->innerJoin( |
| 93 | - $this->pivotTable() . ' AS ' . $this->pivotAlias()) |
|
| 93 | + $this->pivotTable().' AS '.$this->pivotAlias()) |
|
| 94 | 94 | ->on( |
| 95 | 95 | $this->pivotKey(Record::THOUGHT_OUTER_KEY), |
| 96 | 96 | $this->localKey(Record::OUTER_KEY) |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | //Actual data is always INNER join |
| 129 | 129 | $query->join( |
| 130 | 130 | $this->getMethod() == self::JOIN ? 'INNER' : 'LEFT', |
| 131 | - $this->getTable() . ' AS ' . $this->getAlias() |
|
| 131 | + $this->getTable().' AS '.$this->getAlias() |
|
| 132 | 132 | )->on( |
| 133 | 133 | $this->localKey(Record::OUTER_KEY), |
| 134 | 134 | $this->pivotKey(Record::THOUGHT_OUTER_KEY) |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | if ($minify) { |
| 170 | 170 | //Let's use column number instead of full name |
| 171 | - $column = 'p_c' . count($columns); |
|
| 171 | + $column = 'p_c'.count($columns); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | $columns[] = "{$alias}.{$name} AS {$prefix}{$column}"; |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | return $this->options['pivotAlias']; |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - return $this->getAlias() . '_pivot'; |
|
| 220 | + return $this->getAlias().'_pivot'; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | return null; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - return $this->pivotAlias() . '.' . $this->schema[$key]; |
|
| 246 | + return $this->pivotAlias().'.'.$this->schema[$key]; |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | /** |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | if ($minify) { |
| 40 | 40 | //Let's use column number instead of full name |
| 41 | - $column = 'c' . count($columns); |
|
| 41 | + $column = 'c'.count($columns); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $columns[] = "{$alias}.{$name} AS {$prefix}{$column}"; |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | */ |
| 106 | 106 | public function primaryKey(): string |
| 107 | 107 | { |
| 108 | - return $this->getAlias() . '.' . $this->schema[Record::SH_PRIMARY_KEY]; |
|
| 108 | + return $this->getAlias().'.'.$this->schema[Record::SH_PRIMARY_KEY]; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -163,7 +163,7 @@ |
||
| 163 | 163 | foreach ($aliases as $property => $alias) { |
| 164 | 164 | if (isset($userOptions[$property])) { |
| 165 | 165 | //Let's create some default options based on user specified values |
| 166 | - $proposed['option:' . $alias] = $userOptions[$property]; |
|
| 166 | + $proposed['option:'.$alias] = $userOptions[$property]; |
|
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | $pivotData = $data[ORMInterface::PIVOT_DATA]; |
| 97 | 97 | |
| 98 | 98 | //Unique row criteria |
| 99 | - return $pivotData[$this->innerPivotKey] . '.' . $pivotData[$this->outerPivotKey]; |
|
| 99 | + return $pivotData[$this->innerPivotKey].'.'.$pivotData[$this->outerPivotKey]; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | } |
| 103 | 103 | \ No newline at end of file |