dimaxz / SimpleORM

src/AbstractDataMapper.php

Doc Comments +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
 	
 	/**
 	 * Cохранение сущности
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 */
 	public function save(EntityInterface $Entity)
 	{
@@ -92,7 +92,7 @@ 
 	
 	/**
 	 * из объекта формирует массив
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
@@ -126,9 +126,9 @@ 
 	/**
 	 * Подготавливаем конечный вариант Сущности
 	 * 
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @param array $row
-	 * @return \Core\Infrastructure\EntityInterface
+	 * @return EntityInterface
 	 * @throws BadMethodCallException
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
@@ -172,7 +172,7 @@ 
 	
 	/**
 	 * 
-	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
+	 * @param ISpecificationCriteria $specification
 	 * @return type
 	 */
 	public function findBySpecification(ISpecificationCriteria $specification){
@@ -195,7 +195,7 @@ 
 	
 	/**
 	 * Удаление записи
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @return boolean
 	 */
 	public function delete(EntityInterface $Entity)
@@ -249,7 +249,7 @@ 
 	
 	/**
 	 * Выборка удаленных моделей
-	 * @param \Core\Infrastructure\ISpecificationCriteria $specification
+	 * @param ISpecificationCriteria $specification
 	 */
 	private function setSoftDelete(ISpecificationCriteria $specification){
 		if(

Braces +9 added lines, -10 removed lines

@@ -110,8 +110,7 @@ 
 			
 			if(method_exists($this, 'onUnBuild'.$propery )){
 				$value = $this->{'onUnBuild'.$propery}(  $Entity->{$method_get}() );
-			}
-			else{
+			} else{
 				$value = $Entity->{$method_get}();
 			}			
 			$row[$field] = $value;
@@ -146,13 +145,13 @@ 
 			//событие onBuildField
 			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)
-				$Entity->{$method_set}($value);
+			if($value!==false) {
+							$Entity->{$method_set}($value);
+			}
 			
         }
 		
@@ -206,8 +205,7 @@ 
 				$delete_key > '' && 
 				$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 );}
@@ -253,8 +251,9 @@ 
 		if(
 				$this->setSoftDeleteKey()>'' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
-				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+				) {
+				$specification->setWhere($this->setSoftDeleteKey(),0);
+		}
 	}
 	
 	/**

src/AbstractOptDataMapper.php

Doc Comments +3 added lines, -3 removed lines

@@ -79,9 +79,9 @@ 
 	/**
 	 * Подготавливаем конечный вариант Сущности
 	 * 
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @param array $row
-	 * @return \Core\Infrastructure\EntityInterface
+	 * @return EntityInterface
 	 * @throws BadMethodCallException
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
@@ -131,7 +131,7 @@ 
 	
 	/**
 	 * из объекта формирует массив
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */

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

src/Specification.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
     {
         if($value!==false){
             $this->where[$field] = $value;
-        }
-        else{
+        } else{
             $this->where = $where;
         }