@@ -44,8 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | if(is_string($field)){ |
46 | 46 | $field = ['field' => $field]; |
47 | - } |
|
48 | - elseif(is_array($field) && !isset($field['field'])){ |
|
47 | + } elseif(is_array($field) && !isset($field['field'])){ |
|
49 | 48 | $field['field'] = $alias; |
50 | 49 | } |
51 | 50 | |
@@ -118,19 +117,18 @@ discard block |
||
118 | 117 | |
119 | 118 | if($this->use_joins===true){ |
120 | 119 | $value = $mapper->createEntity($row); |
121 | - } |
|
122 | - else{ |
|
120 | + } else{ |
|
123 | 121 | $fkey = isset($cfg['on']) ? $cfg['on'] :$mapper->key; |
124 | 122 | $value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field])); |
125 | 123 | } |
126 | 124 | |
127 | - } |
|
128 | - elseif(is_string($field) && isset($row[strtolower($field)])){ |
|
125 | + } elseif(is_string($field) && isset($row[strtolower($field)])){ |
|
129 | 126 | $value = $row[strtolower($field)]; |
130 | 127 | } |
131 | 128 | |
132 | - if($value!==false) |
|
133 | - $Entity->{$method_set}($value); |
|
129 | + if($value!==false) { |
|
130 | + $Entity->{$method_set}($value); |
|
131 | + } |
|
134 | 132 | |
135 | 133 | } |
136 | 134 | |
@@ -161,18 +159,17 @@ discard block |
||
161 | 159 | //-------------------------------------------------------------------- |
162 | 160 | if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){ |
163 | 161 | $value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() ); |
164 | - } |
|
165 | - elseif(isset($cfg['relation'])){ |
|
162 | + } elseif(isset($cfg['relation'])){ |
|
166 | 163 | |
167 | - if(isset($cfg['on'])) |
|
168 | - $fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']); |
|
169 | - else |
|
170 | - $fkey = 'id'; |
|
164 | + if(isset($cfg['on'])) { |
|
165 | + $fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']); |
|
166 | + } else { |
|
167 | + $fkey = 'id'; |
|
168 | + } |
|
171 | 169 | |
172 | 170 | $value = $Entity->{$method_get}()->{'get'.$fkey}(); |
173 | 171 | |
174 | - } |
|
175 | - else{ |
|
172 | + } else{ |
|
176 | 173 | $value = $Entity->{$method_get}(); |
177 | 174 | } |
178 | 175 |