Completed
Push — master ( ff9cab...d6efa0 )
by dima
02:58
created
src/AbstractDataMapper.php 4 patches
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	
54 54
 	/**
55 55
 	 * Cохранение сущности
56
-	 * @param \Core\Infrastructure\EntityInterface $Entity
56
+	 * @param EntityInterface $Entity
57 57
 	 */
58 58
 	public function save(EntityInterface $Entity)
59 59
 	{
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	
93 93
 	/**
94 94
 	 * из объекта формирует массив
95
-	 * @param \Core\Infrastructure\EntityInterface $Entity
95
+	 * @param EntityInterface $Entity
96 96
 	 * @return \Core\Infrastructure\EntityInterface
97 97
 	 * @throws BadMethodCallException
98 98
 	 */
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
 	/**
127 127
 	 * Подготавливаем конечный вариант Сущности
128 128
 	 * 
129
-	 * @param \Core\Infrastructure\EntityInterface $Entity
129
+	 * @param EntityInterface $Entity
130 130
 	 * @param array $row
131
-	 * @return \Core\Infrastructure\EntityInterface
131
+	 * @return EntityInterface
132 132
 	 * @throws BadMethodCallException
133 133
 	 */
134 134
 	protected function buildEntity(EntityInterface $Entity, array $row){
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	
173 173
 	/**
174 174
 	 * 
175
-	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
175
+	 * @param ISpecificationCriteria $specification
176 176
 	 * @return type
177 177
 	 */
178 178
 	public function findBySpecification(ISpecificationCriteria $specification){
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	
196 196
 	/**
197 197
 	 * Удаление записи
198
-	 * @param \Core\Infrastructure\EntityInterface $Entity
198
+	 * @param EntityInterface $Entity
199 199
 	 * @return boolean
200 200
 	 */
201 201
 	public function delete(EntityInterface $Entity)
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 	
250 250
 	/**
251 251
 	 * Выборка удаленных моделей
252
-	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
252
+	 * @param ISpecificationCriteria $specification
253 253
 	 */
254 254
 	private function setSoftDelete(ISpecificationCriteria $specification){
255 255
 		if(
Please login to merge, or discard this patch.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 {
12 12
 	protected $db;
13 13
 	
14
-    protected $entityTable;	
14
+	protected $entityTable;	
15 15
 	
16 16
 	protected $key;
17 17
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	protected $use_joins = false;
24 24
 
25 25
 	public function __construct( QueryBuilderInterface $adapter, $db_name = null) {// \CI_DB_mysqli_driver //DatabaseAdapterInterface
26
-        $this->db = $adapter;
26
+		$this->db = $adapter;
27 27
 		
28 28
 		$this->entityTable = !empty($db_name)? "$db_name.".$this->setEntityTable() : $this->setEntityTable();
29 29
 		
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 		if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){
33 33
 			throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы');
34 34
 		}
35
-    }
35
+	}
36 36
 	
37 37
 	
38 38
 	
@@ -40,16 +40,16 @@  discard block
 block discarded – undo
40 40
 		return $this->entityTable;
41 41
 	}
42 42
 
43
-    public function getAdapter() {
44
-        return $this->db;
45
-    }
43
+	public function getAdapter() {
44
+		return $this->db;
45
+	}
46 46
 
47
-    public function findById($id)
48
-    {
47
+	public function findById($id)
48
+	{
49 49
 		$Criteria = (new Specification())->setWhere($this->key , $id);
50 50
 		
51
-        return $this->findBySpecification($Criteria);
52
-    }	
51
+		return $this->findBySpecification($Criteria);
52
+	}	
53 53
 	
54 54
 	/**
55 55
 	 * Cохранение сущности
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
 		$row = [];
104 104
 		
105
-        foreach ($mapfileds as $propery => $field ) {
105
+		foreach ($mapfileds as $propery => $field ) {
106 106
 			
107 107
 			$method_get = 'get' . ucfirst($propery);
108 108
 			
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 			}			
119 119
 			$row[$field] = $value;
120 120
 
121
-        }
121
+		}
122 122
 
123
-        return $row;		
123
+		return $row;		
124 124
 	}		
125 125
 	
126 126
 	/**
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 		
136 136
 		$mapfields = array_merge([ 'id' => $this->key], $this->setMappingFields());
137 137
 
138
-        foreach ($mapfields as $propery => $field ) {
138
+		foreach ($mapfields as $propery => $field ) {
139 139
 			
140 140
 			$value = false;
141 141
 			
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 			if($value!==false)
157 157
 				$Entity->{$method_set}($value);
158 158
 			
159
-        }
159
+		}
160 160
 		
161
-        return $Entity;		
161
+		return $Entity;		
162 162
 	}	
163 163
 	
164 164
 	
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
187 187
 		//получение записей
188 188
 		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
189 189
 
190
-        if (!$row = $res->row_array()) {
191
-            return null;
192
-        }
193
-        return $this->createEntity($row);				
190
+		if (!$row = $res->row_array()) {
191
+			return null;
192
+		}
193
+		return $this->createEntity($row);				
194 194
 	}
195 195
 	
196 196
 	/**
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
 		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
233 233
 		
234 234
 		if (!$rows = $res->result_array()) {
235
-            return null;
236
-        }	
235
+			return null;
236
+		}	
237 237
 		
238 238
 		foreach($rows as $k =>  $row){
239 239
 			$rows[$k] = $this->createEntity($row);
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
 	 */
23 23
 	protected $use_joins = false;
24 24
 
25
-	public function __construct( QueryBuilderInterface $adapter, $db_name = null) {// \CI_DB_mysqli_driver //DatabaseAdapterInterface
25
+	public function __construct(QueryBuilderInterface $adapter, $db_name = null) {// \CI_DB_mysqli_driver //DatabaseAdapterInterface
26 26
         $this->db = $adapter;
27 27
 		
28
-		$this->entityTable = !empty($db_name)? "$db_name.".$this->setEntityTable() : $this->setEntityTable();
28
+		$this->entityTable = !empty($db_name) ? "$db_name.".$this->setEntityTable() : $this->setEntityTable();
29 29
 		
30 30
 		//$this->key = $this->getKey();
31 31
 	
32
-		if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){
32
+		if ($this->getEntityTable()=='' || $this->getPrimaryKey()=='') {
33 33
 			throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы');
34 34
 		}
35 35
     }
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
     public function findById($id)
48 48
     {
49
-		$Criteria = (new Specification())->setWhere($this->key , $id);
49
+		$Criteria = (new Specification())->setWhere($this->key, $id);
50 50
 		
51 51
         return $this->findBySpecification($Criteria);
52 52
     }	
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		//insert
67 67
 		if (empty($id)) {
68 68
 			
69
-			$this->db->insert($this->getEntityTable(),$data);
69
+			$this->db->insert($this->getEntityTable(), $data);
70 70
 			
71 71
 			if (!$id = $this->db->insert_id()) {
72 72
 				return false;
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
 		//update
78 78
 		else {
79 79
 			
80
-			if(!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")){
80
+			if (!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")) {
81 81
 				return false;
82 82
 			}
83 83
 
84 84
 		}		
85 85
 		
86
-		if(method_exists($this, 'onSaveSuccess' )){ return $this->onSaveSuccess( $Entity );}
86
+		if (method_exists($this, 'onSaveSuccess')) { return $this->onSaveSuccess($Entity); }
87 87
 		
88 88
 		return true;
89 89
 	}
@@ -94,24 +94,24 @@  discard block
 block discarded – undo
94 94
 	 * @return \Core\Infrastructure\EntityInterface
95 95
 	 * @throws BadMethodCallException
96 96
 	 */
97
-	protected function unbuildEntity(EntityInterface $Entity){
97
+	protected function unbuildEntity(EntityInterface $Entity) {
98 98
 		
99
-		$mapfileds = array_merge([ 'id' => $this->key], $this->setMappingFields());
99
+		$mapfileds = array_merge(['id' => $this->key], $this->setMappingFields());
100 100
 
101 101
 		$row = [];
102 102
 		
103
-        foreach ($mapfileds as $propery => $field ) {
103
+        foreach ($mapfileds as $propery => $field) {
104 104
 			
105
-			$method_get = 'get' . ucfirst($propery);
105
+			$method_get = 'get'.ucfirst($propery);
106 106
 			
107
-			if(!method_exists($Entity, $method_get )){
107
+			if (!method_exists($Entity, $method_get)) {
108 108
 				throw new BadMethodCallException("Метод {$method_get}  не определен");
109 109
 			}		
110 110
 			
111
-			if(method_exists($this, 'onUnBuild'.$propery )){
112
-				$value = $this->{'onUnBuild'.$propery}(  $Entity->{$method_get}() );
111
+			if (method_exists($this, 'onUnBuild'.$propery)) {
112
+				$value = $this->{'onUnBuild'.$propery}($Entity->{$method_get}());
113 113
 			}
114
-			else{
114
+			else {
115 115
 				$value = $Entity->{$method_get}();
116 116
 			}			
117 117
 			$row[$field] = $value;
@@ -129,29 +129,29 @@  discard block
 block discarded – undo
129 129
 	 * @return \Core\Infrastructure\EntityInterface
130 130
 	 * @throws BadMethodCallException
131 131
 	 */
132
-	protected function buildEntity(EntityInterface $Entity, array $row){
132
+	protected function buildEntity(EntityInterface $Entity, array $row) {
133 133
 		
134
-		$mapfields = array_merge([ 'id' => $this->key], $this->setMappingFields());
134
+		$mapfields = array_merge(['id' => $this->key], $this->setMappingFields());
135 135
 
136
-        foreach ($mapfields as $propery => $field ) {
136
+        foreach ($mapfields as $propery => $field) {
137 137
 			
138 138
 			$value = false;
139 139
 			
140
-			$method_set = 'set' . ucfirst($propery);
140
+			$method_set = 'set'.ucfirst($propery);
141 141
 			
142
-			if(!method_exists($Entity, $method_set )){
142
+			if (!method_exists($Entity, $method_set)) {
143 143
 				throw new BadMethodCallException("Метод {$method_set}  не определен");
144 144
 			}			
145 145
 			
146 146
 			//событие onBuildField
147
-			if(method_exists($this, 'onBuild'.$propery )){
148
-				$value = $this->{'onBuild'.$propery}($field,$row);
147
+			if (method_exists($this, 'onBuild'.$propery)) {
148
+				$value = $this->{'onBuild'.$propery}($field, $row);
149 149
 			}
150
-			elseif(is_string($field) && isset($row[strtolower($field)])){
150
+			elseif (is_string($field) && isset($row[strtolower($field)])) {
151 151
 				$value = $row[strtolower($field)];
152 152
 			}
153 153
 			
154
-			if($value!==false)
154
+			if ($value!==false)
155 155
 				$Entity->{$method_set}($value);
156 156
 			
157 157
         }
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
174 174
 	 * @return type
175 175
 	 */
176
-	public function findBySpecification(ISpecificationCriteria $specification){
176
+	public function findBySpecification(ISpecificationCriteria $specification) {
177 177
 
178 178
 		//псеводо удаление
179 179
 		$this->setSoftDelete($specification);
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 		$specification->setLimit(1);
184 184
 		
185 185
 		//получение записей
186
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
186
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
187 187
 
188 188
         if (!$row = $res->row_array()) {
189 189
             return null;
@@ -204,13 +204,13 @@  discard block
 block discarded – undo
204 204
 		
205 205
 		if (
206 206
 				$delete_key > '' && 
207
-				$Entity->getId() > 0){
208
-				$result = $this->db->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
207
+				$Entity->getId() > 0) {
208
+				$result = $this->db->update($this->getEntityTable(), [$delete_key => 1], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
209 209
 		}
210
-		elseif($Entity->getId() > 0){
210
+		elseif ($Entity->getId() > 0) {
211 211
 			
212
-			if($result = $this->db->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())){
213
-				if(method_exists($this, 'onDeleteSuccess' )){ $result = $this->onDeleteSuccess( $Entity );}
212
+			if ($result = $this->db->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())) {
213
+				if (method_exists($this, 'onDeleteSuccess')) { $result = $this->onDeleteSuccess($Entity); }
214 214
 			}
215 215
 		}
216 216
 		
@@ -227,13 +227,13 @@  discard block
 block discarded – undo
227 227
 		
228 228
 		$this->setRelations($specification);
229 229
 		
230
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
230
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
231 231
 		
232 232
 		if (!$rows = $res->result_array()) {
233 233
             return null;
234 234
         }	
235 235
 		
236
-		foreach($rows as $k =>  $row){
236
+		foreach ($rows as $k =>  $row) {
237 237
 			$rows[$k] = $this->createEntity($row);
238 238
 		}
239 239
 		
@@ -249,22 +249,22 @@  discard block
 block discarded – undo
249 249
 	 * Выборка удаленных моделей
250 250
 	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
251 251
 	 */
252
-	private function setSoftDelete(ISpecificationCriteria $specification){
253
-		if(
254
-				$this->setSoftDeleteKey()>'' 
252
+	private function setSoftDelete(ISpecificationCriteria $specification) {
253
+		if (
254
+				$this->setSoftDeleteKey() > '' 
255 255
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
256 256
 				)
257
-		$specification->setWhere($this->setSoftDeleteKey(),0);
257
+		$specification->setWhere($this->setSoftDeleteKey(), 0);
258 258
 	}
259 259
 	
260 260
 	/**
261 261
 	 * Построение join-ов
262 262
 	 */
263
-	protected function setRelations(ISpecificationCriteria $Specification){
264
-		if($this->use_joins===true){
263
+	protected function setRelations(ISpecificationCriteria $Specification) {
264
+		if ($this->use_joins===true) {
265 265
 			$joins = [];
266 266
 			
267
-			foreach($this->setJoins() as $join){
267
+			foreach ($this->setJoins() as $join) {
268 268
 				$table = (new $join['mapper']($this->getAdapter()))->setEntityTable();
269 269
 				
270 270
 				$joins[$table] = $join;
Please login to merge, or discard this patch.
Braces   +9 added lines, -10 removed lines patch added patch discarded remove patch
@@ -110,8 +110,7 @@  discard block
 block discarded – undo
110 110
 			
111 111
 			if(method_exists($this, 'onUnBuild'.$propery )){
112 112
 				$value = $this->{'onUnBuild'.$propery}(  $Entity->{$method_get}() );
113
-			}
114
-			else{
113
+			} else{
115 114
 				$value = $Entity->{$method_get}();
116 115
 			}			
117 116
 			$row[$field] = $value;
@@ -146,13 +145,13 @@  discard block
 block discarded – undo
146 145
 			//событие onBuildField
147 146
 			if(method_exists($this, 'onBuild'.$propery )){
148 147
 				$value = $this->{'onBuild'.$propery}($field,$row);
149
-			}
150
-			elseif(is_string($field) && isset($row[strtolower($field)])){
148
+			} elseif(is_string($field) && isset($row[strtolower($field)])){
151 149
 				$value = $row[strtolower($field)];
152 150
 			}
153 151
 			
154
-			if($value!==false)
155
-				$Entity->{$method_set}($value);
152
+			if($value!==false) {
153
+							$Entity->{$method_set}($value);
154
+			}
156 155
 			
157 156
         }
158 157
 		
@@ -206,8 +205,7 @@  discard block
 block discarded – undo
206 205
 				$delete_key > '' && 
207 206
 				$Entity->getId() > 0){
208 207
 				$result = $this->db->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
209
-		}
210
-		elseif($Entity->getId() > 0){
208
+		} elseif($Entity->getId() > 0){
211 209
 			
212 210
 			if($result = $this->db->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())){
213 211
 				if(method_exists($this, 'onDeleteSuccess' )){ $result = $this->onDeleteSuccess( $Entity );}
@@ -253,8 +251,9 @@  discard block
 block discarded – undo
253 251
 		if(
254 252
 				$this->setSoftDeleteKey()>'' 
255 253
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
256
-				)
257
-		$specification->setWhere($this->setSoftDeleteKey(),0);
254
+				) {
255
+				$specification->setWhere($this->setSoftDeleteKey(),0);
256
+		}
258 257
 	}
259 258
 	
260 259
 	/**
Please login to merge, or discard this patch.
src/AbstractOptDataMapper.php 4 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 	/**
80 80
 	 * Подготавливаем конечный вариант Сущности
81 81
 	 * 
82
-	 * @param \Core\Infrastructure\EntityInterface $Entity
82
+	 * @param EntityInterface $Entity
83 83
 	 * @param array $row
84
-	 * @return \Core\Infrastructure\EntityInterface
84
+	 * @return EntityInterface
85 85
 	 * @throws BadMethodCallException
86 86
 	 */
87 87
 	protected function buildEntity(EntityInterface $Entity, array $row){
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	
132 132
 	/**
133 133
 	 * из объекта формирует массив
134
-	 * @param \Core\Infrastructure\EntityInterface $Entity
134
+	 * @param EntityInterface $Entity
135 135
 	 * @return \Core\Infrastructure\EntityInterface
136 136
 	 * @throws BadMethodCallException
137 137
 	 */
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	protected function buildEntity(EntityInterface $Entity, array $row){
88 88
 		
89
-        foreach ($this->mapping_fields as $alias => $cfg ) {
89
+		foreach ($this->mapping_fields as $alias => $cfg ) {
90 90
 			
91 91
 			$value = false;
92 92
 			
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 			if($value!==false)
124 124
 				$Entity->{$method_set}($value);
125 125
 			
126
-        }
126
+		}
127 127
 		
128
-        return $Entity;		
128
+		return $Entity;		
129 129
 	}	
130 130
 
131 131
 	
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		
140 140
 		$row = [];
141 141
 		
142
-        foreach ($this->mapping_fields as $alias => $cfg ) {
142
+		foreach ($this->mapping_fields as $alias => $cfg ) {
143 143
 			
144 144
 			$field = $cfg['field'];
145 145
 			
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 			
165 165
 			$row[$field] = $value;
166 166
 
167
-        }
167
+		}
168 168
 
169
-        return $row;		
169
+		return $row;		
170 170
 	}	
171 171
 	
172 172
 	
Please login to merge, or discard this patch.
Braces   +7 added lines, -10 removed lines patch added patch discarded remove patch
@@ -109,19 +109,18 @@  discard block
 block discarded – undo
109 109
 				
110 110
 				if($this->use_joins===true){
111 111
 					$value = $mapper->createEntity($row);
112
-				}
113
-				else{
112
+				} else{
114 113
 					$fkey = $mapper->key;
115 114
 					$value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field]));
116 115
 				}				
117 116
 				
118
-			}
119
-			elseif(is_string($field) && isset($row[strtolower($field)])){
117
+			} elseif(is_string($field) && isset($row[strtolower($field)])){
120 118
 				$value = $row[strtolower($field)];
121 119
 			}
122 120
 			
123
-			if($value!==false)
124
-				$Entity->{$method_set}($value);
121
+			if($value!==false) {
122
+							$Entity->{$method_set}($value);
123
+			}
125 124
 			
126 125
         }
127 126
 		
@@ -152,13 +151,11 @@  discard block
 block discarded – undo
152 151
 			//--------------------------------------------------------------------
153 152
 			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
154 153
 				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
155
-			}
156
-			elseif(isset($cfg['relation'])){
154
+			} elseif(isset($cfg['relation'])){
157 155
 				
158 156
 				$value = $Entity->{$method_get}()->getId();
159 157
 				
160
-			}			
161
-			else{
158
+			} else{
162 159
 				$value = $Entity->{$method_get}();
163 160
 			}			
164 161
 			
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  *
13 13
  * @author d.lanec
14 14
  */
15
-abstract class AbstractOptDataMapper extends AbstractDataMapper{
15
+abstract class AbstractOptDataMapper extends AbstractDataMapper {
16 16
 	
17 17
 	protected $soft_delete_key;
18 18
 	
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
 	/**
39 39
 	 * Установка поля для маппинга
40 40
 	 */
41
-	protected function addMappingField($alias,$field = null){
41
+	protected function addMappingField($alias, $field = null) {
42 42
 		
43
-		if(! isset($field['field'])){
44
-			$field['field'] = is_string($field)?$field:$alias;	
43
+		if (!isset($field['field'])) {
44
+			$field['field'] = is_string($field) ? $field : $alias;	
45 45
 		}
46 46
 	
47 47
 		$this->mapping_fields[$alias] = $field;
48 48
 
49
-		if(isset($field['primary']) && $field['primary']===true){
49
+		if (isset($field['primary']) && $field['primary']===true) {
50 50
 			$this->key = $field['field'];
51 51
 		}
52 52
 		
53
-		if(isset($field['softdelete']) && $field['softdelete']===true){
53
+		if (isset($field['softdelete']) && $field['softdelete']===true) {
54 54
 			$this->soft_delete_key = $field['field'];
55 55
 		}
56 56
 		
@@ -86,43 +86,43 @@  discard block
 block discarded – undo
86 86
 	 * @return \Core\Infrastructure\EntityInterface
87 87
 	 * @throws BadMethodCallException
88 88
 	 */
89
-	protected function buildEntity(EntityInterface $Entity, array $row){
89
+	protected function buildEntity(EntityInterface $Entity, array $row) {
90 90
 		
91
-        foreach ($this->mapping_fields as $alias => $cfg ) {
91
+        foreach ($this->mapping_fields as $alias => $cfg) {
92 92
 			
93 93
 			$value = false;
94 94
 			
95 95
 			$field = $cfg['field'];
96 96
 			
97
-			$method_set = 'set' . ucfirst($alias);
97
+			$method_set = 'set'.ucfirst($alias);
98 98
 			
99
-			if(!method_exists($Entity, $method_set )){
99
+			if (!method_exists($Entity, $method_set)) {
100 100
 				throw new BadMethodCallException("Метод {$method_set}  не определен");
101 101
 			}			
102 102
 			
103 103
 			//событие на формирование поля
104
-			if( isset($cfg['build']) && is_object($cfg['build']) ){
104
+			if (isset($cfg['build']) && is_object($cfg['build'])) {
105 105
 				$value = call_user_func($cfg['build'], $row);
106 106
 			}
107 107
 			//на связь
108
-			elseif(isset($cfg['relation'])){
108
+			elseif (isset($cfg['relation'])) {
109 109
 				
110 110
 				$mapper = $this->DI->get($cfg['relation']);
111 111
 				
112
-				if($this->use_joins===true){
112
+				if ($this->use_joins===true) {
113 113
 					$value = $mapper->createEntity($row);
114 114
 				}
115
-				else{
115
+				else {
116 116
 					$fkey = $mapper->key;
117 117
 					$value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field]));
118 118
 				}				
119 119
 				
120 120
 			}
121
-			elseif(is_string($field) && isset($row[strtolower($field)])){
121
+			elseif (is_string($field) && isset($row[strtolower($field)])) {
122 122
 				$value = $row[strtolower($field)];
123 123
 			}
124 124
 			
125
-			if($value!==false)
125
+			if ($value!==false)
126 126
 				$Entity->{$method_set}($value);
127 127
 			
128 128
         }
@@ -137,30 +137,30 @@  discard block
 block discarded – undo
137 137
 	 * @return \Core\Infrastructure\EntityInterface
138 138
 	 * @throws BadMethodCallException
139 139
 	 */
140
-	protected function unbuildEntity(EntityInterface $Entity){
140
+	protected function unbuildEntity(EntityInterface $Entity) {
141 141
 		
142 142
 		$row = [];
143 143
 		
144
-        foreach ($this->mapping_fields as $alias => $cfg ) {
144
+        foreach ($this->mapping_fields as $alias => $cfg) {
145 145
 			
146 146
 			$field = $cfg['field'];
147 147
 			
148
-			$method_get = 'get' . ucfirst($alias);
148
+			$method_get = 'get'.ucfirst($alias);
149 149
 			
150
-			if(!method_exists($Entity, $method_get )){
150
+			if (!method_exists($Entity, $method_get)) {
151 151
 				throw new BadMethodCallException("Метод {$method_get}  не определен");
152 152
 			}		
153 153
 			
154 154
 			//--------------------------------------------------------------------
155
-			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
156
-				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
155
+			if (isset($cfg['unbuild']) && is_object($cfg['unbuild'])) {
156
+				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}());
157 157
 			}
158
-			elseif(isset($cfg['relation'])){
158
+			elseif (isset($cfg['relation'])) {
159 159
 				
160 160
 				$value = $Entity->{$method_get}()->getId();
161 161
 				
162 162
 			}			
163
-			else{
163
+			else {
164 164
 				$value = $Entity->{$method_get}();
165 165
 			}			
166 166
 			
@@ -175,12 +175,12 @@  discard block
 block discarded – undo
175 175
 	/**
176 176
 	 * Построение join-ов
177 177
 	 */
178
-	protected function setRelations(ISpecificationCriteria $Specification){
178
+	protected function setRelations(ISpecificationCriteria $Specification) {
179 179
 
180 180
 		$joins = [];
181 181
 
182
-		foreach ($this->mapping_fields as $field => $cfg){
183
-			if(isset($cfg['relation'])){
182
+		foreach ($this->mapping_fields as $field => $cfg) {
183
+			if (isset($cfg['relation'])) {
184 184
 				
185 185
 				$this->relations[$field] = $mapper = $this->DI->get($cfg['relation']);
186 186
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 			}
196 196
 		}	
197 197
 
198
-		if($this->use_joins===true){
198
+		if ($this->use_joins===true) {
199 199
 			$Specification->setJoins($joins);
200 200
 		}			
201 201
 	}	
@@ -204,12 +204,12 @@  discard block
 block discarded – undo
204 204
 	 * На успешное сохранение
205 205
 	 * @param \SimpleORM\EntityInterface $Entity
206 206
 	 */
207
-	protected function onSaveSuccess(EntityInterface $Entity){
207
+	protected function onSaveSuccess(EntityInterface $Entity) {
208 208
 		
209 209
 		
210 210
 		foreach ($this->relations as $alias => $mapper) {
211 211
 			$Entity = $Entity->{'get'.$alias}();
212
-			if(!$mapper->save($Entity)){
212
+			if (!$mapper->save($Entity)) {
213 213
 				throw new \Autoprice\Exceptions\EntityNotSaveException('Unable to save Entity!');
214 214
 			}
215 215
 		}
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 	protected function onDeleteSuccess(EntityInterface $Entity) {
225 225
 		foreach ($this->relations as $alias => $mapper) {
226 226
 			$Entity = $Entity->{'get'.$alias}();
227
-			if(!$mapper->delete($Entity)){
227
+			if (!$mapper->delete($Entity)) {
228 228
 				throw new \Autoprice\Exceptions\EntityNotDeleteException('Unable to delete Entity!');
229 229
 			}
230 230
 		}
Please login to merge, or discard this patch.
src/ISpecificationCriteria.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -10,43 +10,43 @@
 block discarded – undo
10 10
  */
11 11
 interface ISpecificationCriteria
12 12
 {
13
-    public function getCriteria();
13
+	public function getCriteria();
14 14
 	
15 15
 	public function getWhere();
16 16
 
17
-    public function getLimit();
17
+	public function getLimit();
18 18
 
19
-    public function getOfset();
19
+	public function getOfset();
20 20
 
21
-    public function getJoins();
21
+	public function getJoins();
22 22
 
23
-    public function getOrder();
23
+	public function getOrder();
24 24
 
25
-    public function getManualJoins();
25
+	public function getManualJoins();
26 26
 
27
-    public function getGroup();
27
+	public function getGroup();
28 28
 
29
-    public function getManualWheres();
29
+	public function getManualWheres();
30 30
 
31
-    public function getWhereType();    
31
+	public function getWhereType();    
32 32
 
33
-    public function setWhere($field,$value = false);    
33
+	public function setWhere($field,$value = false);    
34 34
 
35
-    public function setLimit($limit);
35
+	public function setLimit($limit);
36 36
 
37
-    public function setOfset($ofset);
37
+	public function setOfset($ofset);
38 38
 
39
-    public function setJoins($joins);    
39
+	public function setJoins($joins);    
40 40
 
41
-    public function setOrder($order);
41
+	public function setOrder($order);
42 42
 
43
-    public function setManualJoins($manualJoins);
43
+	public function setManualJoins($manualJoins);
44 44
 
45
-    public function setGroup($group);
45
+	public function setGroup($group);
46 46
 
47
-    public function setManualWheres($manualWheres);
47
+	public function setManualWheres($manualWheres);
48 48
 	
49
-    public function setWhereType($whereType);
49
+	public function setWhereType($whereType);
50 50
 	
51 51
 }
52 52
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 
31 31
     public function getWhereType();    
32 32
 
33
-    public function setWhere($field,$value = false);    
33
+    public function setWhere($field, $value = false);    
34 34
 
35 35
     public function setLimit($limit);
36 36
 
Please login to merge, or discard this patch.
src/EntityInterface.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@
 block discarded – undo
8 8
  */
9 9
 interface EntityInterface
10 10
 {
11
-    //put your code here
12
-    public function getId();
11
+	//put your code here
12
+	public function getId();
13 13
     
14
-    public function setId($id);
14
+	public function setId($id);
15 15
 }
Please login to merge, or discard this patch.
src/AbstractEntity.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -10,29 +10,29 @@
 block discarded – undo
10 10
 abstract class AbstractEntity implements EntityInterface
11 11
 {
12 12
 
13
-    protected $id;
13
+	protected $id;
14 14
 	
15 15
 	protected $deleted;
16 16
 
17 17
 	public function getId()
18
-    {
19
-        return $this->id;
20
-    }
18
+	{
19
+		return $this->id;
20
+	}
21 21
 
22
-    public function setId($id)
23
-    {
24
-        if ($this->id !== null) {
25
-            throw new BadMethodCallException(
26
-                "Идентификатор у сущности уже установлен");
27
-        }
22
+	public function setId($id)
23
+	{
24
+		if ($this->id !== null) {
25
+			throw new BadMethodCallException(
26
+				"Идентификатор у сущности уже установлен");
27
+		}
28 28
  
29
-        if ($id < 1) {
30
-            throw new InvalidArgumentException("Неверный индентификатор");
31
-        }
29
+		if ($id < 1) {
30
+			throw new InvalidArgumentException("Неверный индентификатор");
31
+		}
32 32
  
33
-        $this->id = $id;
34
-        return $this;		
35
-    }
33
+		$this->id = $id;
34
+		return $this;		
35
+	}
36 36
 	
37 37
 	public function setDeleted($deleted){
38 38
 		$this->deleted = $deleted;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
     public function setId($id)
23 23
     {
24
-        if ($this->id !== null) {
24
+        if ($this->id!==null) {
25 25
             throw new BadMethodCallException(
26 26
                 "Идентификатор у сущности уже установлен");
27 27
         }
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         return $this;		
35 35
     }
36 36
 	
37
-	public function setDeleted($deleted){
37
+	public function setDeleted($deleted) {
38 38
 		$this->deleted = $deleted;
39 39
 	}
40 40
 	
Please login to merge, or discard this patch.
src/Specification.php 3 patches
Indentation   +119 added lines, -119 removed lines patch added patch discarded remove patch
@@ -10,134 +10,134 @@
 block discarded – undo
10 10
 class Specification implements ISpecificationCriteria
11 11
 {
12 12
 
13
-    protected $where = [];
13
+	protected $where = [];
14 14
 
15
-    protected $limit = 0;
15
+	protected $limit = 0;
16 16
 
17
-    protected $ofset = 0;
17
+	protected $ofset = 0;
18 18
 
19
-    protected $joins = [];
19
+	protected $joins = [];
20 20
 
21
-    protected $order = [];
21
+	protected $order = [];
22 22
 
23
-    protected $manualJoins = [];
23
+	protected $manualJoins = [];
24 24
 
25
-    protected $group = null;
25
+	protected $group = null;
26 26
 
27
-    protected $manualWheres = [];
27
+	protected $manualWheres = [];
28 28
 
29
-    protected $whereType = 'AND';
29
+	protected $whereType = 'AND';
30 30
     
31
-    function getWhere()
32
-    {
33
-        return $this->where;
34
-    }
35
-
36
-    function getLimit()
37
-    {
38
-        return $this->limit;
39
-    }
40
-
41
-    function getOfset()
42
-    {
43
-        return $this->ofset;
44
-    }
45
-
46
-    function getJoins()
47
-    {
48
-        return $this->joins;
49
-    }
50
-
51
-    function getOrder()
52
-    {
53
-        return $this->order;
54
-    }
55
-
56
-    function getManualJoins()
57
-    {
58
-        return $this->manualJoins;
59
-    }
60
-
61
-    function getGroup()
62
-    {
63
-        return $this->group;
64
-    }
65
-
66
-    function getManualWheres()
67
-    {
68
-        return $this->manualWheres;
69
-    }
70
-
71
-    function getWhereType()
72
-    {
73
-        return $this->whereType;
74
-    }
75
-
76
-    function setWhere($field,$value = false)
77
-    {
78
-        if($value!==false){
79
-            $this->where[$field] = $value;
80
-        }
81
-        else{
82
-            $this->where = $where;
83
-        }
31
+	function getWhere()
32
+	{
33
+		return $this->where;
34
+	}
35
+
36
+	function getLimit()
37
+	{
38
+		return $this->limit;
39
+	}
40
+
41
+	function getOfset()
42
+	{
43
+		return $this->ofset;
44
+	}
45
+
46
+	function getJoins()
47
+	{
48
+		return $this->joins;
49
+	}
50
+
51
+	function getOrder()
52
+	{
53
+		return $this->order;
54
+	}
55
+
56
+	function getManualJoins()
57
+	{
58
+		return $this->manualJoins;
59
+	}
60
+
61
+	function getGroup()
62
+	{
63
+		return $this->group;
64
+	}
65
+
66
+	function getManualWheres()
67
+	{
68
+		return $this->manualWheres;
69
+	}
70
+
71
+	function getWhereType()
72
+	{
73
+		return $this->whereType;
74
+	}
75
+
76
+	function setWhere($field,$value = false)
77
+	{
78
+		if($value!==false){
79
+			$this->where[$field] = $value;
80
+		}
81
+		else{
82
+			$this->where = $where;
83
+		}
84 84
         
85
-        return $this;
86
-    }
87
-
88
-    function setLimit($limit)
89
-    {
90
-        $this->limit = $limit;
91
-        return $this;
92
-    }
93
-
94
-    function setOfset($ofset)
95
-    {
96
-        $this->ofset = $ofset;
97
-        return $this;
98
-    }
99
-
100
-    function setJoins($joins)
101
-    {
102
-        $this->joins = $joins;
103
-        return $this;
104
-    }
105
-
106
-    function setOrder($order)
107
-    {
108
-        $this->order = $order;
109
-        return $this;
110
-    }
111
-
112
-    function setManualJoins($manualJoins)
113
-    {
114
-        $this->manualJoins = $manualJoins;
115
-        return $this;
116
-    }
117
-
118
-    function setGroup($group)
119
-    {
120
-        $this->group = $group;
121
-        return $this;
122
-    }
123
-
124
-    function setManualWheres($manualWheres)
125
-    {
126
-        $this->manualWheres = $manualWheres;
127
-        return $this;
128
-    }
129
-
130
-    function setWhereType($whereType)
131
-    {
132
-        $this->whereType = $whereType;
133
-        return $this;
134
-    }
135
-
136
-    /**
137
-     * Создание критериев
138
-     */
139
-    public function getCriteria()
140
-    {
85
+		return $this;
86
+	}
87
+
88
+	function setLimit($limit)
89
+	{
90
+		$this->limit = $limit;
91
+		return $this;
92
+	}
93
+
94
+	function setOfset($ofset)
95
+	{
96
+		$this->ofset = $ofset;
97
+		return $this;
98
+	}
99
+
100
+	function setJoins($joins)
101
+	{
102
+		$this->joins = $joins;
103
+		return $this;
104
+	}
105
+
106
+	function setOrder($order)
107
+	{
108
+		$this->order = $order;
109
+		return $this;
110
+	}
111
+
112
+	function setManualJoins($manualJoins)
113
+	{
114
+		$this->manualJoins = $manualJoins;
115
+		return $this;
116
+	}
117
+
118
+	function setGroup($group)
119
+	{
120
+		$this->group = $group;
121
+		return $this;
122
+	}
123
+
124
+	function setManualWheres($manualWheres)
125
+	{
126
+		$this->manualWheres = $manualWheres;
127
+		return $this;
128
+	}
129
+
130
+	function setWhereType($whereType)
131
+	{
132
+		$this->whereType = $whereType;
133
+		return $this;
134
+	}
135
+
136
+	/**
137
+	 * Создание критериев
138
+	 */
139
+	public function getCriteria()
140
+	{
141 141
         
142
-    }
142
+	}
143 143
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -73,12 +73,12 @@
 block discarded – undo
73 73
         return $this->whereType;
74 74
     }
75 75
 
76
-    function setWhere($field,$value = false)
76
+    function setWhere($field, $value = false)
77 77
     {
78
-        if($value!==false){
78
+        if ($value!==false) {
79 79
             $this->where[$field] = $value;
80 80
         }
81
-        else{
81
+        else {
82 82
             $this->where = $where;
83 83
         }
84 84
         
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,7 @@
 block discarded – undo
77 77
     {
78 78
         if($value!==false){
79 79
             $this->where[$field] = $value;
80
-        }
81
-        else{
80
+        } else{
82 81
             $this->where = $where;
83 82
         }
84 83
         
Please login to merge, or discard this patch.
src/RepositoryInterface.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -10,15 +10,15 @@
 block discarded – undo
10 10
 interface RepositoryInterface
11 11
 {
12 12
 
13
-    public function findById($id);
13
+	public function findById($id);
14 14
 
15
-    public function findBySpecification(ISpecificationCriteria $specification);
15
+	public function findBySpecification(ISpecificationCriteria $specification);
16 16
 
17
-    public function findAll();
17
+	public function findAll();
18 18
 
19
-    public function findAllBySpecification(ISpecificationCriteria $specification);
19
+	public function findAllBySpecification(ISpecificationCriteria $specification);
20 20
 
21
-    public function save(EntityInterface $Entity);
21
+	public function save(EntityInterface $Entity);
22 22
 
23
-    public function delete(EntityInterface $Entity);
23
+	public function delete(EntityInterface $Entity);
24 24
 }
Please login to merge, or discard this patch.
src/QueryBuilderInterface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@
 block discarded – undo
14 14
  */
15 15
 interface QueryBuilderInterface {
16 16
 	
17
-	public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria);
17
+	public function getResultQuery($table, \SimpleORM\ISpecificationCriteria $Criteria);
18 18
 	
19
-	public function update($table,array $data,$where = []);
19
+	public function update($table, array $data, $where = []);
20 20
 
21
-	public function insert($table,array $data);
21
+	public function insert($table, array $data);
22 22
 	
23 23
 	public function insert_id();
24 24
 	
25
-	public function delete($table,$where = []);
25
+	public function delete($table, $where = []);
26 26
 }
Please login to merge, or discard this patch.