dimaxz / SimpleORM

src/ISpecificationCriteria.php

Indentation +18 added lines, -18 removed lines

@@ -10,43 +10,43 @@
  */
 interface ISpecificationCriteria
 {
-    public function getCriteria();
+	public function getCriteria();
 	
 	public function getWhere();
 
-    public function getLimit();
+	public function getLimit();
 
-    public function getOfset();
+	public function getOfset();
 
-    public function getJoins();
+	public function getJoins();
 
-    public function getOrder();
+	public function getOrder();
 
-    public function getManualJoins();
+	public function getManualJoins();
 
-    public function getGroup();
+	public function getGroup();
 
-    public function getManualWheres();
+	public function getManualWheres();
 
-    public function getWhereType();    
+	public function getWhereType();    
 
-    public function setWhere($field,$value = false);    
+	public function setWhere($field,$value = false);    
 
-    public function setLimit($limit);
+	public function setLimit($limit);
 
-    public function setOfset($ofset);
+	public function setOfset($ofset);
 
-    public function setJoins($joins);    
+	public function setJoins($joins);    
 
-    public function setOrder($order);
+	public function setOrder($order);
 
-    public function setManualJoins($manualJoins);
+	public function setManualJoins($manualJoins);
 
-    public function setGroup($group);
+	public function setGroup($group);
 
-    public function setManualWheres($manualWheres);
+	public function setManualWheres($manualWheres);
 	
-    public function setWhereType($whereType);
+	public function setWhereType($whereType);
 	
 }
 

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     public function getWhereType();    
 
-    public function setWhere($field,$value = false);    
+    public function setWhere($field, $value = false);    
 
     public function setLimit($limit);
 

src/RepositoryInterface.php

Indentation +6 added lines, -6 removed lines

@@ -10,15 +10,15 @@
 interface RepositoryInterface
 {
 
-    public function findById($id);
+	public function findById($id);
 
-    public function findBySpecification(ISpecificationCriteria $specification);
+	public function findBySpecification(ISpecificationCriteria $specification);
 
-    public function findAll();
+	public function findAll();
 
-    public function findAllBySpecification(ISpecificationCriteria $specification);
+	public function findAllBySpecification(ISpecificationCriteria $specification);
 
-    public function save(EntityInterface $Entity);
+	public function save(EntityInterface $Entity);
 
-    public function delete(EntityInterface $Entity);
+	public function delete(EntityInterface $Entity);
 }

src/QueryBuilderInterface.php

Spacing +4 added lines, -4 removed lines

@@ -14,13 +14,13 @@
  */
 interface QueryBuilderInterface {
 	
-	public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria);
+	public function getResultQuery($table, \SimpleORM\ISpecificationCriteria $Criteria);
 	
-	public function update($table,array $data,$where = []);
+	public function update($table, array $data, $where = []);
 
-	public function insert($table,array $data);
+	public function insert($table, array $data);
 	
 	public function insert_id();
 	
-	public function delete($table,$where = []);
+	public function delete($table, $where = []);
 }

src/EntityInterface.php

Indentation +5 added lines, -5 removed lines

@@ -8,12 +8,12 @@
  */
 interface EntityInterface
 {
-    //put your code here
-    public function getId();
+	//put your code here
+	public function getId();
     
-    public function setId($id);
+	public function setId($id);
 	
-    public function getDeleted();
+	public function getDeleted();
     
-    public function setDeleted($delete);	
+	public function setDeleted($delete);	
 }

src/Adapter/CodeigniterQueryBuilder.php

Braces +2 added lines, -4 removed lines

@@ -71,8 +71,7 @@ 
 
 		if(!$like){
 			return $this->adapter->escape_str($str);
-		}
-		else{
+		} else{
 			return $this->adapter->escape_like_str($str);
 		}	
 		
@@ -145,8 +144,7 @@ 
 		if(preg_match('~(.*?)\.(.*?)$~is',$table,$m)){
 			$this->database = $m[1];
 			$this->TableName = $m[2];
-		}
-		else{
+		} else{
 			$this->TableName = $table;
 		}		
 	}	

Doc Comments +6 added lines, -3 removed lines

@@ -66,6 +66,9 @@ 
 		return $this->adapter->delete($table,$where);
 	}
 
