Passed
Push — master ( 800a7c...2f3156 )
by dima
03:06
created
src/AbstractOptDataMapper.php 1 patch
Braces   +14 added lines, -18 removed lines patch added patch discarded remove patch
@@ -44,11 +44,9 @@  discard block
 block discarded – undo
44 44
 		
45 45
 		if(is_string($field)){
46 46
 			$field = ['field'	=>	$field];
47
-		}
48
-		elseif(empty($field)){
47
+		} elseif(empty($field)){
49 48
 			$field = ['field'	=>	$alias];
50
-		}
51
-		elseif(is_array($field) && !isset($field['field'])){
49
+		} elseif(is_array($field) && !isset($field['field'])){
52 50
 			$field['field']	= $alias;
53 51
 		}
54 52
 	
@@ -121,19 +119,18 @@  discard block
 block discarded – undo
121 119
 				
122 120
 				if($this->use_joins===true){
123 121
 					$value = $mapper->createEntity($row);
124
-				}
125
-				else{
122
+				} else{
126 123
 					$fkey = isset($cfg['on']) ? $cfg['on'] :$mapper->key;
127 124
 					$value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field]));
128 125
 				}				
129 126
 				
130
-			}
131
-			elseif(is_string($field) && isset($row[strtolower($field)])){
127
+			} elseif(is_string($field) && isset($row[strtolower($field)])){
132 128
 				$value = $row[strtolower($field)];
133 129
 			}
134 130
 			
135
-			if($value!==false)
136
-				$Entity->{$method_set}($value);
131
+			if($value!==false) {
132
+							$Entity->{$method_set}($value);
133
+			}
137 134
 			
138 135
         }
139 136
 		
@@ -164,18 +161,17 @@  discard block
 block discarded – undo
164 161
 			//--------------------------------------------------------------------
165 162
 			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
166 163
 				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
167
-			}
168
-			elseif(isset($cfg['relation'])){
164
+			} elseif(isset($cfg['relation'])){
169 165
 				
170
-				if(isset($cfg['on']))
171
-					$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
172
-				else
173
-					$fkey = 'id';
166
+				if(isset($cfg['on'])) {
167
+									$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
168
+				} else {
169
+									$fkey = 'id';
170
+				}
174 171
 				
175 172
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
176 173
 				
177
-			}			
178
-			else{
174
+			} else{
179 175
 				$value = $Entity->{$method_get}();
180 176
 			}			
181 177
 						
Please login to merge, or discard this patch.