@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $fields = []; |
| 71 | 71 | $exists = false; |
| 72 | 72 | foreach ($relation->table->getColumns() as $column) { |
| 73 | - $nm = $name . static::SEP . $column; |
|
| 73 | + $nm = $name.static::SEP.$column; |
|
| 74 | 74 | if (isset($this->aliases[$nm])) { |
| 75 | 75 | $nm = $this->aliases[$nm]; |
| 76 | 76 | } |
@@ -84,16 +84,16 @@ discard block |
||
| 84 | 84 | $parts = explode(static::SEP, $name); |
| 85 | 85 | $name = array_pop($parts); |
| 86 | 86 | if (!$exists && !count($parts) && !isset($temp[$name])) { |
| 87 | - $temp[$name] = $relation->many ? [ '___clean' => true ] : null; |
|
| 87 | + $temp[$name] = $relation->many ? ['___clean' => true] : null; |
|
| 88 | 88 | } |
| 89 | 89 | if ($exists) { |
| 90 | - $full = ''; |
|
| 90 | + $full = ''; |
|
| 91 | 91 | foreach ($parts as $item) { |
| 92 | - $full = $full ? $full . static::SEP . $item : $item; |
|
| 92 | + $full = $full ? $full.static::SEP.$item : $item; |
|
| 93 | 93 | $temp = &$temp[$item]; |
| 94 | 94 | $rpk = []; |
| 95 | 95 | foreach ($this->relations[$full][0]->table->getPrimaryKey() as $pkey) { |
| 96 | - $nm = $full . static::SEP . $pkey; |
|
| 96 | + $nm = $full.static::SEP.$pkey; |
|
| 97 | 97 | if (isset($this->aliases[$nm])) { |
| 98 | 98 | $nm = $this->aliases[$nm]; |
| 99 | 99 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $temp = &$temp[json_encode($rpk)]; |
| 103 | 103 | } |
| 104 | 104 | if (!isset($temp[$name])) { |
| 105 | - $temp[$name] = $relation->many ? [ '___clean' => true ] : null; |
|
| 105 | + $temp[$name] = $relation->many ? ['___clean' => true] : null; |
|
| 106 | 106 | } |
| 107 | 107 | $temp = &$temp[$name]; |
| 108 | 108 | if ($relation->many) { |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | return; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | - $this->fetched ++; |
|
| 163 | + $this->fetched++; |
|
| 164 | 164 | while ($this->result->valid()) { |
| 165 | 165 | $row = $this->result->current(); |
| 166 | 166 | $pk = []; |