dimaxz / SimpleORM

src/AbstractDataMapper.php

Indentation +22 added lines, -22 removed lines

@@ -19,7 +19,7 @@ 
 	 * таблица для сущности
 	 * @var type 
 	 */
-    protected $entityTable;	
+	protected $entityTable;	
 
 	/**
 	 * первичный ключ
@@ -88,9 +88,9 @@ 
 
 	abstract protected function setMappingFields();	
 	
-    public function getAdapter() {
-        return $this->adapter;
-    }
+	public function getAdapter() {
+		return $this->adapter;
+	}
 
 	public function setAdapter(QueryBuilderInterface $adapter){
 		 $this->adapter = $adapter;
@@ -109,12 +109,12 @@ 
 	}	
 
 
-    public function findById($id)
-    {
+	public function findById($id)
+	{
 		$Criteria = (new Specification())->setWhere($this->key , $id);
 		
-        return $this->findBySpecification($Criteria);
-    }	
+		return $this->findBySpecification($Criteria);
+	}	
 	
 	/**
 	 * Cохранение сущности
@@ -199,7 +199,7 @@ 
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
 		
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$value = false;
 			
@@ -236,9 +236,9 @@ 
 			if($value!==false)
 				$Entity->{$method_set}($value);
 			
-        }
+		}
 		
-        return $Entity;		
+		return $Entity;		
 	}	
 
 	
@@ -252,7 +252,7 @@ 
 		
 		$row = [];
 
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$field = $cfg['field'];
 			
@@ -282,9 +282,9 @@ 
 						
 			$row[$field] = $value;
 
-        }
+		}
 
-        return $row;		
+		return $row;		
 	}	
 	
 	/**
@@ -356,10 +356,10 @@ 
 		//получение записей
 		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
 
-        if (!$row = $res->row_array()) {
-            return null;
-        }
-        return $this->createEntity($row);				
+		if (!$row = $res->row_array()) {
+			return null;
+		}
+		return $this->createEntity($row);				
 	}
 	
 	/**
@@ -401,8 +401,8 @@ 
 		$res = $this->getAdapter()->getResultQuery($this->getEntityTable(),$specification);
 		
 		if (!$rows = $res->result_array()) {
-            return null;
-        }	
+			return null;
+		}	
 		
 		foreach($rows as $k =>  $row){
 			$rows[$k] = $this->createEntity($row);
@@ -430,8 +430,8 @@ 
 	}
 	
 		/**
-	 * Построение join-ов
-	 */
+		 * Построение join-ов
+		 */
 	protected function setRelations(ISpecificationCriteria $Specification){
 
 		$joins = [];

Braces +17 added lines, -20 removed lines

@@ -222,19 +222,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);
+			}
 			
         }
 		
@@ -265,18 +264,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}();
 			}			
 						
@@ -294,8 +292,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;
 		}
 	
@@ -377,8 +374,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 );}
@@ -425,8 +421,9 @@ 
 				$this->use_delete === false &&
 				$this->setSoftDeleteKey()>'' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
-				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+				) {
+				$specification->setWhere($this->setSoftDeleteKey(),0);
+		}
 	}
 	
 		/**

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

tests/src/AbstractDataMapperTest.php

Indentation +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 	}		
 	
 	/**
@@ -77,7 +77,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 	}		
 
 	/**
@@ -98,7 +98,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 	}	
 	
 	/**
@@ -121,7 +121,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 		
 		$key_field = \TestHelper::getProtectedAttribute($this->object,'key');
 		$this->assertEquals($key_field, 'tb_mayfield');	
@@ -147,7 +147,7 @@ 
 		//-----------------
 		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
 
-        $this->assertEquals($mapping_fields, $correct);		
+		$this->assertEquals($mapping_fields, $correct);		
 		
 		$soft_delete_key = \TestHelper::getProtectedAttribute($this->object,'soft_delete_key');
 		$this->assertEquals($soft_delete_key, 'tb_mayfield');	

tests/bootstrap.php

Indentation +30 added lines, -30 removed lines

@@ -3,38 +3,38 @@
 
 class TestHelper{
     
-    /**
-     * получение защищенного свойства
-     * @param type $o
-     * @param type $name
-     * @return type
-     */
-    static public function getProtectedAttribute($obj, $name)
-    {
-        $reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
-        $r = $reflectionClass->getProperty($name); //получаем свойство
-        $r->setAccessible(true); //делаем открытым
-        return $r->getValue($obj);
-    }
+	/**
+	 * получение защищенного свойства
+	 * @param type $o
+	 * @param type $name
+	 * @return type
+	 */
+	static public function getProtectedAttribute($obj, $name)
+	{
+		$reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
+		$r = $reflectionClass->getProperty($name); //получаем свойство
+		$r->setAccessible(true); //делаем открытым
+		return $r->getValue($obj);
+	}
 
-    /**
-     * Добавление значения в защищенное свойтсво
-     * @param type $name
-     * @param type $valued 
-     */
-    private function setValueprotectedProperty($name, $value)
-    {
-        $reflectionClass = new \ReflectionClass($this->object); //создаем reflectionClass
-        $r = $reflectionClass->getProperty($name); //получаем свойство
-        $r->setAccessible(true); //делаем открытым
-        $r->setValue($this->object, $value); //изменяем значение
-    }    
+	/**
+	 * Добавление значения в защищенное свойтсво
+	 * @param type $name
+	 * @param type $valued 
+	 */
+	private function setValueprotectedProperty($name, $value)
+	{
+		$reflectionClass = new \ReflectionClass($this->object); //создаем reflectionClass
+		$r = $reflectionClass->getProperty($name); //получаем свойство
+		$r->setAccessible(true); //делаем открытым
+		$r->setValue($this->object, $value); //изменяем значение
+	}    
 	
 	static public function callMethod($obj, $name, array $args) {
-        $class = new \ReflectionClass($obj);
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($obj, $args);
-    }	
+		$class = new \ReflectionClass($obj);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
+		return $method->invokeArgs($obj, $args);
+	}	
     
 }