dimaxz / SimpleORM

src/Specification.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	protected $manualSelect;
 
 	
-	static public function create(){
+	static public function create() {
 		return new SELF;
 	}
 	
@@ -93,7 +93,7 @@ 
 
 	function setWhere($field, $value = false)
 	{
-		if ($value !== false) {
+		if ($value!==false) {
 			$this->where[$field] = $value;
 		} else {
 			$this->where = $field;

src/AbstractDataMapper.php

Spacing +73 added lines, -73 removed lines

@@ -90,7 +90,7 @@ 
 		
 		$this->setEntityTable($db_name);
 		
-		if($this->getEntityTable()=='' || $this->getPrimaryKey()==''){
+		if ($this->getEntityTable()=='' || $this->getPrimaryKey()=='') {
 			throw new InvalidEntityPropertyException('Свойства entityTable или key не заданы');
 		}		
 		
@@ -102,7 +102,7 @@ 
         return $this->adapter;
     }
 
-	public function setAdapter(QueryBuilderInterface $adapter){
+	public function setAdapter(QueryBuilderInterface $adapter) {
 		 $this->adapter = $adapter;
 	}
 			
@@ -115,7 +115,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;
 	}	
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
     public function findById($id)
     {
-		$Criteria = (new Specification())->setWhere($this->key , $id);
+		$Criteria = (new Specification())->setWhere($this->key, $id);
 		
         return $this->findBySpecification($Criteria);
     }	
@@ -138,7 +138,7 @@ 
 		
 		$data = $this->unbuildEntity($Entity);
 		
-		if(method_exists($this, 'onPrepareData' )) $this->onPrepareData( $Entity , $data );
+		if (method_exists($this, 'onPrepareData')) $this->onPrepareData($Entity, $data);
 		
 		$id = $data[$this->getPrimaryKey()];
 		unset($data[$this->getPrimaryKey()]);		
@@ -148,7 +148,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;
@@ -159,7 +159,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;
 			}
 
@@ -174,13 +174,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;
 	}
@@ -190,12 +190,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;
 	}
@@ -205,17 +205,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 = '#'.$rel['alias'].'()';
 			
-			if(count($rel['relations'])>0){
-				$this->createListRelationReq($rel['relations'],$rel_list,$obj_parent_link.'get'.$rel['alias'].'()');
-				$rel_list [$obj_parent_link.$obj_link]= $rel['name'];
+			if (count($rel['relations']) > 0) {
+				$this->createListRelationReq($rel['relations'], $rel_list, $obj_parent_link.'get'.$rel['alias'].'()');
+				$rel_list [$obj_parent_link.$obj_link] = $rel['name'];
 			}
-			else{
+			else {
 				$rel_list [$obj_parent_link.$obj_link] = $rel['name'];
 			}
 		}
@@ -225,12 +225,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
@@ -254,23 +254,23 @@ 
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
-	protected function buildEntity(EntityInterface $Entity, array $row){
+	protected function buildEntity(EntityInterface $Entity, array $row) {
 	//ed($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'])) {
 				
 //				ed([
 //					get_class($Entity),
@@ -281,11 +281,11 @@ 
 				$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);
 					
@@ -296,17 +296,17 @@ 
 //					]);
 
 				}
-				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);
 			
         }
@@ -321,11 +321,11 @@ 
 	 * @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) {
 			
 			//автоопределени формата массива
 //			if(isset($row[$this->key])){
@@ -336,19 +336,19 @@ 
 //			}			
 			$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']) && is_object($Entity->{$method_get}()) ){
+			elseif (isset($cfg['relation']) && is_object($Entity->{$method_get}())) {
 				
-				if(isset($cfg['on']))
+				if (isset($cfg['on']))
 					$fkey = $this->DI->get($cfg['relation'])->getFieldAlias($cfg['on']);
 				else
 					$fkey = 'id';
@@ -356,7 +356,7 @@ 
 				$value = $Entity->{$method_get}()->{'get'.$fkey}();
 				
 			}			
-			else{
+			else {
 				$value = $Entity->{$method_get}();
 			}			
 						
@@ -370,22 +370,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'];
 		}
 		
@@ -416,7 +416,7 @@ 
 	 * @param type $field
 	 * @return type
 	 */
-	public function getFieldAlias($field){
+	public function getFieldAlias($field) {
 		return $this->mapping_fields_aliases[$field];		
 	}	
 	
@@ -436,7 +436,7 @@ 
 	 * @param ISpecificationCriteria $specification
 	 * @return type
 	 */
-	public function findBySpecification(ISpecificationCriteria $specification){
+	public function findBySpecification(ISpecificationCriteria $specification) {
 
 		//псеводо удаление
 		$this->setSoftDelete($specification);
@@ -446,13 +446,13 @@ 
 		$specification->setLimit(1);
 		
 		//получение записей
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
 
         if (!$row = $res->row_array()) {
             return null;
         }
 		
-		if($this->result_array===true){
+		if ($this->result_array===true) {
 			return $row;
 		}
 		
@@ -473,13 +473,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); }
 			}
 		}
 		
@@ -496,17 +496,17 @@ 
 		
 		$this->setRelations($specification);
 		
-		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
+		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(), $specification);
 		
 		if (!$rows = $res->result_array()) {
             return null;
         }	
 		
-		if($this->result_array===true){
+		if ($this->result_array===true) {
 			return $rows;
 		}		
 		
-		foreach($rows as $k =>  $row){
+		foreach ($rows as $k =>  $row) {
 			$rows[$k] = $this->createEntity($row);
 		}
 		
@@ -522,13 +522,13 @@ 
 	 * Выборка удаленных моделей
 	 * @param ISpecificationCriteria $specification
 	 */
-	protected function setSoftDelete(ISpecificationCriteria $specification){
-		if(
-				$this->use_delete === false &&
-				$this->setSoftDeleteKey()>'' 
+	protected 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);
 	}
 	
 	/**
@@ -539,12 +539,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'])) {
 				
 				$reltype = isset($cfg['reltype']) ? $cfg['reltype'] : 'belongs_to';
 				
@@ -555,18 +555,18 @@ 
 
 				$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,
-						'type'	=> $reltype != 'has_many' ? 'INNER' : 'LEFT OUTER',
+						'type'	=> $reltype!='has_many' ? 'INNER' : 'LEFT OUTER',
 						'on'	=> "`{$this->table}`.{$cfg['field']} = `{$field}`.{$relation_key}"
 				];
 
 			}
 		}	
 
-		if($this->use_joins===true){
+		if ($this->use_joins===true) {
 			$Specification->setJoins($joins);
 		}			
 	}
@@ -581,7 +581,7 @@ 
 		return $o;
 	}
 	
-	public function withDelete(){
+	public function withDelete() {
 		$o = clone $this;
 		$o->use_delete = true;
 		return $o;
@@ -591,7 +591,7 @@ 
 	 * Данные только в массиве
 	 * @return \SimpleORM\AbstractDataMapper
 	 */
-	public function resultArray(){
+	public function resultArray() {
 		$o = clone $this;
 		$o->result_array = true;
 		return $o;