dimaxz / SimpleORM

example/Domain/City/CityMapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * создаем сущность
 	 * 
 	 * @param array $row
-	 * @return type
+	 * @return \SimpleORM\EntityInterface
 	 */
 	public function createEntity(array $row) {
 		return $this->buildEntity(new City(), $row);

Unused Use Statements +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 
 namespace Test\Domain\City;
 
-use 
-	SimpleORM\AbstractDataMapper;
+use SimpleORM\AbstractDataMapper;
 
 /**
  * Description of PriceMapper

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 					'primary'	 => true
 					]
 				)
-				->addMappingField('name','cty_name')
+				->addMappingField('name', 'cty_name')
 			;
 
 	}	

example/Domain/User/User.php

Doc Comments +8 added lines

@@ -22,6 +22,11 @@ 
 	protected $group;
 	protected $address;
 			
+	/**
+	 * @param string $name
+	 * @param string $email
+	 * @param string $password
+	 */
 	function __construct($name, $email, $password, UserGroup $Group) {
 		$this->setName($name);
 		$this->setEmail($email);
@@ -64,6 +69,9 @@ 
 		$this->password = $password;
 	}
 
+	/**
+	 * @param UserGroup $group
+	 */
 	function setGroup($group) {
 		$this->group = $group;
 	}

example/Domain/UserAddress/UserAddressMapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * создаем сущность
 	 * 
 	 * @param array $row
-	 * @return type
+	 * @return \SimpleORM\EntityInterface
 	 */
 	public function createEntity(array $row) {
 		return $this->buildEntity(new UserAddress(), $row);

Unused Use Statements +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 
 namespace Test\Domain\UserAddress;
 
-use 
-	SimpleORM\AbstractDataMapper;
+use SimpleORM\AbstractDataMapper;
 
 /**
  * Description of PriceMapper

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 					'primary'	 => true
 					]
 				)
-				->addMappingField('code','adr_code')
+				->addMappingField('code', 'adr_code')
 				->addMappingField('street', 'adr_street')
 				->addMappingField('city', [
 					'field'		=> 'adr_cty_id',

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){
 		

Spacing +77 added lines, -77 removed lines

@@ -80,7 +80,7 @@ 
 		
 		$this->setEntityTable($db_name);
 		
-		if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){
+		if ($this->getEntityTable()=='' || $this->getPrimaryKey()=='') {
 			throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы');
 		}		
 		
@@ -92,7 +92,7 @@ 
         return $this->adapter;
     }
 
-	public function setAdapter(QueryBuilderInterface $adapter){
+	public function setAdapter(QueryBuilderInterface $adapter) {
 		 $this->adapter = $adapter;
 	}
 			
@@ -105,7 +105,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;
 	}	
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
     public function findById($id)
     {
-		$Criteria = (new Specification())->setWhere($this->key , $id);
+		$Criteria = (new Specification())->setWhere($this->key, $id);
 		
         return $this->findBySpecification($Criteria);
     }	
@@ -136,7 +136,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;
@@ -147,7 +147,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;
 			}
 
@@ -162,13 +162,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;
 	}
@@ -177,18 +177,18 @@ 
 	 * Событие перед сохранением
 	 * @param \SimpleORM\EntityInterface $Entity
 	 */
-	public function onAfterSave(EntityInterface $Entity){
+	public function onAfterSave(EntityInterface $Entity) {
 		
 		$this->getAdapter()->startTransaction();
 		
 		$rel_list = $this->createListRelation();
 
-		foreach ($rel_list as $mapper => $obj_path){
+		foreach ($rel_list as $mapper => $obj_path) {
 
-			$get_path = str_replace('#','->get','$o = $Entity'.$obj_path.';');
-			$set_path = str_replace(['#','();'],['->set','($o);'],'$Entity'.$obj_path.';');
-			eval($get_path);//получаем объект таким образом дабы не гулять по корневому объекту
-			if($this->DI->get($mapper)->saveWithoutEvents($o)){
+			$get_path = str_replace('#', '->get', '$o = $Entity'.$obj_path.';');
+			$set_path = str_replace(['#', '();'], ['->set', '($o);'], '$Entity'.$obj_path.';');
+			eval($get_path); //получаем объект таким образом дабы не гулять по корневому объекту
+			if ($this->DI->get($mapper)->saveWithoutEvents($o)) {
 				eval($set_path);
 			}
 			unset($o);
@@ -200,7 +200,7 @@ 
 	 * После успешного сохранения
 	 * @param \SimpleORM\EntityInterface $Entity
 	 */
-	protected function onBeforeSave(EntityInterface $Entity){
+	protected function onBeforeSave(EntityInterface $Entity) {
 		
 		$this->getAdapter()->endTransaction();
 		
@@ -223,12 +223,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;
 	}
@@ -238,17 +238,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 = $parent.'#'.$rel['alias'].'()';
 			
-			if(count($rel['relations'])>0){
-				$this->createListRelationReq($rel['relations'],$rel_list,$parent.'->get'.$rel['alias'].'()');
-				$rel_list [$rel['name']]= $obj_parent_link.$obj_link;
+			if (count($rel['relations']) > 0) {
+				$this->createListRelationReq($rel['relations'], $rel_list, $parent.'->get'.$rel['alias'].'()');
+				$rel_list [$rel['name']] = $obj_parent_link.$obj_link;
 			}
-			else{
+			else {
 				$rel_list [$rel['name']] = $obj_parent_link.$obj_link;
 			}
 		}
@@ -263,9 +263,9 @@ 
 		foreach ($this->relations as $alias => $cfg) {
 			$mapper = $cfg['mapper'];
 			//если связь один к одному то удаляем сущность
-			if($cgg['reltype'] == 'has_one'){
+			if ($cgg['reltype']=='has_one') {
 				$Entity = $Entity->{'get'.$alias}();
-				if(!$mapper->delete($Entity)){
+				if (!$mapper->delete($Entity)) {
 					throw new \Autoprice\Exceptions\EntityNotDeleteException('Unable to delete Entity!');
 				}
 			}
@@ -279,12 +279,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
@@ -308,43 +308,43 @@ 
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
-	protected function buildEntity(EntityInterface $Entity, array $row){
+	protected function buildEntity(EntityInterface $Entity, array $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'])) {
 				$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);
 				}
-				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);
 			
         }
@@ -359,27 +359,27 @@ 
 	 * @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) {
 			
 			$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'])){
+			elseif (isset($cfg['relation'])) {
 				
-				if(isset($cfg['on']))
+				if (isset($cfg['on']))
 					$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
 				else
 					$fkey = 'id';
@@ -387,7 +387,7 @@ 
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
 			}			
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -401,22 +401,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'];
 		}
 		
@@ -443,7 +443,7 @@ 
 
 
 	
-	public function getFieldAlias($field){
+	public function getFieldAlias($field) {
 		
 		return $this->mapping_fields_aliases[$field];
 		
@@ -455,7 +455,7 @@ 
 	 * @param ISpecificationCriteria $specification
 	 * @return type
 	 */
-	public function findBySpecification(ISpecificationCriteria $specification){
+	public function findBySpecification(ISpecificationCriteria $specification) {
 
 		//псеводо удаление
 		$this->setSoftDelete($specification);
@@ -465,7 +465,7 @@ 
 		$specification->setLimit(1);
 		
 		//получение записей
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
 
         if (!$row = $res->row_array()) {
             return null;
@@ -486,13 +486,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); }
 			}
 		}
 		
@@ -509,13 +509,13 @@ 
 		
 		$this->setRelations($specification);
 		
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
 		
 		if (!$rows = $res->result_array()) {
             return null;
         }	
 		
-		foreach($rows as $k =>  $row){
+		foreach ($rows as $k =>  $row) {
 			$rows[$k] = $this->createEntity($row);
 		}
 		
@@ -531,13 +531,13 @@ 
 	 * Выборка удаленных моделей
 	 * @param ISpecificationCriteria $specification
 	 */
-	private function setSoftDelete(ISpecificationCriteria $specification){
-		if(
-				$this->use_delete === false &&
-				$this->setSoftDeleteKey()>'' 
+	private 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);
 	}
 	
 	/**
@@ -548,12 +548,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'])) {
 				
 				$this->relations[$field] = [
 					'mapper'	=>	$mapper = $this->DI->get($cfg['relation']),
@@ -562,7 +562,7 @@ 
 
 				$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,
@@ -573,7 +573,7 @@ 
 			}
 		}	
 
-		if($this->use_joins===true){
+		if ($this->use_joins===true) {
 			$Specification->setJoins($joins);
 		}			
 	}
@@ -588,7 +588,7 @@ 
 		return $o;
 	}
 	
-	public function withDelete(){
+	public function withDelete() {
 		$o = clone $this;
 		$o->use_delete = true;
 		return $o;

Braces +24 added lines, -24 removed lines

@@ -162,13 +162,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;
 	}
@@ -247,8 +251,7 @@ 
 			if(count($rel['relations'])>0){
 				$this->createListRelationReq($rel['relations'],$rel_list,$parent.'->get'.$rel['alias'].'()');
 				$rel_list [$rel['name']]= $obj_parent_link.$obj_link;
-			}
-			else{
+			} else{
 				$rel_list [$rel['name']] = $obj_parent_link.$obj_link;
 			}
 		}
@@ -333,19 +336,18 @@ 
 				
 				if($this->use_joins===true || empty($row[$field])){
 					$value = $mapper->createEntity($row);
-				}
-				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);
+			}
 			
         }
 		
@@ -376,18 +378,17 @@ 
 			//--------------------------------------------------------------------
 			if( isset($cfg['unbuild']) && is_object($cfg['unbuild']) ){
 				$value = call_user_func($cfg['unbuild'], $Entity->{$method_get}() );
-			}
-			elseif(isset($cfg['relation'])){
+			} elseif(isset($cfg['relation'])){
 				
-				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}();
 			}			
 						
@@ -405,8 +406,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;
 		}
 	
@@ -488,8 +488,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 );}
@@ -536,8 +535,9 @@ 
 				$this->use_delete === false &&
 				$this->setSoftDeleteKey()>'' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
-				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+				) {
+				$specification->setWhere($this->setSoftDeleteKey(),0);
+		}
 	}
 	
 	/**

example/Domain/User/UserMapper.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function createEntity(array $row) {
 		$Group = $this->DI->get('UserGroupMapper')->createEntity([]);
-		return $this->buildEntity(new User('testname','mail@mail.ru','asdftyasdvh21267g',$Group), $row);
+		return $this->buildEntity(new User('testname', 'mail@mail.ru', 'asdftyasdvh21267g', $Group), $row);
 	}	
 	
 	/**
@@ -46,7 +46,7 @@ 
 					'primary'	 => true
 					]
 				)
-				->addMappingField('name','usr_name')
+				->addMappingField('name', 'usr_name')
 				->addMappingField('email', 'usr_email')
 				->addMappingField('password', 'usr_password')
 				->addMappingField('group', [

example/Domain/UserAddress/UserAddress.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	
 	protected $city;
 
-	function __construct(\Test\Domain\City\City $City,$code,$street) {
+	function __construct(\Test\Domain\City\City $City, $code, $street) {
 		$this->setCity($City);
 		$this->setCode($code);
 		$this->setStreet($street);

example/Domain/UserGroup/UserGroupMapper.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 	 * @return type
 	 */
 	public function createEntity(array $row) {
-		return $this->buildEntity(new UserGroup('admin','admin test'), $row);
+		return $this->buildEntity(new UserGroup('admin', 'admin test'), $row);
 	}	
 	
 	/**
@@ -45,8 +45,8 @@ 
 					'primary'	 => true
 					]
 				)
-				->addMappingField('title','grp_title')
-				->addMappingField('code','grp_code')
+				->addMappingField('title', 'grp_title')
+				->addMappingField('code', 'grp_code')
 			;
 
 	}	

example/ServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -24,20 +24,20 @@
 		
 		$db = new \SimpleORM\Adapter\CodeigniterQueryBuilder(get_instance()->db);
 		
-		$this->getContainer()->add('UserMapper','Test\Domain\User\UserMapper')
+		$this->getContainer()->add('UserMapper', 'Test\Domain\User\UserMapper')
 				->withArgument($this->getContainer())
 				->withArgument($db)
 				->withArgument($__AR2['autoresource_db']);
 		
-		$this->getContainer()->add('UserGroupMapper','Test\Domain\UserGroup\UserGroupMapper')
+		$this->getContainer()->add('UserGroupMapper', 'Test\Domain\UserGroup\UserGroupMapper')
 				->withArgument($this->getContainer())
 				->withArgument($db)
 				->withArgument($__AR2['autoresource_db']);	
-		$this->getContainer()->add('UserAddressMapper','Test\Domain\UserAddress\UserAddressMapper')
+		$this->getContainer()->add('UserAddressMapper', 'Test\Domain\UserAddress\UserAddressMapper')
 				->withArgument($this->getContainer())
 				->withArgument($db)
 				->withArgument($__AR2['autoresource_db']);	
-		$this->getContainer()->add('CityMapper','Test\Domain\City\CityMapper')
+		$this->getContainer()->add('CityMapper', 'Test\Domain\City\CityMapper')
 				->withArgument($this->getContainer())
 				->withArgument($db)
 				->withArgument($__AR2['autoresource_db']);