+	/**
+	 * @param string $str
+	 */
 	protected function escape_str($str, $like = FALSE)
 	{
 
@@ -120,7 +123,6 @@ 
 	
 	/**
 	 * 
-	 * @param type $param
 	 */
 	public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria ) {
 		
@@ -156,6 +158,7 @@ 
 	/**
 	 * Создает селект не только для основной таблицы но и для приджойненых таблиц
 	 * @param type $joins
+	 * @param string $manualSelect
 	 * @return type
 	 */
 	protected function createSelect(array $joins,$manualSelect)
@@ -173,8 +176,8 @@ 
 	/**
 	 * Получение записей по условию
 	 * @param type $where
-	 * @param type $limit
-	 * @param type $offset
+	 * @param integer $limit
+	 * @param integer $offset
 	 * @param type $joins
 	 * @param type $order
 	 * @param type $manualJoins

Spacing +54 added lines, -54 removed lines

@@ -38,9 +38,9 @@ 
 	protected function escape($str)
 	{
 		if (is_string($str)) {
-			$str = "'" . $this->escape_str($str) . "'";
+			$str = "'".$this->escape_str($str)."'";
 		} elseif (is_bool($str)) {
-			$str = ($str === FALSE) ? 0 : 1;
+			$str = ($str===FALSE) ? 0 : 1;
 		} elseif (is_null($str)) {
 			$str = 'NULL';
 		}
@@ -48,13 +48,13 @@ 
 		return $str;
 	}
 	
-	public function update($table,array $data,$where = []){
-		return $this->adapter->update($table,$data,$where);
+	public function update($table, array $data, $where = []) {
+		return $this->adapter->update($table, $data, $where);
 	}
 	
-	public function insert($table,array $data)
+	public function insert($table, array $data)
 	{
-		return $this->adapter->insert($table,$data);
+		return $this->adapter->insert($table, $data);
 	}
 	
 	public function insert_id()
@@ -62,17 +62,17 @@ 
 		return $this->adapter->insert_id();
 	}
 
-	public function delete($table,$where = []){
-		return $this->adapter->delete($table,$where);
+	public function delete($table, $where = []) {
+		return $this->adapter->delete($table, $where);
 	}
 
 	protected function escape_str($str, $like = FALSE)
 	{
 
-		if(!$like){
+		if (!$like) {
 			return $this->adapter->escape_str($str);
 		}
-		else{
+		else {
 			return $this->adapter->escape_like_str($str);
 		}	
 		
@@ -111,8 +111,8 @@ 
 			throw new HttpException('You cannot have an empty field name.');
 		}
 
-		if (strpos($field, '.') === false) {
-			return $this->TableName . '.' . $field;
+		if (strpos($field, '.')===false) {
+			return $this->TableName.'.'.$field;
 		}
 
 		return $field;
@@ -122,7 +122,7 @@ 
 	 * 
 	 * @param type $param
 	 */
-	public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria ) {
+	public function getResultQuery($table, \SimpleORM\ISpecificationCriteria $Criteria) {
 		
 		$this->setTable($table);
 		
@@ -142,12 +142,12 @@ 
 		return $res;		
 	}
 
-	protected function setTable($table){
-		if(preg_match('~(.*?)\.(.*?)$~is',$table,$m)){
+	protected function setTable($table) {
+		if (preg_match('~(.*?)\.(.*?)$~is', $table, $m)) {
 			$this->database = $m[1];
 			$this->TableName = $m[2];
 		}
-		else{
+		else {
 			$this->TableName = $table;
 		}		
 	}	
@@ -158,12 +158,12 @@ 
 	 * @param type $joins
 	 * @return type
 	 */
-	protected function createSelect(array $joins,$manualSelect)
+	protected function createSelect(array $joins, $manualSelect)
 	{
-		$s = !empty($manualSelect) ? $manualSelect :"`" . $this->TableName . '`.*';
+		$s = !empty($manualSelect) ? $manualSelect : "`".$this->TableName.'`.*';
 		
 		foreach ($joins as $table => $join) {
-			$table = isset($join['alias']) ? "`{$join['alias']}`": $table;
+			$table = isset($join['alias']) ? "`{$join['alias']}`" : $table;
 			$s .= ", $table.*";
 		}
 		return $s;
@@ -186,8 +186,8 @@ 
 	 */
 	protected function buildQuery($where = array(), $limit = 25, $offset = 0, $joins = array(), $order = array(), $manualJoins = array(), $group = null, $manualWheres = array(), $whereType = 'AND', $manualSelect = '')
 	{
-		$table = !empty($this->database)? "`{$this->database}`.".$this->TableName : $this->TableName;
-		$query = 'SELECT ' . $this->createSelect($joins, $manualSelect) . " FROM `".$table."`";
+		$table = !empty($this->database) ? "`{$this->database}`.".$this->TableName : $this->TableName;
+		$query = 'SELECT '.$this->createSelect($joins, $manualSelect)." FROM `".$table."`";
 		//$countQuery = "SELECT COUNT(*) AS cnt FROM `{$this->database}`.".$this->getTableName();
 
 		$wheres = array();
@@ -197,15 +197,15 @@ 
 
 			if (!is_array($value)) {
 				$params[] = $value;
-				$wheres[] = $key . ' = ?';
+				$wheres[] = $key.' = ?';
 			} else {
 				if (isset($value['operator'])) {
 					if (is_array($value['value'])) {
-						if ($value['operator'] == 'between') {
+						if ($value['operator']=='between') {
 							$params[] = $value['value'][0];
 							$params[] = $value['value'][1];
-							$wheres[] = $key . ' BETWEEN ? AND ?';
-						} elseif ($value['operator'] == 'IN') {
+							$wheres[] = $key.' BETWEEN ? AND ?';
+						} elseif ($value['operator']=='IN') {
 							$in = array();
 
 							foreach ($value['value'] as $item) {
@@ -213,67 +213,67 @@ 
 								$in[] = '?';
 							}
 
-							$wheres[] = $key . ' IN (' . implode(', ', $in) . ') ';
+							$wheres[] = $key.' IN ('.implode(', ', $in).') ';
 						} else {
 							$ors = array();
 							foreach ($value['value'] as $item) {
-								if ($item == 'null') {
+								if ($item=='null') {
 									switch ($value['operator']) {
 										case '!=':
-											$ors[] = $key . ' IS NOT NULL';
+											$ors[] = $key.' IS NOT NULL';
 											break;
 
 										case '==':
 										default:
-											$ors[] = $key . ' IS NULL';
+											$ors[] = $key.' IS NULL';
 											break;
 									}
 								} else {
 									$params[] = $item;
-									$ors[] = $this->fieldCheck($key) . ' ' . $value['operator'] . ' ?';
+									$ors[] = $this->fieldCheck($key).' '.$value['operator'].' ?';
 								}
 							}
-							$wheres[] = '(' . implode(' OR ', $ors) . ')';
+							$wheres[] = '('.implode(' OR ', $ors).')';
 						}
 					} else {
-						if ($value['operator'] == 'like') {
-							$params[] = '%' . $value['value'] . '%';
-							$wheres[] = $key . ' ' . $value['operator'] . ' ?';
+						if ($value['operator']=='like') {
+							$params[] = '%'.$value['value'].'%';
+							$wheres[] = $key.' '.$value['operator'].' ?';
 						} else {
-							if ($value['value'] === 'null') {
+							if ($value['value']==='null') {
 								switch ($value['operator']) {
 									case '!=':
-										$wheres[] = $key . ' IS NOT NULL';
+										$wheres[] = $key.' IS NOT NULL';
 										break;
 
 									case '==':
 									default:
-										$wheres[] = $key . ' IS NULL';
+										$wheres[] = $key.' IS NULL';
 										break;
 								}
 							} else {
 								$params[] = $value['value'];
-								$wheres[] = $key . ' ' . $value['operator'] . ' ?';
+								$wheres[] = $key.' '.$value['operator'].' ?';
 							}
 						}
 					}
 				} else {
-					$wheres[] = $key . ' IN (' . implode(', ', array_map(array($this, 'escape'), $value)) . ')';
+					$wheres[] = $key.' IN ('.implode(', ', array_map(array($this, 'escape'), $value)).')';
 				}
 			}
 		}
 
 		if (count($joins)) {
 			foreach ($joins as $table => $join) {
-				$type = isset($join['type'])?$join['type']:'INNER';
-				$query .= ' '. $type.' JOIN `' . $table . '` as `' . $join['alias'] . '` ON ' . $join['on'] . ' ';
+				$type = isset($join['type']) ? $join['type'] : 'INNER';
+				$query .= ' '.$type.' JOIN `'.$table.'` as `'.$join['alias'].'` ON '.$join['on'].' ';
 				//$countQuery .= ' '.$type.' JOIN ' . $table . ' ' . $join['alias'] . ' ON ' . $join['on'] . ' ';
 			}
 		}
 
 		if (count($manualJoins)) {
 			foreach ($manualJoins as $join) {
-				$query .= ' ' . $join . ' ';
+				$query .= ' '.$join.' ';
 				//$countQuery .= ' ' . $join . ' ';
 			}
 		}
@@ -281,7 +281,7 @@ 
 		$hasWhere = false;
 		if (count($wheres)) {
 			$hasWhere = true;
-			$query .= ' WHERE (' . implode(' ' . $whereType . ' ', $wheres) . ')';
+			$query .= ' WHERE ('.implode(' '.$whereType.' ', $wheres).')';
 			//$countQuery .= ' WHERE (' . implode(' ' . $whereType . ' ', $wheres) . ')';
 		}
 
@@ -292,11 +292,11 @@ 
 					$query .= ' WHERE ';
 					//$countQuery .= ' WHERE ';
 				} else {
-					$query .= ' ' . $where['type'] . ' ';
+					$query .= ' '.$where['type'].' ';
 					//$countQuery .= ' ' . $where['type'] . ' ';
 				}
 
-				$query .= ' ' . $where['query'];
+				$query .= ' '.$where['query'];
 				//$countQuery .= ' ' . $where['query'];
 
 				if (isset($where['params'])) {
@@ -308,28 +308,28 @@ 
 		}
 
 		if (!is_null($group)) {
-			$query .= ' GROUP BY ' . $group . ' ';
+			$query .= ' GROUP BY '.$group.' ';
 		}
 
 		if (count($order)) {
 			$orders = array();
-			if (is_string($order) && $order == 'rand') {
+			if (is_string($order) && $order=='rand') {
 				$query .= ' ORDER BY RAND() ';
 			} else {
 				foreach ($order as $key => $value) {
-					$orders[] = $this->fieldCheck($key) . ' ' . $value;
+					$orders[] = $this->fieldCheck($key).' '.$value;
 				}
 
-				$query .= ' ORDER BY ' . implode(', ', $orders);
+				$query .= ' ORDER BY '.implode(', ', $orders);
 			}
 		}
 
 		if ($limit) {
-			$query .= ' LIMIT ' . $limit;
+			$query .= ' LIMIT '.$limit;
 		}
 
 		if ($offset) {
-			$query .= ' OFFSET ' . $offset;
+			$query .= ' OFFSET '.$offset;
 		}
 
 
@@ -347,7 +347,7 @@ 
 		try {
 			//$query = $this->compile_binds($query, $params);
 			
-			return $this->adapter->query($query,$params);
+			return $this->adapter->query($query, $params);
 			//ed( $this->adapter->query($query) ,1);
 //			if ($res = $this->adapter->getRows($query)) {
 //				$rtn = array();
@@ -361,7 +361,7 @@ 
 //			} else {
 //				return false;
 //			}
-		} catch(\PDOException $ex) {
+		} catch (\PDOException $ex) {
 			throw $ex;
 		}
 	}	
@@ -376,7 +376,7 @@ 
 	 */
 	protected function compile_binds($sql, $binds)
 	{
-		if (strpos($sql, $this->bind_marker) === FALSE) {
+		if (strpos($sql, $this->bind_marker)===FALSE) {
 			return $sql;
 		}
 

tests/src/AbstractDataMapperTest.php

Indentation +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 	}		
 	
 	/**
@@ -77,7 +77,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 	}		
 
 	/**
@@ -98,7 +98,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 	}	
 	
 	/**
@@ -121,7 +121,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 		
 		$key_field = \TestHelper::getProtectedAttribute($this->object,'key');
 		$this->assertEquals($key_field, 'tb_mayfield');	
@@ -147,7 +147,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 		
 		$soft_delete_key = \TestHelper::getProtectedAttribute($this->object,'soft_delete_key');
 		$this->assertEquals($soft_delete_key, 'tb_mayfield');	

Spacing +25 added lines, -25 removed lines

@@ -28,7 +28,7 @@ 
 //								])//в конструктор
 						->disableOriginalConstructor()
 						//->setMethods(null)
-						->setMethods(['setMappingFields','createEntity'])
+						->setMethods(['setMappingFields', 'createEntity'])
 						//->setMethods(null) //не использовать заглушки методов иначе буде возвращать NULL
 						->getMock();
 	}
@@ -45,9 +45,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_SimpleField(){
+	public function testAddMappingField_SimpleField() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield']);
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield']);
 		
 		$correct = [
 			  'myfield'	=>	[
@@ -56,7 +56,7 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 	}		
@@ -64,9 +64,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_FieldAndAlias(){
+	public function testAddMappingField_FieldAndAlias() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield','tb_mayfield']);
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', 'tb_mayfield']);
 		
 		$correct = [
 			  'myfield'	=>	[
@@ -75,7 +75,7 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 	}		
@@ -83,9 +83,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_ArrayField(){
+	public function testAddMappingField_ArrayField() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield',[
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [
 			'field'	=>	'tb_mayfield'
 		]]);
 		
@@ -96,7 +96,7 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 	}	
@@ -104,9 +104,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_PrimaryKey(){
+	public function testAddMappingField_PrimaryKey() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield',[
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [
 			'field'		=>	'tb_mayfield',
 			'primary'	=>	true
 		]]);
@@ -119,20 +119,20 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 		
-		$key_field = \TestHelper::getProtectedAttribute($this->object,'key');
+		$key_field = \TestHelper::getProtectedAttribute($this->object, 'key');
 		$this->assertEquals($key_field, 'tb_mayfield');	
 	}	
 	
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_SoftDelete(){
+	public function testAddMappingField_SoftDelete() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield',[
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [
 			'field'			=>	'tb_mayfield',
 			'softdelete'	=>	true
 		]]);
@@ -145,11 +145,11 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 		
-		$soft_delete_key = \TestHelper::getProtectedAttribute($this->object,'soft_delete_key');
+		$soft_delete_key = \TestHelper::getProtectedAttribute($this->object, 'soft_delete_key');
 		$this->assertEquals($soft_delete_key, 'tb_mayfield');	
 	}	
 	
@@ -158,8 +158,8 @@ 
 	 */
 	public function testGetPrimaryKey()
 	{
-		\TestHelper::setValueprotectedProperty($this->object,'key','tst_id');
-		$this->assertEquals(\TestHelper::callMethod($this->object,'GetPrimaryKey'), 'tst_id');	
+		\TestHelper::setValueprotectedProperty($this->object, 'key', 'tst_id');
+		$this->assertEquals(\TestHelper::callMethod($this->object, 'GetPrimaryKey'), 'tst_id');	
 	}
 	
 	/**
@@ -167,19 +167,19 @@ 
 	 */
 	public function testsetSoftDeleteKey()
 	{
-		\TestHelper::setValueprotectedProperty($this->object,'soft_delete_key','stc_deleted');
-		$this->assertEquals(\TestHelper::callMethod($this->object,'setSoftDeleteKey'), 'stc_deleted');	
+		\TestHelper::setValueprotectedProperty($this->object, 'soft_delete_key', 'stc_deleted');
+		$this->assertEquals(\TestHelper::callMethod($this->object, 'setSoftDeleteKey'), 'stc_deleted');	
 	}	
 	
 	/**
 	 *  @covers SimpleORM\AbstractDataMapper::getFieldAlias
 	 */
-	public function testGetFieldAlias(){
+	public function testGetFieldAlias() {
 		$mapping_fields_aliases = [
 			'name'	=>	'stc_fullname'
 		];
-		\TestHelper::setValueprotectedProperty($this->object,'mapping_fields_aliases',$mapping_fields_aliases);
-		$this->assertEquals(\TestHelper::callMethod($this->object,'getFieldAlias',['name']), 'stc_fullname');
+		\TestHelper::setValueprotectedProperty($this->object, 'mapping_fields_aliases', $mapping_fields_aliases);
+		$this->assertEquals(\TestHelper::callMethod($this->object, 'getFieldAlias', ['name']), 'stc_fullname');
 	}
 	
 	

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 $loader = require_once __DIR__.'/../vendor/autoload.php';
 
-class TestHelper{
+class TestHelper {
     
     /**
      * получение защищенного свойства

Doc Comments +9 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
     
     /**
      * получение защищенного свойства
-     * @param type $o
-     * @param type $name
+     * @param string $name
+     * @param SimpleORM\AbstractDataMapper $obj
      * @return type
      */
     static public function getProtectedAttribute($obj, $name)
@@ -19,8 +19,9 @@ 
 
     /**
      * Добавление значения в защищенное свойтсво
-     * @param type $name
-     * @param type $valued 
+     * @param string $name
+     * @param type $value
+     * @param SimpleORM\AbstractDataMapper $obj 
      */
     static public function setValueprotectedProperty($obj, $name, $value)
     {
@@ -30,6 +31,10 @@ 
         $r->setValue($obj, $value); //изменяем значение
     }    
 	
+	/**
+	 * @param SimpleORM\AbstractDataMapper $obj
+	 * @param string $name
+	 */
 	static public function callMethod($obj, $name, array $args = []) {
         $class = new \ReflectionClass($obj);
         $method = $class->getMethod($name);

Indentation +30 added lines, -30 removed lines

@@ -3,38 +3,38 @@
 
 class TestHelper{
     
-    /**
-     * получение защищенного свойства
-     * @param type $o
-     * @param type $name
-     * @return type
-     */
-    static public function getProtectedAttribute($obj, $name)
-    {
-        $reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
-        $r = $reflectionClass->getProperty($name); //получаем свойство
-        $r->setAccessible(true); //делаем открытым
-        return $r->getValue($obj);
-    }
+	/**
+	 * получение защищенного свойства
+	 * @param type $o
+	 * @param type $name
+	 * @return type
+	 */
+	static public function getProtectedAttribute($obj, $name)
+	{
+		$reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
+		$r = $reflectionClass->getProperty($name); //получаем свойство
+		$r->setAccessible(true); //делаем открытым
+		return $r->getValue($obj);
+	}
 
-    /**
-     * Добавление значения в защищенное свойтсво
-     * @param type $name
-     * @param type $valued 
-     */
-    static public function setValueprotectedProperty($obj, $name, $value)
-    {
-        $reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
-        $r = $reflectionClass->getProperty($name); //получаем свойство
-        $r->setAccessible(true); //делаем открытым
-        $r->setValue($obj, $value); //изменяем значение
-    }    
+	/**
+	 * Добавление значения в защищенное свойтсво
+	 * @param type $name
+	 * @param type $valued 
+	 */
+	static public function setValueprotectedProperty($obj, $name, $value)
+	{
+		$reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
+		$r = $reflectionClass->getProperty($name); //получаем свойство
+		$r->setAccessible(true); //делаем открытым
+		$r->setValue($obj, $value); //изменяем значение
+	}    
 	
 	static public function callMethod($obj, $name, array $args = []) {
-        $class = new \ReflectionClass($obj);
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($obj, $args);
-    }	
+		$class = new \ReflectionClass($obj);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
+		return $method->invokeArgs($obj, $args);
+	}	
     
 }

example/Domain/UserGroup/UserGroup.php

Doc Comments +4 added lines

@@ -18,6 +18,10 @@
 	
 	protected $title;
 	
+	/**
+	 * @param string $code
+	 * @param string $title
+	 */
 	function __construct($code,$title){
 		$this->setCode($code);
 		$this->setTitle($title);

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	
 	protected $title;
 	
-	function __construct($code,$title){
+	function __construct($code, $title) {
 		$this->setCode($code);
 		$this->setTitle($title);
 	}

src/AbstractDataMapper.php

Doc Comments +4 added lines, -3 removed lines

@@ -303,9 +303,9 @@ 
 	/**
 	 * Подготавливаем конечный вариант Сущности
 	 * 
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @param array $row
-	 * @return \Core\Infrastructure\EntityInterface
+	 * @return EntityInterface
 	 * @throws BadMethodCallException
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
@@ -355,7 +355,7 @@ 
 	
 	/**
 	 * из объекта формирует массив
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
@@ -400,6 +400,7 @@ 
 	
 	/**
 	 * Установка поля для маппинга
+	 * @param string $alias
 	 */
 	protected function addMappingField($alias,$field = null){
 		

Indentation +19 added lines, -19 removed lines

@@ -23,7 +23,7 @@ 
 	 * таблица для сущности
 	 * @var type 
 	 */
-    protected $entityTable;	
+	protected $entityTable;	
 
 	/**
 	 * первичный ключ
@@ -98,9 +98,9 @@ 
 	
 	abstract protected function setMappingFields();	
 	
-    public function getAdapter() {
-        return $this->adapter;
-    }
+	public function getAdapter() {
+		return $this->adapter;
+	}
 
 	public function setAdapter(QueryBuilderInterface $adapter){
 		 $this->adapter = $adapter;
@@ -123,12 +123,12 @@ 
 	 * @param type $id
 	 * @return type
 	 */
-    public function findById($id)
-    {
+	public function findById($id)
+	{
 		$Criteria = (new Specification())->setWhere($this->key , $id);
 		
-        return $this->findBySpecification($Criteria);
-    }	
+		return $this->findBySpecification($Criteria);
+	}	
 	
 	/**
 	 * Сохранение сущности без спобытий
@@ -256,7 +256,7 @@ 
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
 		
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$value = false;
 			
@@ -299,9 +299,9 @@ 
 			if($value!==false)
 				$Entity->{$method_set}($value);
 			
-        }
+		}
 				
-        return $Entity;		
+		return $Entity;		
 	}	
 
 	
@@ -315,7 +315,7 @@ 
 		
 		$row = [];
 
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$field = $cfg['field'];
 			
@@ -345,9 +345,9 @@ 
 						
 			$row[$field] = $value;
 
-        }
+		}
 			
-        return $row;		
+		return $row;		
 	}	
 	
 	/**
@@ -431,9 +431,9 @@ 
 		//получение записей
 		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
 
-        if (!$row = $res->row_array()) {
-            return null;
-        }
+		if (!$row = $res->row_array()) {
+			return null;
+		}
 		
 		if($this->result_array===true){
 			return $row;
@@ -482,8 +482,8 @@ 
 		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
 		
 		if (!$rows = $res->result_array()) {
-            return null;
-        }	
+			return null;
+		}	
 		
 		if($this->result_array===true){
 			return $rows;

Braces +27 added lines, -25 removed lines

@@ -138,7 +138,9 @@ 
 		
 		$data = $this->unbuildEntity($Entity);
 		
-		if(method_exists($this, 'onPrepareData' )) $this->onPrepareData( $Entity , $data );
+		if(method_exists($this, 'onPrepareData' )) {
+			$this->onPrepareData( $Entity , $data );
+		}
 		
 		$id = $data[$this->getPrimaryKey()];
 		unset($data[$this->getPrimaryKey()]);		
@@ -174,13 +176,17 @@ 
 	 */
 	public function save(EntityInterface $Entity)
 	{
-		if(method_exists($this, 'onAfterSave' )) $this->onAfterSave( $Entity );
+		if(method_exists($this, 'onAfterSave' )) {
+			$this->onAfterSave( $Entity );
+		}
 		
 		if(!$this->saveWithoutEvents($Entity)){
 			return false;
 		}
 		
-		if(method_exists($this, 'onBeforeSave' )) $this->onBeforeSave( $Entity );
+		if(method_exists($this, 'onBeforeSave' )) {
+			$this->onBeforeSave( $Entity );
+		}
 
 		return true;
 	}
@@ -214,8 +220,7 @@ 
 			if(count($rel['relations'])>0){
 				$this->createListRelationReq($rel['relations'],$rel_list,$obj_parent_link.'get'.$rel['alias'].'()');
 				$rel_list [$obj_parent_link.$obj_link]= $rel['name'];
-			}
-			else{
+			} else{
 				$rel_list [$obj_parent_link.$obj_link] = $rel['name'];
 			}
 		}
@@ -295,19 +300,18 @@ 
 //						$value
 //					]);
 
-				}
-				else{
+				} else{
 					$fkey = isset($cfg['on']) ? $cfg['on'] :$mapper->key;
 					$value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field]));
 				}				
 				
-			}
-			elseif(is_string($field) && isset($row[strtolower($field)])){				
+			} elseif(is_string($field) && isset($row[strtolower($field)])){				
 				$value = $row[strtolower($field)];
 			}
 						
-			if($value!==false)
-				$Entity->{$method_set}($value);
+			if($value!==false) {
+							$Entity->{$method_set}($value);
+			}
 			
         }
 				
@@ -345,18 +349,17 @@ 
 			//--------------------------------------------------------------------
 			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
 				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
-			}
-			elseif(isset($cfg['relation']) && is_object($Entity->{$method_get}()) ){
+			} elseif(isset($cfg['relation']) && is_object($Entity->{$method_get}()) ){
 				
-				if(isset($cfg['on']))
-					$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
-				else
-					$fkey = 'id';
+				if(isset($cfg['on'])) {
+									$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
+				} else {
+									$fkey = 'id';
+				}
 				
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
-			}			
-			else{
+			} else{
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -374,8 +377,7 @@ 
 		
 		if(is_string($field)){
 			$field = ['field'	=>	$field];
-		}
-		elseif( (is_array($field) && !isset($field['field'])) || empty($field)){
+		} elseif( (is_array($field) && !isset($field['field'])) || empty($field)){
 			$field['field']	= $alias;
 		}
 	
@@ -475,8 +477,7 @@ 
 				$delete_key > '' && 
 				$Entity->getId() > 0){
 				$result = $this->getAdapter()->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
-		}
-		elseif($Entity->getId() > 0){
+		} elseif($Entity->getId() > 0){
 			
 			if($result = $this->getAdapter()->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())){
 				if(method_exists($this, 'onBeforeDelete' )){ $result = $this->onBeforeDelete( $Entity );}
@@ -527,8 +528,9 @@ 
 				$this->use_delete === false &&
 				$this->setSoftDeleteKey()>'' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
-				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+				) {
+				$specification->setWhere($this->setSoftDeleteKey(),0);
+		}
 	}
 	
 	/**

Spacing +73 added lines, -73 removed lines

@@ -90,7 +90,7 @@ 
 		
 		$this->setEntityTable($db_name);
 		
-		if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){
+		if ($this->getEntityTable()=='' || $this->getPrimaryKey()=='') {
 			throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы');
 		}		
 		
@@ -102,7 +102,7 @@ 
         return $this->adapter;
     }
 
-	public function setAdapter(QueryBuilderInterface $adapter){
+	public function setAdapter(QueryBuilderInterface $adapter) {
 		 $this->adapter = $adapter;
 	}
 			
@@ -115,7 +115,7 @@ 
 	 * Уставнока таблицы
 	 */
 	protected function setEntityTable($db_name) {
-		$this->entityTable = !empty($db_name)? "$db_name.".$this->table : $this->table;
+		$this->entityTable = !empty($db_name) ? "$db_name.".$this->table : $this->table;
 	}	
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
     public function findById($id)
     {
-		$Criteria = (new Specification())->setWhere($this->key , $id);
+		$Criteria = (new Specification())->setWhere($this->key, $id);
 		
         return $this->findBySpecification($Criteria);
     }	
@@ -138,7 +138,7 @@ 
 		
 		$data = $this->unbuildEntity($Entity);
 		
-		if(method_exists($this, 'onPrepareData' )) $this->onPrepareData( $Entity , $data );
+		if (method_exists($this, 'onPrepareData')) $this->onPrepareData($Entity, $data);
 		
 		$id = $data[$this->getPrimaryKey()];
 		unset($data[$this->getPrimaryKey()]);		
@@ -148,7 +148,7 @@ 
 			
 			unset($data[$this->setSoftDeleteKey()]);
 			
-			$this->getAdapter()->insert($this->getEntityTable(),$data);
+			$this->getAdapter()->insert($this->getEntityTable(), $data);
 			
 			if (!$id = $this->getAdapter()->insert_id()) {
 				return false;
@@ -159,7 +159,7 @@ 
 		//update
 		else {
 			
-			if(!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")){
+			if (!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")) {
 				return false;
 			}
 
@@ -174,13 +174,13 @@ 
 	 */
 	public function save(EntityInterface $Entity)
 	{
-		if(method_exists($this, 'onAfterSave' )) $this->onAfterSave( $Entity );
+		if (method_exists($this, 'onAfterSave')) $this->onAfterSave($Entity);
 		
-		if(!$this->saveWithoutEvents($Entity)){
+		if (!$this->saveWithoutEvents($Entity)) {
 			return false;
 		}
 		
-		if(method_exists($this, 'onBeforeSave' )) $this->onBeforeSave( $Entity );
+		if (method_exists($this, 'onBeforeSave')) $this->onBeforeSave($Entity);
 
 		return true;
 	}
@@ -190,12 +190,12 @@ 
 	 * получение мапперов в порядке их использования с учетом вложенности
 	 * @return array
 	 */
-	protected function createListRelation(){
+	protected function createListRelation() {
 		$rel_list = [];
 		
 		$rel_map = $this->getRelations();
 		
-		$this->createListRelationReq($rel_map,$rel_list);
+		$this->createListRelationReq($rel_map, $rel_list);
 		
 		return $rel_list;
 	}
@@ -205,17 +205,17 @@ 
 	 * @param array $rel_map
 	 * @param type $rel_list
 	 */
-	protected function createListRelationReq(array $rel_map,&$rel_list,$obj_parent_link = null) {
+	protected function createListRelationReq(array $rel_map, &$rel_list, $obj_parent_link = null) {
 		
-		foreach ($rel_map as $rel){
+		foreach ($rel_map as $rel) {
 			
 			$obj_link = '#'.$rel['alias'].'()';
 			
-			if(count($rel['relations'])>0){
-				$this->createListRelationReq($rel['relations'],$rel_list,$obj_parent_link.'get'.$rel['alias'].'()');
-				$rel_list [$obj_parent_link.$obj_link]= $rel['name'];
+			if (count($rel['relations']) > 0) {
+				$this->createListRelationReq($rel['relations'], $rel_list, $obj_parent_link.'get'.$rel['alias'].'()');
+				$rel_list [$obj_parent_link.$obj_link] = $rel['name'];
 			}
-			else{
+			else {
 				$rel_list [$obj_parent_link.$obj_link] = $rel['name'];
 			}
 		}
@@ -225,12 +225,12 @@ 
 	/**
 	 * получить связи
 	 */
-	protected function getRelations(){
+	protected function getRelations() {
 		$rel_map = [];
-		foreach ($this->mapping_fields as $field => $cfg){
-			if(isset($cfg['relation'])){		
+		foreach ($this->mapping_fields as $field => $cfg) {
+			if (isset($cfg['relation'])) {		
 				$rels = $this->DI->get($cfg['relation'])->getRelations();
-				$rel_map []= [
+				$rel_map [] = [
 					'name'		=>	$cfg['relation'],
 					'alias'		=>	$field,
 					'relations'	=>	$rels
@@ -254,23 +254,23 @@ 
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
-	protected function buildEntity(EntityInterface $Entity, array $row){
+	protected function buildEntity(EntityInterface $Entity, array $row) {
 	//ed($row);
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+        foreach ($this->mapping_fields as $alias => $cfg) {
 			
 			$value = false;
 			
 			//автоопределени формата массива
 			$field = $cfg['field'];
 			
-			$method_set = 'set' . ucfirst($alias);
+			$method_set = 'set'.ucfirst($alias);
 			
-			if(!method_exists($Entity, $method_set )){
+			if (!method_exists($Entity, $method_set)) {
 				throw new BadMethodCallException("Метод {$method_set}  не определен");
 			}			
 			
 			//событие на формирование поля
-			if( isset($cfg['build']) && is_object($cfg['build']) ){
+			if (isset($cfg['build']) && is_object($cfg['build'])) {
 				
 //				ed([
 //					get_class($Entity),
@@ -281,11 +281,11 @@ 
 				$value = call_user_func($cfg['build'], $row);
 			}
 			//на связь
-			elseif(isset($cfg['relation'])){
+			elseif (isset($cfg['relation'])) {
 				
 				$mapper = $this->DI->get($cfg['relation']);
 				
-				if($this->use_joins===true || empty($row[$field])){
+				if ($this->use_joins===true || empty($row[$field])) {
 					
 					$value = $mapper->createEntity($row);
 					
@@ -296,17 +296,17 @@ 
 //					]);
 
 				}
-				else{
-					$fkey = isset($cfg['on']) ? $cfg['on'] :$mapper->key;
+				else {
+					$fkey = isset($cfg['on']) ? $cfg['on'] : $mapper->key;
 					$value = $mapper->findBySpecification((new Specification)->setWhere($fkey, $row[$field]));
 				}				
 				
 			}
-			elseif(is_string($field) && isset($row[strtolower($field)])){				
+			elseif (is_string($field) && isset($row[strtolower($field)])) {				
 				$value = $row[strtolower($field)];
 			}
 						
-			if($value!==false)
+			if ($value!==false)
 				$Entity->{$method_set}($value);
 			
         }
@@ -321,11 +321,11 @@ 
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
-	protected function unbuildEntity(EntityInterface $Entity){
+	protected function unbuildEntity(EntityInterface $Entity) {
 		
 		$row = [];
 
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+        foreach ($this->mapping_fields as $alias => $cfg) {
 			
 			//автоопределени формата массива
 //			if(isset($row[$this->key])){
@@ -336,19 +336,19 @@ 
 //			}			
 			$field = $cfg['field'];
 			
-			$method_get = 'get' . ucfirst($alias);
+			$method_get = 'get'.ucfirst($alias);
 			
-			if(!method_exists($Entity, $method_get )){
+			if (!method_exists($Entity, $method_get)) {
 				throw new BadMethodCallException("Метод {$method_get}  не определен");
 			}		
 			
 			//--------------------------------------------------------------------
-			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
-				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
+			if (isset($cfg['unbuild']) && is_object($cfg['unbuild'])) {
+				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}());
 			}
-			elseif(isset($cfg['relation']) && is_object($Entity->{$method_get}()) ){
+			elseif (isset($cfg['relation']) && is_object($Entity->{$method_get}())) {
 				
-				if(isset($cfg['on']))
+				if (isset($cfg['on']))
 					$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
 				else
 					$fkey = 'id';
@@ -356,7 +356,7 @@ 
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
 			}			
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -370,22 +370,22 @@ 
 	/**
 	 * Установка поля для маппинга
 	 */
-	protected function addMappingField($alias,$field = null){
+	protected function addMappingField($alias, $field = null) {
 		
-		if(is_string($field)){
+		if (is_string($field)) {
 			$field = ['field'	=>	$field];
 		}
-		elseif( (is_array($field) && !isset($field['field'])) || empty($field)){
-			$field['field']	= $alias;
+		elseif ((is_array($field) && !isset($field['field'])) || empty($field)) {
+			$field['field'] = $alias;
 		}
 	
 		$this->mapping_fields[$alias] = $field;
 
-		if(isset($field['primary']) && $field['primary']===true){
+		if (isset($field['primary']) && $field['primary']===true) {
 			$this->key = $field['field'];
 		}
 		
-		if(isset($field['softdelete']) && $field['softdelete']===true){
+		if (isset($field['softdelete']) && $field['softdelete']===true) {
 			$this->soft_delete_key = $field['field'];
 		}
 		
@@ -416,7 +416,7 @@ 
 	 * @param type $field
 	 * @return type
 	 */
-	public function getFieldAlias($field){
+	public function getFieldAlias($field) {
 		return $this->mapping_fields_aliases[$field];		
 	}	
 	
@@ -436,7 +436,7 @@ 
 	 * @param ISpecificationCriteria $specification
 	 * @return type
 	 */
-	public function findBySpecification(ISpecificationCriteria $specification){
+	public function findBySpecification(ISpecificationCriteria $specification) {
 
 		//псеводо удаление
 		$this->setSoftDelete($specification);
@@ -446,13 +446,13 @@ 
 		$specification->setLimit(1);
 		
 		//получение записей
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
 
         if (!$row = $res->row_array()) {
             return null;
         }
 		
-		if($this->result_array===true){
+		if ($this->result_array===true) {
 			return $row;
 		}
 		
@@ -473,13 +473,13 @@ 
 		
 		if (
 				$delete_key > '' && 
-				$Entity->getId() > 0){
-				$result = $this->getAdapter()->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
+				$Entity->getId() > 0) {
+				$result = $this->getAdapter()->update($this->getEntityTable(), [$delete_key => 1], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
 		}
-		elseif($Entity->getId() > 0){
+		elseif ($Entity->getId() > 0) {
 			
-			if($result = $this->getAdapter()->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())){
-				if(method_exists($this, 'onBeforeDelete' )){ $result = $this->onBeforeDelete( $Entity );}
+			if ($result = $this->getAdapter()->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())) {
+				if (method_exists($this, 'onBeforeDelete')) { $result = $this->onBeforeDelete($Entity); }
 			}
 		}
 		
@@ -496,17 +496,17 @@ 
 		
 		$this->setRelations($specification);
 		
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
 		
 		if (!$rows = $res->result_array()) {
             return null;
         }	
 		
-		if($this->result_array===true){
+		if ($this->result_array===true) {
 			return $rows;
 		}		
 		
-		foreach($rows as $k =>  $row){
+		foreach ($rows as $k =>  $row) {
 			$rows[$k] = $this->createEntity($row);
 		}
 		
@@ -522,13 +522,13 @@ 
 	 * Выборка удаленных моделей
 	 * @param ISpecificationCriteria $specification
 	 */
-	protected function setSoftDelete(ISpecificationCriteria $specification){
-		if(
-				$this->use_delete === false &&
-				$this->setSoftDeleteKey()>'' 
+	protected function setSoftDelete(ISpecificationCriteria $specification) {
+		if (
+				$this->use_delete===false &&
+				$this->setSoftDeleteKey() > '' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
 				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+		$specification->setWhere($this->setSoftDeleteKey(), 0);
 	}
 	
 	/**
@@ -539,12 +539,12 @@ 
 	 * belongs_to - многие к многим (пользователь имет множество оплат одного заказа)
 	 * has_one - один к одному
 	 */
-	protected function setRelations(ISpecificationCriteria $Specification){
+	protected function setRelations(ISpecificationCriteria $Specification) {
 
 		$joins = [];
 
-		foreach ($this->mapping_fields as $field => $cfg){
-			if(isset($cfg['relation'])){
+		foreach ($this->mapping_fields as $field => $cfg) {
+			if (isset($cfg['relation'])) {
 				
 				$reltype = isset($cfg['reltype']) ? $cfg['reltype'] : 'belongs_to';
 				
@@ -555,18 +555,18 @@ 
 
 				$table = $mapper->getEntityTable();
 
-				$relation_key = isset($cfg['on'])? $cfg['on'] : $mapper->key;
+				$relation_key = isset($cfg['on']) ? $cfg['on'] : $mapper->key;
 				
 				$joins[$table] = [
 						'alias'	=> $field,
-						'type'	=> $reltype != 'has_many' ? 'INNER' : 'LEFT OUTER',
+						'type'	=> $reltype!='has_many' ? 'INNER' : 'LEFT OUTER',
 						'on'	=> "`{$this->table}`.{$cfg['field']} = `{$field}`.{$relation_key}"
 				];
 
 			}
 		}	
 
-		if($this->use_joins===true){
+		if ($this->use_joins===true) {
 			$Specification->setJoins($joins);
 		}			
 	}
@@ -581,7 +581,7 @@ 
 		return $o;
 	}
 	
-	public function withDelete(){
+	public function withDelete() {
 		$o = clone $this;
 		$o->use_delete = true;
 		return $o;
@@ -591,7 +591,7 @@ 
 	 * Данные только в массиве
 	 * @return \SimpleORM\AbstractDataMapper
 	 */
-	public function resultArray(){
+	public function resultArray() {
 		$o = clone $this;
 		$o->result_array = true;
 		return $o;