Merge remote-tracking branch 'upstream/develop' into camelCaps

test/phpunit/FunctionsLibTest.php

@@ -1118,7 +1118,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return void
 	 */
-	public function testDolNl2Br() {
+    public function testDolNl2Br()
+    {
 
 		//String to encode
 		$string = "a\na";

test/phpunit/RestAPIUserTest.php

@@ -173,7 +173,8 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $this->assertEquals(1, $object['statut']);
     }
 
-    public function testRestCreateUser() {
+    public function testRestCreateUser()
+    {
 
       // attemp to create without mandatory fields :
       $url = $this->api_url.'/users?api_key='.$this->api_key;