dimaxz / SimpleORM

src/AbstractOptDataMapper.php

Indentation +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
 		
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$value = false;
 			
@@ -132,9 +132,9 @@ 
 			if($value!==false)
 				$Entity->{$method_set}($value);
 			
-        }
+		}
 		
-        return $Entity;		
+		return $Entity;		
 	}	
 
 	
@@ -148,7 +148,7 @@ 
 		
 		$row = [];
 
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$field = $cfg['field'];
 			
@@ -178,9 +178,9 @@ 
 						
 			$row[$field] = $value;
 
-        }
+		}
 
-        return $row;		
+		return $row;		
 	}	
 	
 	
@@ -191,8 +191,8 @@ 
 	}
 
 		/**
-	 * Построение join-ов
-	 */
+		 * Построение join-ов
+		 */
 	protected function setRelations(ISpecificationCriteria $Specification){
 
 		$joins = [];

Spacing +36 added lines, -36 removed lines

@@ -12,7 +12,7 @@ 
  *
  * @author d.lanec
  */
-abstract class AbstractOptDataMapper extends AbstractDataMapper{
+abstract class AbstractOptDataMapper extends AbstractDataMapper {
 	
 	protected $soft_delete_key;
 	
@@ -40,22 +40,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'])){
-			$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'];
 		}
 		
@@ -93,43 +93,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);
 			
         }
@@ -144,27 +144,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';
@@ -172,7 +172,7 @@ 
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
 			}			
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -184,7 +184,7 @@ 
 	}	
 	
 	
-	public function getFieldAlias($field){
+	public function getFieldAlias($field) {
 		
 		return $this->mapping_fields_aliases[$field];
 		
@@ -193,18 +193,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,
@@ -215,7 +215,7 @@ 
 			}
 		}	
 
-		if($this->use_joins===true){
+		if ($this->use_joins===true) {
 			$Specification->setJoins($joins);
 		}			
 	}	
@@ -224,12 +224,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!');
 			}
 		}
@@ -244,7 +244,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 +13 added lines, -16 removed lines

@@ -44,8 +44,7 @@ 
 		
 		if(is_string($field)){
 			$field = ['field'	=>	$field];
-		}
-		elseif(is_array($field) && !isset($field['field'])){
+		} elseif(is_array($field) && !isset($field['field'])){
 			$field['field']	= $alias;
 		}
 	
@@ -118,19 +117,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);
+			}
 			
         }
 		
@@ -161,18 +159,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}();
 			}			
 						

src/AbstractDataMapper.php

Spacing +42 added lines, -42 removed lines

@@ -24,14 +24,14 @@ 
 	
 	protected $use_delete = false;
 
-	public function __construct( QueryBuilderInterface $adapter, $db_name = null) {// \CI_DB_mysqli_driver //DatabaseAdapterInterface
+	public function __construct(QueryBuilderInterface $adapter, $db_name = null) {// \CI_DB_mysqli_driver //DatabaseAdapterInterface
         $this->db = $adapter;
 		
-		$this->entityTable = !empty($db_name)? "$db_name.".$this->setEntityTable() : $this->setEntityTable();
+		$this->entityTable = !empty($db_name) ? "$db_name.".$this->setEntityTable() : $this->setEntityTable();
 		
 		//$this->key = $this->getKey();
 	
-		if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){
+		if ($this->getEntityTable()=='' || $this->getPrimaryKey()=='') {
 			throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы');
 		}
     }
@@ -48,7 +48,7 @@ 
 
     public function findById($id)
     {
-		$Criteria = (new Specification())->setWhere($this->key , $id);
+		$Criteria = (new Specification())->setWhere($this->key, $id);
 		
         return $this->findBySpecification($Criteria);
     }	
@@ -70,7 +70,7 @@ 
 			
 			unset($data[$this->setSoftDeleteKey()]);
 			
-			$this->db->insert($this->getEntityTable(),$data);
+			$this->db->insert($this->getEntityTable(), $data);
 			
 			if (!$id = $this->db->insert_id()) {
 				return false;
@@ -81,13 +81,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, 'onSaveSuccess' )){ return $this->onSaveSuccess( $Entity );}
+		if (method_exists($this, 'onSaveSuccess')) { return $this->onSaveSuccess($Entity); }
 		
 		return true;
 	}
