dimaxz / SimpleORM

src/AbstractDataMapper.php

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);
+		}
 	}
 	
 	/**

src/AbstractEntity.php

Indentation +16 added lines, -16 removed lines

@@ -10,29 +10,29 @@
 abstract class AbstractEntity implements EntityInterface
 {
 
-    protected $id;
+	protected $id;
 	
 	protected $deleted;
 
 	public function getId()
-    {
-        return $this->id;
-    }
+	{
+		return $this->id;
+	}
 
-    public function setId($id)
-    {
-        if ($this->id !== null) {
-            throw new BadMethodCallException(
-                "Идентификатор у сущности уже установлен");
-        }
+	public function setId($id)
+	{
+		if ($this->id !== null) {
+			throw new BadMethodCallException(
+				"Идентификатор у сущности уже установлен");
+		}
  
-        if (empty($id)) {//$id < 1
-            throw new InvalidArgumentException("Неверный индентификатор");
-        }
+		if (empty($id)) {//$id < 1
+			throw new InvalidArgumentException("Неверный индентификатор");
+		}
  
-        $this->id = $id;
-        return $this;		
-    }
+		$this->id = $id;
+		return $this;		
+	}
 	
 	public function setDeleted($deleted){
 		$this->deleted = $deleted;