Completed
Push — master ( d6efa0...f1914f )
by dima
02:16
created
src/AbstractOptDataMapper.php 1 patch
Braces   +8 added lines, -12 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@  discard block
 block discarded – undo
42 42
 		
43 43
 		if(is_string($field)){
44 44
 			$field = ['field'	=>	$alias];
45
-		}
46
-		elseif(is_array($field) && !isset($field['field'])){
45
+		} elseif(is_array($field) && !isset($field['field'])){
47 46
 			$field['field']	= $alias;
48 47
 		}
49 48
 	
@@ -114,19 +113,18 @@  discard block
 block discarded – undo
114 113
 				
115 114
 				if($this->use_joins===true){
116 115
 					$value = $mapper->createEntity($row);
117
-				}
118
-				else{
116
+				} else{
119 117
 					$fkey = $mapper->key;
120 118
 					$value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field]));
121 119
 				}				
122 120
 				
123
-			}
124
-			elseif(is_string($field) && isset($row[strtolower($field)])){
121
+			} elseif(is_string($field) && isset($row[strtolower($field)])){
125 122
 				$value = $row[strtolower($field)];
126 123
 			}
127 124
 			
128
-			if($value!==false)
129
-				$Entity->{$method_set}($value);
125
+			if($value!==false) {
126
+							$Entity->{$method_set}($value);
127
+			}
130 128
 			
131 129
         }
132 130
 		
@@ -157,13 +155,11 @@  discard block
 block discarded – undo
157 155
 			//--------------------------------------------------------------------
158 156
 			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
159 157
 				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
160
-			}
161
-			elseif(isset($cfg['relation'])){
158
+			} elseif(isset($cfg['relation'])){
162 159
 				
163 160
 				$value = $Entity->{$method_get}()->getId();
164 161
 				
165
-			}			
166
-			else{
162
+			} else{
167 163
 				$value = $Entity->{$method_get}();
168 164
 			}			
169 165
 			
Please login to merge, or discard this patch.