@@ -98,24 +98,24 @@ 
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
-	protected function unbuildEntity(EntityInterface $Entity){
+	protected function unbuildEntity(EntityInterface $Entity) {
 		
-		$mapfileds = array_merge([ 'id' => $this->key], $this->setMappingFields());
+		$mapfileds = array_merge(['id' => $this->key], $this->setMappingFields());
 
 		$row = [];
 		
-        foreach ($mapfileds as $propery => $field ) {
+        foreach ($mapfileds as $propery => $field) {
 			
-			$method_get = 'get' . ucfirst($propery);
+			$method_get = 'get'.ucfirst($propery);
 			
-			if(!method_exists($Entity, $method_get )){
+			if (!method_exists($Entity, $method_get)) {
 				throw new BadMethodCallException("Метод {$method_get}  не определен");
 			}		
 			
-			if(method_exists($this, 'onUnBuild'.$propery )){
-				$value = $this->{'onUnBuild'.$propery}(  $Entity->{$method_get}() );
+			if (method_exists($this, 'onUnBuild'.$propery)) {
+				$value = $this->{'onUnBuild'.$propery}($Entity->{$method_get}());
 			}
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 			$row[$field] = $value;
@@ -133,29 +133,29 @@ 
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
-	protected function buildEntity(EntityInterface $Entity, array $row){
+	protected function buildEntity(EntityInterface $Entity, array $row) {
 		
-		$mapfields = array_merge([ 'id' => $this->key], $this->setMappingFields());
+		$mapfields = array_merge(['id' => $this->key], $this->setMappingFields());
 
-        foreach ($mapfields as $propery => $field ) {
+        foreach ($mapfields as $propery => $field) {
 			
 			$value = false;
 			
-			$method_set = 'set' . ucfirst($propery);
+			$method_set = 'set'.ucfirst($propery);
 			
-			if(!method_exists($Entity, $method_set )){
+			if (!method_exists($Entity, $method_set)) {
 				throw new BadMethodCallException("Метод {$method_set}  не определен");
 			}			
 			
 			//событие onBuildField
-			if(method_exists($this, 'onBuild'.$propery )){
-				$value = $this->{'onBuild'.$propery}($field,$row);
+			if (method_exists($this, 'onBuild'.$propery)) {
+				$value = $this->{'onBuild'.$propery}($field, $row);
 			}
-			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);
 			
         }
@@ -177,7 +177,7 @@ 
 	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
 	 * @return type
 	 */
-	public function findBySpecification(ISpecificationCriteria $specification){
+	public function findBySpecification(ISpecificationCriteria $specification) {
 
 		//псеводо удаление
 		$this->setSoftDelete($specification);
@@ -187,7 +187,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;
@@ -208,13 +208,13 @@ 
 		
 		if (
 				$delete_key > '' && 
-				$Entity->getId() > 0){
-				$result = $this->db->update($this->getEntityTable(), [ $delete_key => 1 ], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
+				$Entity->getId() > 0) {
+				$result = $this->db->update($this->getEntityTable(), [$delete_key => 1], "{$this->getPrimaryKey()} = '{$Entity->getId()}'");
 		}
-		elseif($Entity->getId() > 0){
+		elseif ($Entity->getId() > 0) {
 			
-			if($result = $this->db->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())){
-				if(method_exists($this, 'onDeleteSuccess' )){ $result = $this->onDeleteSuccess( $Entity );}
+			if ($result = $this->db->delete($this->getEntityTable(), $this->getPrimaryKey()."  = ".$Entity->getId())) {
+				if (method_exists($this, 'onDeleteSuccess')) { $result = $this->onDeleteSuccess($Entity); }
 			}
 		}
 		
@@ -231,13 +231,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);
 		}
 		
@@ -253,23 +253,23 @@ 
 	 * Выборка удаленных моделей
 	 * @param \Core\Infrastructure\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);
 	}
 	
 	/**
 	 * Построение join-ов
 	 */
-	protected function setRelations(ISpecificationCriteria $Specification){
-		if($this->use_joins===true){
+	protected function setRelations(ISpecificationCriteria $Specification) {
+		if ($this->use_joins===true) {
 			$joins = [];
 			
-			foreach($this->setJoins() as $join){
+			foreach ($this->setJoins() as $join) {
 				$table = (new $join['mapper']($this->getAdapter()))->setEntityTable();
 				
 				$joins[$table] = $join;
@@ -290,7 +290,7 @@ 
 		return $o;
 	}
 	
-	public function withDelete(){
+	public function withDelete() {
 		$o = clone $this;
 		$o->use_delete = true;
 		return $o;

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);	
 }