dimaxz / SimpleORM

src/ISpecificationCriteria.php

Indentation +18 added lines, -18 removed lines

@@ -10,43 +10,43 @@
  */
 interface ISpecificationCriteria
 {
-    public function getCriteria();
+	public function getCriteria();
 	
 	public function getWhere();
 
-    public function getLimit();
+	public function getLimit();
 
-    public function getOfset();
+	public function getOfset();
 
-    public function getJoins();
+	public function getJoins();
 
-    public function getOrder();
+	public function getOrder();
 
-    public function getManualJoins();
+	public function getManualJoins();
 
-    public function getGroup();
+	public function getGroup();
 
-    public function getManualWheres();
+	public function getManualWheres();
 
-    public function getWhereType();    
+	public function getWhereType();    
 
-    public function setWhere($field,$value = false);    
+	public function setWhere($field,$value = false);    
 
-    public function setLimit($limit);
+	public function setLimit($limit);
 
-    public function setOfset($ofset);
+	public function setOfset($ofset);
 
-    public function setJoins($joins);    
+	public function setJoins($joins);    
 
-    public function setOrder($order);
+	public function setOrder($order);
 
-    public function setManualJoins($manualJoins);
+	public function setManualJoins($manualJoins);
 
-    public function setGroup($group);
+	public function setGroup($group);
 
-    public function setManualWheres($manualWheres);
+	public function setManualWheres($manualWheres);
 	
-    public function setWhereType($whereType);
+	public function setWhereType($whereType);
 	
 }
 

src/Specification.php

Indentation +119 added lines, -119 removed lines

@@ -10,134 +10,134 @@
 class Specification implements ISpecificationCriteria
 {
 
-    protected $where = [];
+	protected $where = [];
 
-    protected $limit = 0;
+	protected $limit = 0;
 
-    protected $ofset = 0;
+	protected $ofset = 0;
 
-    protected $joins = [];
+	protected $joins = [];
 
-    protected $order = [];
+	protected $order = [];
 
-    protected $manualJoins = [];
+	protected $manualJoins = [];
 
-    protected $group = null;
+	protected $group = null;
 
-    protected $manualWheres = [];
+	protected $manualWheres = [];
 
-    protected $whereType = 'AND';
+	protected $whereType = 'AND';
     
-    function getWhere()
-    {
-        return $this->where;
-    }
-
-    function getLimit()
-    {
-        return $this->limit;
-    }
-
-    function getOfset()
-    {
-        return $this->ofset;
-    }
-
-    function getJoins()
-    {
-        return $this->joins;
-    }
-
-    function getOrder()
-    {
-        return $this->order;
-    }
-
-    function getManualJoins()
-    {
-        return $this->manualJoins;
-    }
-
-    function getGroup()
-    {
-        return $this->group;
-    }
-
-    function getManualWheres()
-    {
-        return $this->manualWheres;
-    }
-
-    function getWhereType()
-    {
-        return $this->whereType;
-    }
-
-    function setWhere($field,$value = false)
-    {
-        if($value!==false){
-            $this->where[$field] = $value;
-        }
-        else{
-            $this->where = $where;
-        }
+	function getWhere()
+	{
+		return $this->where;
+	}
+
+	function getLimit()
+	{
+		return $this->limit;
+	}
+
+	function getOfset()
+	{
+		return $this->ofset;
+	}
+
+	function getJoins()
+	{
+		return $this->joins;
+	}
+
+	function getOrder()
+	{
+		return $this->order;
+	}
+
+	function getManualJoins()
+	{
+		return $this->manualJoins;
+	}
+
+	function getGroup()
+	{
+		return $this->group;
+	}
+
+	function getManualWheres()
+	{
+		return $this->manualWheres;
+	}
+
+	function getWhereType()
+	{
+		return $this->whereType;
+	}
+
+	function setWhere($field,$value = false)
+	{
+		if($value!==false){
+			$this->where[$field] = $value;
+		}
+		else{
+			$this->where = $where;
+		}
         
-        return $this;
-    }
-
-    function setLimit($limit)
-    {
-        $this->limit = $limit;
-        return $this;
-    }
-
-    function setOfset($ofset)
-    {
-        $this->ofset = $ofset;
-        return $this;
-    }
-
-    function setJoins($joins)
-    {
-        $this->joins = $joins;
-        return $this;
-    }
-
-    function setOrder($order)
-    {
-        $this->order = $order;
-        return $this;
-    }
-
-    function setManualJoins($manualJoins)
-    {
-        $this->manualJoins = $manualJoins;
-        return $this;
-    }
-
-    function setGroup($group)
-    {
-        $this->group = $group;
-        return $this;
-    }
-
-    function setManualWheres($manualWheres)
-    {
-        $this->manualWheres = $manualWheres;
-        return $this;
-    }
-
-    function setWhereType($whereType)
-    {
-        $this->whereType = $whereType;
-        return $this;
-    }
-
-    /**
-     * Создание критериев
-     */
-    public function getCriteria()
-    {
+		return $this;
+	}
+
+	function setLimit($limit)
+	{
+		$this->limit = $limit;
+		return $this;
+	}
+
+	function setOfset($ofset)
+	{
+		$this->ofset = $ofset;
+		return $this;
+	}
+
+	function setJoins($joins)
+	{
+		$this->joins = $joins;
+		return $this;
+	}
+
+	function setOrder($order)
+	{
+		$this->order = $order;
+		return $this;
+	}
+
+	function setManualJoins($manualJoins)
+	{
+		$this->manualJoins = $manualJoins;
+		return $this;
+	}
+
+	function setGroup($group)
+	{
+		$this->group = $group;
+		return $this;
+	}
+
+	function setManualWheres($manualWheres)
+	{
+		$this->manualWheres = $manualWheres;
+		return $this;
+	}
+
+	function setWhereType($whereType)
+	{
+		$this->whereType = $whereType;
+		return $this;
+	}
+
+	/**
+	 * Создание критериев
+	 */
+	public function getCriteria()
+	{
         
-    }
+	}
 }

