dimaxz / SimpleORM

src/Adapter/CodeigniterQueryBuilder.php

Braces +2 added lines, -4 removed lines

@@ -71,8 +71,7 @@ 
 
 		if(!$like){
 			return $this->adapter->escape_str($str);
-		}
-		else{
+		} else{
 			return $this->adapter->escape_like_str($str);
 		}	
 		
@@ -145,8 +144,7 @@ 
 		if(preg_match('~(.*?)\.(.*?)$~is',$table,$m)){
 			$this->database = $m[1];
 			$this->TableName = $m[2];
-		}
-		else{
+		} else{
 			$this->TableName = $table;
 		}		
 	}	

Doc Comments +6 added lines, -3 removed lines

@@ -66,6 +66,9 @@ 
 		return $this->adapter->delete($table,$where);
 	}
 
+	/**
+	 * @param string $str
+	 */
 	protected function escape_str($str, $like = FALSE)
 	{
 
@@ -120,7 +123,6 @@ 
 	
 	/**
 	 * 
-	 * @param type $param
 	 */
 	public function getResultQuery($table,\SimpleORM\ISpecificationCriteria $Criteria ) {
 		
@@ -156,6 +158,7 @@ 
 	/**
 	 * Создает селект не только для основной таблицы но и для приджойненых таблиц
 	 * @param type $joins
+	 * @param string $manualSelect
 	 * @return type
 	 */
 	protected function createSelect(array $joins,$manualSelect)
@@ -173,8 +176,8 @@ 
 	/**
 	 * Получение записей по условию
 	 * @param type $where
-	 * @param type $limit
-	 * @param type $offset
+	 * @param integer $limit
+	 * @param integer $offset
 	 * @param type $joins
 	 * @param type $order
 	 * @param type $manualJoins

example/Domain/UserGroup/UserGroup.php

Doc Comments +4 added lines

@@ -18,6 +18,10 @@
 	
 	protected $title;
 	
+	/**
+	 * @param string $code
+	 * @param string $title
+	 */
 	function __construct($code,$title){
 		$this->setCode($code);
 		$this->setTitle($title);

src/AbstractDataMapper.php

Doc Comments +4 added lines, -3 removed lines

@@ -303,9 +303,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){
@@ -355,7 +355,7 @@ 
 	
 	/**
 	 * из объекта формирует массив
-	 * @param \Core\Infrastructure\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @return \Core\Infrastructure\EntityInterface
 	 * @throws BadMethodCallException
 	 */
@@ -400,6 +400,7 @@ 
 	
 	/**
 	 * Установка поля для маппинга
+	 * @param string $alias
 	 */
 	protected function addMappingField($alias,$field = null){
 		

Braces +27 added lines, -25 removed lines

@@ -138,7 +138,9 @@ 
 		
 		$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()]);		
@@ -174,13 +176,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;
 	}
@@ -214,8 +220,7 @@ 
 			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'];
 			}
 		}
@@ -295,19 +300,18 @@ 
 //						$value
 //					]);
 
-				}
-				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);
+			}
 			
         }
 				
@@ -345,18 +349,17 @@ 
 			//--------------------------------------------------------------------
 			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']))
-					$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}();
 			}			
 						
@@ -374,8 +377,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;
 		}
 	
@@ -475,8 +477,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 );}
@@ -527,8 +528,9 @@ 
 				$this->use_delete === false &&
 				$this->setSoftDeleteKey()>'' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
-				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+				) {
+				$specification->setWhere($this->setSoftDeleteKey(),0);
+		}
 	}
 	
 	/**

example/Domain/City/City.php

Doc Comments +3 added lines

@@ -16,6 +16,9 @@
 
 	protected $name;
 	
+	/**
+	 * @param string $name
+	 */
 	function __construct($name) {
 		$this->setName($name);
 	}

example/Domain/User/User.php

Doc Comments +5 added lines

@@ -22,6 +22,11 @@
 	protected $group;
 	protected $address;
 			
+	/**
+	 * @param string $name
+	 * @param string $email
+	 * @param string $password
+	 */
 	function __construct($name, $email, $password, UserGroup $Group) {
 		$this->setName($name);
 		$this->setEmail($email);

example/Domain/UserAddress/UserAddress.php

Doc Comments +4 added lines

@@ -22,6 +22,10 @@
 	
 	protected $city;
 
+	/**
+	 * @param string $code
+	 * @param string $street
+	 */
 	function __construct(City $City,$code,$street) {
 		$this->setCity($City);
 		$this->setCode($code);

src/TraitDataMapperEvent.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 	/**
 	 * Перед сохранением извелкаем объект и дополняем массив для записи, недостающими полями
-	 * @param \Autoprice\Domain\Price\EntityInterface $Entity
+	 * @param EntityInterface $Entity
 	 * @param type $data
 	 */
 	protected function onPrepareData(\SimpleORM\EntityInterface $Entity, &$data) {

Braces +1 added lines, -2 removed lines

@@ -80,8 +80,7 @@
 						$o = $$_mc;
 						eval($set_path);
 					}
-				}
-				elseif(is_object($o) ){
+				} elseif(is_object($o) ){
 					$$_mc = $o->{$_mc}();
 					$o = $$_mc;
 				}

src/InvalidArgumentException.php

Braces +3 added lines, -2 removed lines

@@ -11,8 +11,9 @@
 {
 	public function __construct($message, $code = null , $previous = null) {
 		
-		if(is_array($message))
-			$message = implode('',$message);
+		if(is_array($message)) {
+					$message = implode('',$message);
+		}
 		
 		parent::__construct($message, $code, $previous);
 	}

tests/bootstrap.php

Doc Comments +9 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
     
     /**
      * получение защищенного свойства
-     * @param type $o
-     * @param type $name
+     * @param string $name
+     * @param SimpleORM\AbstractDataMapper $obj
      * @return type
      */
     static public function getProtectedAttribute($obj, $name)
@@ -19,8 +19,9 @@ 
 
     /**
      * Добавление значения в защищенное свойтсво
-     * @param type $name
-     * @param type $valued 
+     * @param string $name
+     * @param type $value
+     * @param SimpleORM\AbstractDataMapper $obj 
      */
     static public function setValueprotectedProperty($obj, $name, $value)
     {
@@ -30,6 +31,10 @@ 
         $r->setValue($obj, $value); //изменяем значение
     }    
 	
+	/**
+	 * @param SimpleORM\AbstractDataMapper $obj
+	 * @param string $name
+	 */
 	static public function callMethod($obj, $name, array $args = []) {
         $class = new \ReflectionClass($obj);
         $method = $class->getMethod($name);