@@ -65,31 +65,31 @@ discard block |
||
| 65 | 65 | $fields = []; |
| 66 | 66 | $exists = false; |
| 67 | 67 | foreach ($relation->table->getColumns() as $column) { |
| 68 | - $fields[$column] = $row[$name . static::SEP . $column]; |
|
| 69 | - if (!$exists && $row[$name . static::SEP . $column] !== null) { |
|
| 68 | + $fields[$column] = $row[$name.static::SEP.$column]; |
|
| 69 | + if (!$exists && $row[$name.static::SEP.$column] !== null) { |
|
| 70 | 70 | $exists = true; |
| 71 | 71 | } |
| 72 | - $remove[] = $name . static::SEP . $column; |
|
| 72 | + $remove[] = $name.static::SEP.$column; |
|
| 73 | 73 | } |
| 74 | 74 | $temp = &$result; |
| 75 | 75 | $parts = explode(static::SEP, $name); |
| 76 | 76 | $name = array_pop($parts); |
| 77 | 77 | if (!$exists && !count($parts) && !isset($temp[$name])) { |
| 78 | - $temp[$name] = $relation->many ? [ '___clean' => true ] : null; |
|
| 78 | + $temp[$name] = $relation->many ? ['___clean' => true] : null; |
|
| 79 | 79 | } |
| 80 | 80 | if ($exists) { |
| 81 | - $full = ''; |
|
| 81 | + $full = ''; |
|
| 82 | 82 | foreach ($parts as $item) { |
| 83 | - $full = $full ? $full . static::SEP . $item : $item; |
|
| 83 | + $full = $full ? $full.static::SEP.$item : $item; |
|
| 84 | 84 | $temp = &$temp[$item]; |
| 85 | 85 | $rpk = []; |
| 86 | 86 | foreach ($this->relations[$full][0]->table->getPrimaryKey() as $pkey) { |
| 87 | - $rpk[$pkey] = $row[$full . static::SEP . $pkey]; |
|
| 87 | + $rpk[$pkey] = $row[$full.static::SEP.$pkey]; |
|
| 88 | 88 | } |
| 89 | 89 | $temp = &$temp[json_encode($rpk)]; |
| 90 | 90 | } |
| 91 | 91 | if (!isset($temp[$name])) { |
| 92 | - $temp[$name] = $relation->many ? [ '___clean' => true ] : null; |
|
| 92 | + $temp[$name] = $relation->many ? ['___clean' => true] : null; |
|
| 93 | 93 | } |
| 94 | 94 | $temp = &$temp[$name]; |
| 95 | 95 | if ($relation->many) { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | return; |
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | - $this->fetched ++; |
|
| 150 | + $this->fetched++; |
|
| 151 | 151 | while ($this->result->valid()) { |
| 152 | 152 | $row = $this->result->current(); |
| 153 | 153 | $pk = []; |