Braces +1 added lines, -2 removed lines

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

src/RepositoryInterface.php

Indentation +6 added lines, -6 removed lines

@@ -10,15 +10,15 @@
 interface RepositoryInterface
 {
 
-    public function findById($id);
+	public function findById($id);
 
-    public function findBySpecification(ISpecificationCriteria $specification);
+	public function findBySpecification(ISpecificationCriteria $specification);
 
-    public function findAll();
+	public function findAll();
 
-    public function findAllBySpecification(ISpecificationCriteria $specification);
+	public function findAllBySpecification(ISpecificationCriteria $specification);
 
-    public function save(EntityInterface $Entity);
+	public function save(EntityInterface $Entity);
 
-    public function delete(EntityInterface $Entity);
+	public function delete(EntityInterface $Entity);
 }

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

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

src/AbstractDataMapper.php

Indentation +20 added lines, -20 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охранение сущности
@@ -210,7 +210,7 @@ 
 	 */
 	protected function buildEntity(EntityInterface $Entity, array $row){
 		
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$value = false;
 			
@@ -247,9 +247,9 @@ 
 			if($value!==false)
 				$Entity->{$method_set}($value);
 			
-        }
+		}
 		
-        return $Entity;		
+		return $Entity;		
 	}	
 
 	
@@ -263,7 +263,7 @@ 
 		
 		$row = [];
 
-        foreach ($this->mapping_fields as $alias => $cfg ) {
+		foreach ($this->mapping_fields as $alias => $cfg ) {
 			
 			$field = $cfg['field'];
 			
@@ -293,9 +293,9 @@ 
 						
 			$row[$field] = $value;
 
-        }
+		}
 
-        return $row;		
+		return $row;		
 	}	
 	
 	/**
@@ -367,10 +367,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);				
 	}
 	
 	/**
@@ -412,8 +412,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);

Braces +27 added lines, -25 removed lines

@@ -132,7 +132,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()]);		
@@ -168,13 +170,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;
 	}
@@ -208,8 +214,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'];
 			}
 		}
@@ -273,19 +278,18 @@ 
 				
 				if($this->use_joins===true || empty($row[$field])){
 					$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);
+			}
 			
         }
 		
@@ -316,18 +320,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}();
 			}			
 						
@@ -345,8 +348,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;
 		}
 	
@@ -428,8 +430,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 );}
@@ -476,8 +477,9 @@ 
 				$this->use_delete === false &&
 				$this->setSoftDeleteKey()>'' 
 				&& !isset($specification->getWhere()[$this->setSoftDeleteKey()])
-				)
-		$specification->setWhere($this->setSoftDeleteKey(),0);
+				) {
+				$specification->setWhere($this->setSoftDeleteKey(),0);
+		}
 	}
 	
 	/**

src/AbstractEntity.php

Indentation +16 added lines, -16 removed lines

@@ -10,29 +10,29 @@
 abstract class AbstractEntity implements EntityInterface
 {
 
-    protected $id;
+	protected $id;
 	
 	protected $deleted;
 
 	public function getId()
-    {
-        return $this->id;
-    }
+	{
+		return $this->id;
+	}
 
-    public function setId($id)
-    {
-        if ($this->id !== null) {
-            throw new BadMethodCallException(
-                "Идентификатор у сущности уже установлен");
-        }
+	public function setId($id)
+	{
+		if ($this->id !== null) {
+			throw new BadMethodCallException(
+				"Идентификатор у сущности уже установлен");
+		}
  
-        if (empty($id)) {//$id < 1
-            throw new InvalidArgumentException("Неверный индентификатор");
-        }
+		if (empty($id)) {//$id < 1
+			throw new InvalidArgumentException("Неверный индентификатор");
+		}
  
-        $this->id = $id;
-        return $this;		
-    }
+		$this->id = $id;
+		return $this;		
+	}
 	
 	public function setDeleted($deleted){
 		$this->deleted = $deleted;