dimaxz / SimpleORM

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

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 
-     */
-    static public function setValueprotectedProperty($obj, $name, $value)
-    {
-        $reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
-        $r = $reflectionClass->getProperty($name); //получаем свойство
-        $r->setAccessible(true); //делаем открытым
-        $r->setValue($obj, $value); //изменяем значение
-    }    
+	/**
+	 * Добавление значения в защищенное свойтсво
+	 * @param type $name
+	 * @param type $valued 
+	 */
+	static public function setValueprotectedProperty($obj, $name, $value)
+	{
+		$reflectionClass = new \ReflectionClass($obj); //создаем reflectionClass
+		$r = $reflectionClass->getProperty($name); //получаем свойство
+		$r->setAccessible(true); //делаем открытым
+		$r->setValue($obj, $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);
+	}	
     
 }

tests/src/AbstractDataMapperTest.php

Spacing +25 added lines, -25 removed lines

@@ -28,7 +28,7 @@ 
 //								])//в конструктор
 						->disableOriginalConstructor()
 						//->setMethods(null)
-						->setMethods(['setMappingFields','createEntity'])
+						->setMethods(['setMappingFields', 'createEntity'])
 						//->setMethods(null) //не использовать заглушки методов иначе буде возвращать NULL
 						->getMock();
 	}
@@ -45,9 +45,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_SimpleField(){
+	public function testAddMappingField_SimpleField() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield']);
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield']);
 		
 		$correct = [
 			  'myfield'	=>	[
@@ -56,7 +56,7 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 	}		
@@ -64,9 +64,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_FieldAndAlias(){
+	public function testAddMappingField_FieldAndAlias() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield','tb_mayfield']);
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', 'tb_mayfield']);
 		
 		$correct = [
 			  'myfield'	=>	[
@@ -75,7 +75,7 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 	}		
@@ -83,9 +83,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_ArrayField(){
+	public function testAddMappingField_ArrayField() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield',[
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [
 			'field'	=>	'tb_mayfield'
 		]]);
 		
@@ -96,7 +96,7 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 	}	
@@ -104,9 +104,9 @@ 
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_PrimaryKey(){
+	public function testAddMappingField_PrimaryKey() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield',[
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [
 			'field'		=>	'tb_mayfield',
 			'primary'	=>	true
 		]]);
@@ -119,20 +119,20 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 		
-		$key_field = \TestHelper::getProtectedAttribute($this->object,'key');
+		$key_field = \TestHelper::getProtectedAttribute($this->object, 'key');
 		$this->assertEquals($key_field, 'tb_mayfield');	
 	}	
 	
 	/**
 	 * @covers SimpleORM\AbstractDataMapper::AddMappingField
 	 */
-	public function testAddMappingField_SoftDelete(){
+	public function testAddMappingField_SoftDelete() {
 		
-		\TestHelper::callMethod($this->object,'addMappingField',['myfield',[
+		\TestHelper::callMethod($this->object, 'addMappingField', ['myfield', [
 			'field'			=>	'tb_mayfield',
 			'softdelete'	=>	true
 		]]);
@@ -145,11 +145,11 @@ 
 		  ];
 		
 		//-----------------
-		$mapping_fields = \TestHelper::getProtectedAttribute($this->object,'mapping_fields');
+		$mapping_fields = \TestHelper::getProtectedAttribute($this->object, 'mapping_fields');
 
         $this->assertEquals($mapping_fields, $correct);		
 		
-		$soft_delete_key = \TestHelper::getProtectedAttribute($this->object,'soft_delete_key');
+		$soft_delete_key = \TestHelper::getProtectedAttribute($this->object, 'soft_delete_key');
 		$this->assertEquals($soft_delete_key, 'tb_mayfield');	
 	}	
 	
@@ -158,8 +158,8 @@ 
 	 */
 	public function testGetPrimaryKey()
 	{
-		\TestHelper::setValueprotectedProperty($this->object,'key','tst_id');
-		$this->assertEquals(\TestHelper::callMethod($this->object,'GetPrimaryKey'), 'tst_id');	
+		\TestHelper::setValueprotectedProperty($this->object, 'key', 'tst_id');
+		$this->assertEquals(\TestHelper::callMethod($this->object, 'GetPrimaryKey'), 'tst_id');	
 	}
 	
 	/**
@@ -167,19 +167,19 @@ 
 	 */
 	public function testsetSoftDeleteKey()
 	{
-		\TestHelper::setValueprotectedProperty($this->object,'soft_delete_key','stc_deleted');
-		$this->assertEquals(\TestHelper::callMethod($this->object,'setSoftDeleteKey'), 'stc_deleted');	
+		\TestHelper::setValueprotectedProperty($this->object, 'soft_delete_key', 'stc_deleted');
+		$this->assertEquals(\TestHelper::callMethod($this->object, 'setSoftDeleteKey'), 'stc_deleted');	
 	}	
 	
 	/**
 	 *  @covers SimpleORM\AbstractDataMapper::getFieldAlias
 	 */
-	public function testGetFieldAlias(){
+	public function testGetFieldAlias() {
 		$mapping_fields_aliases = [
 			'name'	=>	'stc_fullname'
 		];
-		\TestHelper::setValueprotectedProperty($this->object,'mapping_fields_aliases',$mapping_fields_aliases);
-		$this->assertEquals(\TestHelper::callMethod($this->object,'getFieldAlias',['name']), 'stc_fullname');
+		\TestHelper::setValueprotectedProperty($this->object, 'mapping_fields_aliases', $mapping_fields_aliases);
+		$this->assertEquals(\TestHelper::callMethod($this->object, 'getFieldAlias', ['name']), 'stc_fullname');
 	}