dimaxz / SimpleORM

src/AbstractOptDataMapper.php

Spacing +37 added lines, -37 removed lines

@@ -12,7 +12,7 @@ 
  *
  * @author d.lanec
  */
-abstract class AbstractOptDataMapper extends AbstractDataMapper{
+abstract class AbstractOptDataMapper extends AbstractDataMapper {
 	
 	protected $soft_delete_key;
 	
@@ -40,25 +40,25 @@ 
 	/**
 	 * Установка поля для маппинга
 	 */
-	protected function addMappingField($alias,$field = null){
+	protected function addMappingField($alias, $field = null) {
 		
-		if(is_string($field)){
+		if (is_string($field)) {
 			$field = ['field'	=>	$field];
 		}
-		elseif(empty($field)){
+		elseif (empty($field)) {
 			$field = ['field'	=>	$alias];
 		}
-		elseif(is_array($field) && !isset($field['field'])){
-			$field['field']	= $alias;
+		elseif (is_array($field) && !isset($field['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'];
 		}
 		
@@ -96,43 +96,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){
+				if ($this->use_joins===true) {
 					$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);
 			
         }
@@ -147,27 +147,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';
@@ -175,7 +175,7 @@ 
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
 			}			
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -187,7 +187,7 @@ 
 	}	
 	
 	
-	public function getFieldAlias($field){
+	public function getFieldAlias($field) {
 		
 		return $this->mapping_fields_aliases[$field];
 		
@@ -196,18 +196,18 @@ 
 		/**
 	 * Построение join-ов
 	 */
-	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 = $this->DI->get($cfg['relation']);
 
 				$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,
@@ -218,7 +218,7 @@ 
 			}
 		}	
 
-		if($this->use_joins===true){
+		if ($this->use_joins===true) {
 			$Specification->setJoins($joins);
 		}			
 	}	
@@ -227,12 +227,12 @@ 
 	 * На успешное сохранение
 	 * @param \SimpleORM\EntityInterface $Entity
 	 */
-	protected function onSaveSuccess(EntityInterface $Entity){
+	protected function onSaveSuccess(EntityInterface $Entity) {
 		
 		
 		foreach ($this->relations as $alias => $mapper) {
 			$Entity = $Entity->{'get'.$alias}();
-			if(!$mapper->save($Entity)){
+			if (!$mapper->save($Entity)) {
 				throw new \Autoprice\Exceptions\EntityNotSaveException('Unable to save Entity!');
 			}
 		}
@@ -247,7 +247,7 @@ 
 	protected function onDeleteSuccess(EntityInterface $Entity) {
 		foreach ($this->relations as $alias => $mapper) {
 			$Entity = $Entity->{'get'.$alias}();
-			if(!$mapper->delete($Entity)){
+			if (!$mapper->delete($Entity)) {
 				throw new \Autoprice\Exceptions\EntityNotDeleteException('Unable to delete Entity!');
 			}
 		}

Braces +14 added lines, -18 removed lines

@@ -44,11 +44,9 @@ 
 		
 		if(is_string($field)){
 			$field = ['field'	=>	$field];
-		}
-		elseif(empty($field)){
+		} elseif(empty($field)){
 			$field = ['field'	=>	$alias];
-		}
-		elseif(is_array($field) && !isset($field['field'])){
+		} elseif(is_array($field) && !isset($field['field'])){
 			$field['field']	= $alias;
 		}
 	
@@ -121,19 +119,18 @@ 
 				
 				if($this->use_joins===true){
 					$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);
+			}
 			
         }
 		
@@ -164,18 +161,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}();
 			}