dimaxz / SimpleORM

src/AbstractDataMapper.php

Spacing +59 added lines, -59 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,13 +105,13 @@ 
 	 * Уставнока таблицы
 	 */
 	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;
 	}	
 
 
     public function findById($id)
     {
-		$Criteria = (new Specification())->setWhere($this->key , $id);
+		$Criteria = (new Specification())->setWhere($this->key, $id);
 		
         return $this->findBySpecification($Criteria);
     }	
@@ -126,7 +126,7 @@ 
 		$data = $this->unbuildEntity($Entity);
 	
 		//protected function onAfterSave(\SimpleORM\EntityInterface $Entity, &$data)
-		if(method_exists($this, 'onAfterSave' )) $this->onAfterSave( $Entity, $data );
+		if (method_exists($this, 'onAfterSave')) $this->onAfterSave($Entity, $data);
 		
 		$id = $data[$this->getPrimaryKey()];
 		unset($data[$this->getPrimaryKey()]);		
@@ -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,13 +147,13 @@ 
 		//update
 		else {
 			
-			if(!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")){
+			if (!$this->getAdapter()->update($this->getEntityTable(), $data, "{$this->getPrimaryKey()} = '{$id}'")) {
 				return false;
 			}
 
 		}		
 		
-		if(method_exists($this, 'onBeforeSave' )) $this->onBeforeSave( $Entity );
+		if (method_exists($this, 'onBeforeSave')) $this->onBeforeSave($Entity);
 
 		
 		return true;
@@ -163,13 +163,13 @@ 
 	 * На успешное сохранение
 	 * @param \SimpleORM\EntityInterface $Entity
 	 */
-	protected function onBeforeSave(EntityInterface $Entity){
+	protected function onBeforeSave(EntityInterface $Entity) {
 		
 		foreach ($this->relations as $alias => $mapper) {
 		
 			$SaveEntity = $Entity->{'get'.$alias}();
 			
-			if(!$mapper->save($SaveEntity)){
+			if (!$mapper->save($SaveEntity)) {
 				throw new \Autoprice\Exceptions\EntityNotSaveException('Unable to save Entity!');
 			}
 			
@@ -187,9 +187,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!');
 				}
 			}
@@ -208,43 +208,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);
 			
         }
@@ -259,27 +259,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';
@@ -287,7 +287,7 @@ 
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
 			}			
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -303,22 +303,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'];
 		}
 		
@@ -345,7 +345,7 @@ 
 
 
 	
-	public function getFieldAlias($field){
+	public function getFieldAlias($field) {
 		
 		return $this->mapping_fields_aliases[$field];
 		
@@ -357,7 +357,7 @@ 
 	 * @param ISpecificationCriteria $specification
 	 * @return type
 	 */
-	public function findBySpecification(ISpecificationCriteria $specification){
+	public function findBySpecification(ISpecificationCriteria $specification) {
 
 		//псеводо удаление
 		$this->setSoftDelete($specification);
@@ -367,7 +367,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;
@@ -388,13 +388,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); }
 			}
 		}
 		
@@ -411,13 +411,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);
 		}
 		
@@ -433,13 +433,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);
 	}
 	
 	/**
@@ -450,12 +450,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']),
@@ -464,7 +464,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,
@@ -475,7 +475,7 @@ 
 			}
 		}	
 
-		if($this->use_joins===true){
+		if ($this->use_joins===true) {
 			$Specification->setJoins($joins);
 		}			
 	}
@@ -490,7 +490,7 @@ 
 		return $o;
 	}
 	
-	public function withDelete(){
+	public function withDelete() {
 		$o = clone $this;
 		$o->use_delete = true;
 		return $o;