Dolibarr / dolibarr

test/phpunit/FunctionsLibTest.php

Spacing +415 added lines, -415 removed lines

@@ -25,7 +25,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db,$mysoc;
+global $conf, $user, $langs, $db, $mysoc;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -33,35 +33,35 @@ 
 require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
@@ -85,10 +85,10 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-		if (! function_exists('mb_substr')) {
+		if (!function_exists('mb_substr')) {
 			print "\n".__METHOD__." function mb_substr must be enabled.\n";
 			die(1);
 		}
@@ -217,17 +217,17 @@ 
 		global $conf, $langs, $db;
 
 		// An attempt for SQL injection
-		$filter='if(now()=sysdate()%2Csleep(6)%2C0)';
+		$filter = 'if(now()=sysdate()%2Csleep(6)%2C0)';
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
 		$this->assertEquals('Filter error - Bad syntax of the search string', $sql);
 
 		// A real search string
-		$filter='(((statut:=:1) or (entity:in:__AAA__)) and (abc:<:2.0) and (abc:!=:1.23))';
+		$filter = '(((statut:=:1) or (entity:in:__AAA__)) and (abc:<:2.0) and (abc:!=:1.23))';
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
 		$this->assertEquals(' AND ((((statut = 1) or (entity IN (__AAA__))) and (abc < 2) and (abc <> 1.23)))', $sql);
 
 		// A real search string
-		$filter="(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.date_creation:<:'2016-01-01 12:30:00') or (t.nature:is:NULL)";
+		$filter = "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.date_creation:<:'2016-01-01 12:30:00') or (t.nature:is:NULL)";
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
 		$this->assertEquals(" AND ((t.ref LIKE 'SO-%') or (t.date_creation < '20160101') or (t.date_creation < 0) or (t.nature IS NULL))", $sql);
 
@@ -247,9 +247,9 @@ 
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
 
 		if ($db->type == 'mysqli') {
-			$this->assertEquals(" AND ((t.fieldstring = 'aaa\'ttt'))", $sql);	// with mysql
+			$this->assertEquals(" AND ((t.fieldstring = 'aaa\'ttt'))", $sql); // with mysql
 		} else {
-			$this->assertEquals(" AND ((t.fieldstring = 'aaa''ttt'))", $sql);	// with pgsql
+			$this->assertEquals(" AND ((t.fieldstring = 'aaa''ttt'))", $sql); // with pgsql
 		}
 
 		$filter = "(t.fk_soc:IN:1,2)";
@@ -326,23 +326,23 @@ 
 	{
 		// Nb of line is same than entry text
 
-		$input="bidon@bademail";
-		$result=isValidEmail($input);
+		$input = "bidon@bademail";
+		$result = isValidEmail($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result, 'Check isValidEmail '.$input);
 
-		$input="test@yahoo.com";
-		$result=isValidEmail($input);
+		$input = "test@yahoo.com";
+		$result = isValidEmail($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'Check isValidEmail '.$input);
 
-		$input="The name of sender <test@yahoo.com>";
-		$result=isValidEmail($input);
+		$input = "The name of sender <test@yahoo.com>";
+		$result = isValidEmail($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result, 'Check isValidEmail '.$input);
 
-		$input="1234.abcdefg@domainame.com.br";
-		$result=isValidEmail($input);
+		$input = "1234.abcdefg@domainame.com.br";
+		$result = isValidEmail($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'Check isValidEmail '.$input);
 	}
@@ -356,18 +356,18 @@ 
 	{
 		// Nb of line is same than entry text
 
-		$input="yahoo.com";
-		$result=isValidMXRecord($input);
+		$input = "yahoo.com";
+		$result = isValidMXRecord($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
-		$input="yhaoo.com";
-		$result=isValidMXRecord($input);
+		$input = "yhaoo.com";
+		$result = isValidMXRecord($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(0, $result);
 
-		$input="dolibarr.fr";
-		$result=isValidMXRecord($input);
+		$input = "dolibarr.fr";
+		$result = isValidMXRecord($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(0, $result);
 	}
@@ -381,57 +381,57 @@ 
 	{
 		// Nb of line is same than entry text
 
-		$input="aaaa";
-		$result=dolGetFirstLineOfText($input);
+		$input = "aaaa";
+		$result = dolGetFirstLineOfText($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa", $result);
 
-		$input="aaaa\nbbbbbbbbbbbb\n";
-		$result=dolGetFirstLineOfText($input, 2);
+		$input = "aaaa\nbbbbbbbbbbbb\n";
+		$result = dolGetFirstLineOfText($input, 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa\nbbbbbbbbbbbb", $result);
 
-		$input="aaaa<br>bbbbbbbbbbbb<br>";
-		$result=dolGetFirstLineOfText($input, 2);
+		$input = "aaaa<br>bbbbbbbbbbbb<br>";
+		$result = dolGetFirstLineOfText($input, 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb", $result);
 
 		// Nb of line is lower
 
-		$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-		$result=dolGetFirstLineOfText($input);
+		$input = "aaaa\nbbbbbbbbbbbb\ncccccc\n";
+		$result = dolGetFirstLineOfText($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa...", $result);
 
-		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-		$result=dolGetFirstLineOfText($input);
+		$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+		$result = dolGetFirstLineOfText($input);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa...", $result);
 
-		$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-		$result=dolGetFirstLineOfText($input, 2);
+		$input = "aaaa\nbbbbbbbbbbbb\ncccccc\n";
+		$result = dolGetFirstLineOfText($input, 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa\nbbbbbbbbbbbb...", $result);
 
-		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-		$result=dolGetFirstLineOfText($input, 2);
+		$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+		$result = dolGetFirstLineOfText($input, 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb...", $result);
 
 		// Nb of line is higher
 
-		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc";
-		$result=dolGetFirstLineOfText($input, 100);
+		$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc";
+		$result = dolGetFirstLineOfText($input, 100);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 a');
 
-		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-		$result=dolGetFirstLineOfText($input, 100);
+		$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+		$result = dolGetFirstLineOfText($input, 100);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 b');
 
-		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
-		$result=dolGetFirstLineOfText($input, 100);
+		$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
+		$result = dolGetFirstLineOfText($input, 100);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 c');
 	}
@@ -452,11 +452,11 @@ 
 		var_dump($tmp);
 		*/
 
-		$result=dol_buildpath('/google/oauth2callback.php', 2);
+		$result = dol_buildpath('/google/oauth2callback.php', 2);
 		print __METHOD__." dol_buildpath result=".$result."\n";
 		$this->assertStringStartsWith('http', $result);
 
-		$result=dol_buildpath('/google/oauth2callback.php', 3);
+		$result = dol_buildpath('/google/oauth2callback.php', 3);
 		print __METHOD__." dol_buildpath result=".$result."\n";
 		$this->assertStringStartsWith('http', $result);
 	}
@@ -470,8 +470,8 @@ 
 	public function testGetBrowserInfo()
 	{
 		// MSIE 5.0
-		$user_agent ='Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
-		$tmp=getBrowserInfo($user_agent);
+		$user_agent = 'Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('ie', $tmp['browsername']);
 		$this->assertEquals('5.0', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
@@ -479,40 +479,40 @@ 
 		$this->assertEquals('classic', $tmp['layout']);
 
 		// Firefox 0.9.1
-		$user_agent ='Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
-		$tmp=getBrowserInfo($user_agent);
+		$user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('firefox', $tmp['browsername']);
 		$this->assertEquals('0.9.1', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
 		$this->assertFalse($tmp['tablet']);
 		$this->assertEquals('classic', $tmp['layout']);
 
-		$user_agent ='Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
-		$tmp=getBrowserInfo($user_agent);
+		$user_agent = 'Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('opera', $tmp['browsername']);
 		$this->assertEquals('6.03', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
 		$this->assertFalse($tmp['tablet']);
 		$this->assertEquals('classic', $tmp['layout']);
 
-		$user_agent ='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
-		$tmp=getBrowserInfo($user_agent);
+		$user_agent = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('chrome', $tmp['browsername']);
 		$this->assertEquals('19.0.1042.0', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
 		$this->assertFalse($tmp['tablet']);
 		$this->assertEquals('classic', $tmp['layout']);
 
-		$user_agent ='chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
-		$tmp=getBrowserInfo($user_agent);
+		$user_agent = 'chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('chrome', $tmp['browsername']);
 		$this->assertEquals('17.0.963.56', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
 		$this->assertFalse($tmp['tablet']);
 		$this->assertEquals('classic', $tmp['layout']);
 
-		$user_agent ='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
-		$tmp=getBrowserInfo($user_agent);
+		$user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('safari', $tmp['browsername']);
 		$this->assertEquals('533.21.1', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
@@ -521,7 +521,7 @@ 
 
 		//Internet Explorer 11
 		$user_agent = 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';
-		$tmp=getBrowserInfo($user_agent);
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('ie', $tmp['browsername']);
 		$this->assertEquals('11.0', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
@@ -530,7 +530,7 @@ 
 
 		//Internet Explorer 11 bis
 		$user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; NP06; rv:11.0) like Gecko';
-		$tmp=getBrowserInfo($user_agent);
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('ie', $tmp['browsername']);
 		$this->assertEquals('11.0', $tmp['browserversion']);
 		$this->assertEmpty($tmp['phone']);
@@ -539,7 +539,7 @@ 
 
 		//iPad
 		$user_agent = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25';
-		$tmp=getBrowserInfo($user_agent);
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('safari', $tmp['browsername']);
 		$this->assertEquals('8536.25', $tmp['browserversion']);
 		$this->assertEquals('ios', $tmp['browseros']);
@@ -548,7 +548,7 @@ 
 
 		//Lynx
 		$user_agent = 'Lynx/2.8.8dev.3 libwww‑FM/2.14 SSL‑MM/1.4.1';
-		$tmp=getBrowserInfo($user_agent);
+		$tmp = getBrowserInfo($user_agent);
 		$this->assertEquals('lynxlinks', $tmp['browsername']);
 		$this->assertEquals('2.8.8', $tmp['browserversion']);
 		$this->assertEquals('unknown', $tmp['browseros']);
@@ -615,71 +615,71 @@ 
 	public function testDolTextIsHtml()
 	{
 		// True
-		$input='<html>xxx</html>';
-		$after=dol_textishtml($input);
+		$input = '<html>xxx</html>';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with html tag');
-		$input='<body>xxx</body>';
-		$after=dol_textishtml($input);
+		$input = '<body>xxx</body>';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with body tag');
-		$input='xxx <b>yyy</b> zzz';
-		$after=dol_textishtml($input);
+		$input = 'xxx <b>yyy</b> zzz';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with b tag');
-		$input='xxx <u>yyy</u> zzz';
-		$after=dol_textishtml($input);
+		$input = 'xxx <u>yyy</u> zzz';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with u tag');
-		$input='text with <div>some div</div>';
-		$after=dol_textishtml($input);
+		$input = 'text with <div>some div</div>';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with div tag');
-		$input='text with HTML &nbsp; entities';
-		$after=dol_textishtml($input);
+		$input = 'text with HTML &nbsp; entities';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with entities tag');
-		$input='xxx<br>';
-		$after=dol_textishtml($input);
+		$input = 'xxx<br>';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with entities br');
-		$input='xxx<br >';
-		$after=dol_textishtml($input);
+		$input = 'xxx<br >';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with entities br');
-		$input='xxx<br style="eee">';
-		$after=dol_textishtml($input);
+		$input = 'xxx<br style="eee">';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with entities br and attributes');
-		$input='xxx<br style="eee" >';
-		$after=dol_textishtml($input);
+		$input = 'xxx<br style="eee" >';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with entities br and attributes bis');
-		$input='<h2>abc</h2>';
-		$after=dol_textishtml($input);
+		$input = '<h2>abc</h2>';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with entities h2');
-		$input='<img id="abc" src="https://xxx.com/aaa/image.png" />';
-		$after=dol_textishtml($input);
+		$input = '<img id="abc" src="https://xxx.com/aaa/image.png" />';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with img tag');
-		$input='<a class="azerty" href="https://xxx.com/aaa/image.png" />';
-		$after=dol_textishtml($input);
+		$input = '<a class="azerty" href="https://xxx.com/aaa/image.png" />';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with a tag');
-		$input='This is a text with&nbsp;html spaces';
-		$after=dol_textishtml($input);
+		$input = 'This is a text with&nbsp;html spaces';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with a &nbsp;');
-		$input='This is a text with accent &eacute;';
-		$after=dol_textishtml($input);
+		$input = 'This is a text with accent &eacute;';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with a &eacute;');
-		$input='<i class="abc">xxx</i>';
-		$after=dol_textishtml($input);
+		$input = '<i class="abc">xxx</i>';
+		$after = dol_textishtml($input);
 		$this->assertTrue($after, 'Test with i tag and class;');
 
 		// False
-		$input='xxx < br>';
-		$after=dol_textishtml($input);
+		$input = 'xxx < br>';
+		$after = dol_textishtml($input);
 		$this->assertFalse($after);
-		$input='xxx <email@email.com>';	// <em> is html, <em... is not
-		$after=dol_textishtml($input);
+		$input = 'xxx <email@email.com>'; // <em> is html, <em... is not
+		$after = dol_textishtml($input);
 		$this->assertFalse($after);
-		$input='xxx <brstyle="ee">';
-		$after=dol_textishtml($input);
+		$input = 'xxx <brstyle="ee">';
+		$after = dol_textishtml($input);
 		$this->assertFalse($after);
-		$input='This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
-		$after=dol_textishtml($input);
+		$input = 'This is a text with html comments <!-- comment -->'; // we suppose this is not enough to be html content
+		$after = dol_textishtml($input);
 		$this->assertFalse($after);
 
-		$input="A text\nwith a link https://aaa?param=abc&amp;param2=def";
-		$after=dol_textishtml($input);
+		$input = "A text\nwith a link https://aaa?param=abc&amp;param2=def";
+		$after = dol_textishtml($input);
 		$this->assertFalse($after);
 	}
 
@@ -691,32 +691,32 @@ 
 	 */
 	public function testDolHtmlCleanLastBr()
 	{
-		$input="A string\n";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string\n";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string", $after);
 
-		$input="A string first\nA string second\n";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string first\nA string second\n";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string first\nA string second", $after);
 
-		$input="A string\n\n\n";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string\n\n\n";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string", $after);
 
-		$input="A string<br>";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string<br>";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string", $after);
 
-		$input="A string first<br>\nA string second<br>";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string first<br>\nA string second<br>";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string first<br>\nA string second", $after);
 
-		$input="A string\n<br type=\"_moz\" />\n";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string\n<br type=\"_moz\" />\n";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string", $after);
 
-		$input="A string\n<br><br />\n\n";
-		$after=dol_htmlcleanlastbr($input);
+		$input = "A string\n<br><br />\n\n";
+		$after = dol_htmlcleanlastbr($input);
 		$this->assertEquals("A string", $after);
 
 		return true;
@@ -729,19 +729,19 @@ 
 	 */
 	public function testDolConcat()
 	{
-		$text1="A string 1";
-		$text2="A string 2";	// text 1 and 2 are text, concat need only \n
-		$after=dol_concatdesc($text1, $text2);
+		$text1 = "A string 1";
+		$text2 = "A string 2"; // text 1 and 2 are text, concat need only \n
+		$after = dol_concatdesc($text1, $text2);
 		$this->assertEquals("A string 1\nA string 2", $after);
 
-		$text1="A<br>string 1";
-		$text2="A string 2";	// text 1 is html, concat need <br>\n
-		$after=dol_concatdesc($text1, $text2);
+		$text1 = "A<br>string 1";
+		$text2 = "A string 2"; // text 1 is html, concat need <br>\n
+		$after = dol_concatdesc($text1, $text2);
 		$this->assertEquals("A<br>string 1<br>\nA string 2", $after);
 
-		$text1="A string 1";
-		$text2="A <b>string</b> 2";	// text 2 is html, concat need <br>\n
-		$after=dol_concatdesc($text1, $text2);
+		$text1 = "A string 1";
+		$text2 = "A <b>string</b> 2"; // text 2 is html, concat need <br>\n
+		$after = dol_concatdesc($text1, $text2);
 		$this->assertEquals("A string 1<br>\nA <b>string</b> 2", $after);
 
 		return true;
@@ -779,52 +779,52 @@ 
 	 */
 	public function testDolStringNohtmltag()
 	{
-		$text="A\nstring\n\nand more\n";
-		$after=dol_string_nohtmltag($text, 0);
+		$text = "A\nstring\n\nand more\n";
+		$after = dol_string_nohtmltag($text, 0);
 		$this->assertEquals("A\nstring\n\nand more", $after, "test1a");
 
-		$text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-		$after=dol_string_nohtmltag($text, 0);
+		$text = "A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+		$after = dol_string_nohtmltag($text, 0);
 		$this->assertEquals("A string\n\n\n\n\nwith html tag", $after, 'test2a 2 br and 3 \n give 5 \n');
 
-		$text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-		$after=dol_string_nohtmltag($text, 1);
+		$text = "A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+		$after = dol_string_nohtmltag($text, 1);
 		$this->assertEquals("A string with html tag", $after, 'test2b 2 br and 3 \n give 1 space');
 
-		$text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-		$after=dol_string_nohtmltag($text, 2);
+		$text = "A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+		$after = dol_string_nohtmltag($text, 2);
 		$this->assertEquals("A string\n\nwith html tag", $after, 'test2c 2 br and 3 \n give 2 \n');
 
-		$text="A <b>string<b><br>\r\n<br>\r\n\r\nwith html tag<br>\n";
-		$after=dol_string_nohtmltag($text, 2);
+		$text = "A <b>string<b><br>\r\n<br>\r\n\r\nwith html tag<br>\n";
+		$after = dol_string_nohtmltag($text, 2);
 		$this->assertEquals("A string\n\nwith html tag", $after, 'test2c 2 br and 3 \r\n give 2 \n');
 
-		$text="A string<br>Another string";
-		$after=dol_string_nohtmltag($text, 0);
+		$text = "A string<br>Another string";
+		$after = dol_string_nohtmltag($text, 0);
 		$this->assertEquals("A string\nAnother string", $after, "test4");
 
-		$text="A string<br>Another string";
-		$after=dol_string_nohtmltag($text, 1);
+		$text = "A string<br>Another string";
+		$after = dol_string_nohtmltag($text, 1);
 		$this->assertEquals("A string Another string", $after, "test5");
 
-		$text='<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
-		$after=dol_string_nohtmltag($text, 1);
+		$text = '<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
+		$after = dol_string_nohtmltag($text, 1);
 		$this->assertEquals("ABC", $after, "test6");
 
-		$text='<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
-		$after=dol_string_nohtmltag($text, 1);
+		$text = '<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
+		$after = dol_string_nohtmltag($text, 1);
 		$this->assertEquals("DEF", $after, "test7");
 
-		$text='<a href="/myurl" title="<u>A title</u>">HIJ</a>';
-		$after=dol_string_nohtmltag($text, 0);
+		$text = '<a href="/myurl" title="<u>A title</u>">HIJ</a>';
+		$after = dol_string_nohtmltag($text, 0);
 		$this->assertEquals("HIJ", $after, "test8");
 
-		$text="A <b>string<b>\n\nwith html tag and '<' chars<br>\n";
-		$after=dol_string_nohtmltag($text, 0);
+		$text = "A <b>string<b>\n\nwith html tag and '<' chars<br>\n";
+		$after = dol_string_nohtmltag($text, 0);
 		$this->assertEquals("A string\n\nwith html tag and '<' chars", $after, "test9");
 
-		$text="A <b>string<b>\n\nwith tag with < chars<br>\n";
-		$after=dol_string_nohtmltag($text, 1);
+		$text = "A <b>string<b>\n\nwith tag with < chars<br>\n";
+		$after = dol_string_nohtmltag($text, 1);
 		$this->assertEquals("A string with tag with < chars", $after, "test10");
 
 		return true;
@@ -841,38 +841,38 @@ 
 	{
 		// Text not already HTML
 
-		$input="A string\nwith a é, &, < and >.";
-		$after=dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$input = "A string\nwith a é, &, < and >.";
+		$after = dol_htmlentitiesbr($input, 0); // Add <br> before \n
 		$this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-		$input="A string\nwith a é, &, < and >.";
-		$after=dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
+		$input = "A string\nwith a é, &, < and >.";
+		$after = dol_htmlentitiesbr($input, 1); // Replace \n with <br>
 		$this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-		$input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-		$after=dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$input = "A string\nwith a é, &, < and >.\n\n"; // With some \n at end that should be cleaned
+		$after = dol_htmlentitiesbr($input, 0); // Add <br> before \n
 		$this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-		$input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-		$after=dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
+		$input = "A string\nwith a é, &, < and >.\n\n"; // With some \n at end that should be cleaned
+		$after = dol_htmlentitiesbr($input, 1); // Replace \n with <br>
 		$this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
 
 		// Text already HTML, so &,<,> should not be converted
 
-		$input="A string<br>\nwith a é, &, < and >.";
-		$after=dol_htmlentitiesbr($input);
+		$input = "A string<br>\nwith a é, &, < and >.";
+		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
 
-		$input="<li>\nA string with a é, &, < and >.</li>\nAnother string";
-		$after=dol_htmlentitiesbr($input);
+		$input = "<li>\nA string with a é, &, < and >.</li>\nAnother string";
+		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
 
-		$input="A string<br>\nwith a é, &, < and >.<br>";	// With some <br> at end that should be cleaned
-		$after=dol_htmlentitiesbr($input);
+		$input = "A string<br>\nwith a é, &, < and >.<br>"; // With some <br> at end that should be cleaned
+		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
 
-		$input="<li>\nA string with a é, &, < and >.</li>\nAnother string<br>";	// With some <br> at end that should be cleaned
-		$after=dol_htmlentitiesbr($input);
+		$input = "<li>\nA string with a é, &, < and >.</li>\nAnother string<br>"; // With some <br> at end that should be cleaned
+		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
 
 		// TODO Add test with param $removelasteolbr = 0
@@ -889,18 +889,18 @@ 
 	public function testDolNbOfLinesBis()
 	{
 		// This is not a html string so nb of lines depends on \n
-		$input="A string\nwith a é, &, < and > and bold tag.\nThird line";
-		$after=dol_nboflines_bis($input, 0);
+		$input = "A string\nwith a é, &, < and > and bold tag.\nThird line";
+		$after = dol_nboflines_bis($input, 0);
 		$this->assertEquals($after, 3);
 
 		// This is a html string so nb of lines depends on <br>
-		$input="A string\nwith a é, &, < and > and <b>bold</b> tag.\nThird line";
-		$after=dol_nboflines_bis($input, 0);
+		$input = "A string\nwith a é, &, < and > and <b>bold</b> tag.\nThird line";
+		$after = dol_nboflines_bis($input, 0);
 		$this->assertEquals($after, 1);
 
 		// This is a html string so nb of lines depends on <br>
-		$input="A string<br>with a é, &, < and > and <b>bold</b> tag.<br>Third line";
-		$after=dol_nboflines_bis($input, 0);
+		$input = "A string<br>with a é, &, < and > and <b>bold</b> tag.<br>Third line";
+		$after = dol_nboflines_bis($input, 0);
 		$this->assertEquals($after, 3);
 
 		return true;
@@ -916,8 +916,8 @@ 
 	{
 		// Text not already HTML
 
-		$input="A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
-		$after=dol_string_unaccent($input);
+		$input = "A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
+		$after = dol_string_unaccent($input);
 		$this->assertEquals("A string\nwith a a a e e e i u o y, &, < and >.", $after);
 	}
 
@@ -930,17 +930,17 @@ 
 	public function testDolUtf8Check()
 	{
 		// True
-		$result=utf8_check('azerty');
+		$result = utf8_check('azerty');
 		$this->assertTrue($result);
 
-		$file=dirname(__FILE__).'/textutf8.txt';
-		$filecontent=file_get_contents($file);
-		$result=utf8_check($filecontent);
+		$file = dirname(__FILE__).'/textutf8.txt';
+		$filecontent = file_get_contents($file);
+		$result = utf8_check($filecontent);
 		$this->assertTrue($result);
 
-		$file=dirname(__FILE__).'/textiso.txt';
-		$filecontent=file_get_contents($file);
-		$result=utf8_check($filecontent);
+		$file = dirname(__FILE__).'/textiso.txt';
+		$filecontent = file_get_contents($file);
+		$result = utf8_check($filecontent);
 		$this->assertFalse($result);
 	}
 
@@ -952,15 +952,15 @@ 
 	public function testDolAsciiCheck()
 	{
 		// True
-		$result=ascii_check('azerty');
+		$result = ascii_check('azerty');
 		$this->assertTrue($result);
 
-		$result=ascii_check('é');
+		$result = ascii_check('é');
 		$this->assertFalse($result);
 
-		$file=dirname(__FILE__).'/textutf8.txt';
-		$filecontent=file_get_contents($file);
-		$result=ascii_check($filecontent);
+		$file = dirname(__FILE__).'/textutf8.txt';
+		$filecontent = file_get_contents($file);
+		$result = ascii_check($filecontent);
 		$this->assertFalse($result);
 	}
 
@@ -972,49 +972,49 @@ 
 	public function testDolTrunc()
 	{
 		// Default trunc (will add … if truncation truncation or keep last char if only one char)
-		$input="éeéeéeàa";
-		$after=dol_trunc($input, 3);
+		$input = "éeéeéeàa";
+		$after = dol_trunc($input, 3);
 		$this->assertEquals("éeé…", $after, 'Test A1');
-		$after=dol_trunc($input, 2);
+		$after = dol_trunc($input, 2);
 		$this->assertEquals("ée…", $after, 'Test A2');
-		$after=dol_trunc($input, 1);
+		$after = dol_trunc($input, 1);
 		$this->assertEquals("é…", $after, 'Test A3');
-		$input="éeée";
-		$after=dol_trunc($input, 3);
+		$input = "éeée";
+		$after = dol_trunc($input, 3);
 		$this->assertEquals("éeée", $after, 'Test B1');
-		$after=dol_trunc($input, 2);
+		$after = dol_trunc($input, 2);
 		$this->assertEquals("ée…", $after, 'Test B2');
-		$after=dol_trunc($input, 1);
+		$after = dol_trunc($input, 1);
 		$this->assertEquals("é…", $after, 'Test B3');
-		$input="éeée";
-		$after=dol_trunc($input, 3);
+		$input = "éeée";
+		$after = dol_trunc($input, 3);
 		$this->assertEquals("éeée", $after, 'Test C1');
-		$after=dol_trunc($input, 2);
+		$after = dol_trunc($input, 2);
 		$this->assertEquals("ée…", $after, 'Test C2');
-		$after=dol_trunc($input, 1);
+		$after = dol_trunc($input, 1);
 		$this->assertEquals("é…", $after, 'Test C3');
-		$input="éeé";
-		$after=dol_trunc($input, 3);
+		$input = "éeé";
+		$after = dol_trunc($input, 3);
 		$this->assertEquals("éeé", $after, 'Test C');
-		$after=dol_trunc($input, 2);
+		$after = dol_trunc($input, 2);
 		$this->assertEquals("éeé", $after, 'Test D');
-		$after=dol_trunc($input, 1);
+		$after = dol_trunc($input, 1);
 		$this->assertEquals("é…", $after, 'Test E');
 		// Trunc with no …
-		$input="éeéeéeàa";
-		$after=dol_trunc($input, 3, 'right', 'UTF-8', 1);
+		$input = "éeéeéeàa";
+		$after = dol_trunc($input, 3, 'right', 'UTF-8', 1);
 		$this->assertEquals("éeé", $after, 'Test F');
-		$after=dol_trunc($input, 2, 'right', 'UTF-8', 1);
+		$after = dol_trunc($input, 2, 'right', 'UTF-8', 1);
 		$this->assertEquals("ée", $after, 'Test G');
-		$input="éeé";
-		$after=dol_trunc($input, 3, 'right', 'UTF-8', 1);
+		$input = "éeé";
+		$after = dol_trunc($input, 3, 'right', 'UTF-8', 1);
 		$this->assertEquals("éeé", $after, 'Test H');
-		$after=dol_trunc($input, 2, 'right', 'UTF-8', 1);
+		$after = dol_trunc($input, 2, 'right', 'UTF-8', 1);
 		$this->assertEquals("ée", $after, 'Test I');
-		$after=dol_trunc($input, 1, 'right', 'UTF-8', 1);
+		$after = dol_trunc($input, 1, 'right', 'UTF-8', 1);
 		$this->assertEquals("é", $after, 'Test J');
-		$input="éeéeéeàa";
-		$after=dol_trunc($input, 4, 'middle');
+		$input = "éeéeéeàa";
+		$after = dol_trunc($input, 4, 'middle');
 		$this->assertEquals("ée…àa", $after, 'Test K');
 
 		return true;
@@ -1029,49 +1029,49 @@ 
 	{
 		global $conf;
 
-		$savtz=date_default_timezone_get();
+		$savtz = date_default_timezone_get();
 
 		// Some test for UTC TZ
 		date_default_timezone_set('UTC');
 
 		// Check bad hours
-		$result=dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1);    // Error (25 hours)
+		$result = dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1); // Error (25 hours)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result=dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1);    // Error (61 minutes)
+		$result = dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1); // Error (61 minutes)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result=dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1);    // Error (61 seconds)
+		$result = dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1); // Error (61 seconds)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result=dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1);    // Error (day 32)
+		$result = dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1); // Error (day 32)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result=dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1);    // Error (month 13)
+		$result = dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1); // Error (month 13)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
 
-		$result=dol_mktime(2, 1, 1, 1, 1, 1970, 1);    // 1970-01-01 02:01:01 in GMT area -> 7261
+		$result = dol_mktime(2, 1, 1, 1, 1, 1970, 1); // 1970-01-01 02:01:01 in GMT area -> 7261
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7261, $result);
 
-		$result=dol_mktime(2, 0, 0, 1, 1, 1970, 0);                // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+		$result = dol_mktime(2, 0, 0, 1, 1, 1970, 0); // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
 		print __METHOD__." result=".$result."\n";
-		$tz=getServerTimeZoneInt('winter');                  // +1 in Europe/Paris at this time (this time is winter)
-		$this->assertEquals(7200-($tz*3600), $result);        // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
+		$tz = getServerTimeZoneInt('winter'); // +1 in Europe/Paris at this time (this time is winter)
+		$this->assertEquals(7200 - ($tz * 3600), $result); // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
 
 		// Some test for local TZ Europe/Paris
 		date_default_timezone_set('Europe/Paris');
 
 		// Check that tz for paris in winter is used
-		$result=dol_mktime(2, 0, 0, 1, 1, 1970, 'server');         // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+		$result = dol_mktime(2, 0, 0, 1, 1, 1970, 'server'); // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3600, $result);        			 // 7200 if we are at greenwich winter, 3600 at Europe/Paris
+		$this->assertEquals(3600, $result); // 7200 if we are at greenwich winter, 3600 at Europe/Paris
 
 		// Check that daylight saving time is used
-		$result=dol_mktime(2, 0, 0, 6, 1, 2014, 0);         		// 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
+		$result = dol_mktime(2, 0, 0, 6, 1, 2014, 0); // 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1401588000-3600-3600, $result);  // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
+		$this->assertEquals(1401588000 - 3600 - 3600, $result); // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
 
 		date_default_timezone_set($savtz);
 	}
@@ -1084,14 +1084,14 @@ 
 	 */
 	public function testDolEscapeJs()
 	{
-		$input="x&<b>#</b>,\"'";    // " will be converted into '
-		$result=dol_escape_js($input);
+		$input = "x&<b>#</b>,\"'"; // " will be converted into '
+		$result = dol_escape_js($input);
 		$this->assertEquals("x&<b>#</b>,\'\'", $result, "Test mode=0");
 
-		$result=dol_escape_js($input, 1);
+		$result = dol_escape_js($input, 1);
 		$this->assertEquals("x&<b>#</b>,\"\'", $result, "Test mode=1");
 
-		$result=dol_escape_js($input, 2);
+		$result = dol_escape_js($input, 2);
 		$this->assertEquals("x&<b>#</b>,\\\"'", $result, "Test mode=2");
 	}
 
@@ -1103,12 +1103,12 @@ 
 	*/
 	public function testDolEscapeHtmlTag()
 	{
-		$input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
-		$result=dol_escape_htmltag($input);
+		$input = 'x&<b>#</b>,"'; // & and " are converted into html entities, <b> are removed
+		$result = dol_escape_htmltag($input);
 		$this->assertEquals('x&amp;#,&quot;', $result);
 
-		$input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are not removed
-		$result=dol_escape_htmltag($input, 1);
+		$input = 'x&<b>#</b>,"'; // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1);
 		$this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
 	}
 
@@ -1120,33 +1120,33 @@ 
 	 */
 	public function testDolFormatAddress()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$object=new Societe($db);
+		$object = new Societe($db);
 		$object->initAsSpecimen();
 
-		$object->country_code='FR';
-		$address=dol_format_address($object);
+		$object->country_code = 'FR';
+		$address = dol_format_address($object);
 		$this->assertEquals("21 jump street\n99999 MyTown", $address);
 
-		$object->country_code='GB';
-		$address=dol_format_address($object);
+		$object->country_code = 'GB';
+		$address = dol_format_address($object);
 		$this->assertEquals("21 jump street\nMyTown, MyState\n99999", $address);
 
-		$object->country_code='US';
-		$address=dol_format_address($object);
+		$object->country_code = 'US';
+		$address = dol_format_address($object);
 		$this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
 
-		$object->country_code='AU';
-		$address=dol_format_address($object);
+		$object->country_code = 'AU';
+		$address = dol_format_address($object);
 		$this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
 
-		$object->country_code='JP';
-		$address=dol_format_address($object);
+		$object->country_code = 'JP';
+		$address = dol_format_address($object);
 		$this->assertEquals("21 jump street\nMyState, MyTown 99999", $address);
 	}
 
@@ -1158,29 +1158,29 @@ 
 	 */
 	public function testDolPrintPhone()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$object=new Societe($db);
+		$object = new Societe($db);
 		$object->initAsSpecimen();
 
-		$object->country_code='FR';
-		$phone=dol_print_phone('1234567890', $object->country_code);
+		$object->country_code = 'FR';
+		$phone = dol_print_phone('1234567890', $object->country_code);
 		$this->assertEquals('<span style="margin-right: 10px;">12&nbsp;34&nbsp;56&nbsp;78&nbsp;90</span>', $phone, 'Phone for FR 1');
 
-		$object->country_code='FR';
-		$phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, '');
+		$object->country_code = 'FR';
+		$phone = dol_print_phone('1234567890', $object->country_code, 0, 0, 0, '');
 		$this->assertEquals('<span style="margin-right: 10px;">1234567890</span>', $phone, 'Phone for FR 2');
 
-		$object->country_code='FR';
-		$phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
+		$object->country_code = 'FR';
+		$phone = dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
 		$this->assertEquals('<span style="margin-right: 10px;">12 34 56 78 90</span>', $phone, 'Phone for FR 3');
 
-		$object->country_code='CA';
-		$phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
+		$object->country_code = 'CA';
+		$phone = dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
 		$this->assertEquals('<span style="margin-right: 10px;">(123) 456-7890</span>', $phone, 'Phone for CA 1');
 	}
 
@@ -1192,24 +1192,24 @@ 
 	 */
 	public function testImgPicto()
 	{
-		$s=img_picto('title', 'user');
+		$s = img_picto('title', 'user');
 		print __METHOD__." s=".$s."\n";
 		$this->assertStringContainsStringIgnoringCase('fa-user', $s, 'testImgPicto1');
 
-		$s=img_picto('title', 'img.png', 'style="float: right"', 0);
+		$s = img_picto('title', 'img.png', 'style="float: right"', 0);
 		print __METHOD__." s=".$s."\n";
 		$this->assertStringContainsStringIgnoringCase('theme', $s, 'testImgPicto2');
 		$this->assertStringContainsStringIgnoringCase('style="float: right"', $s, 'testImgPicto2');
 
-		$s=img_picto('title', '/fullpath/img.png', '', 1);
+		$s = img_picto('title', '/fullpath/img.png', '', 1);
 		print __METHOD__." s=".$s."\n";
 		$this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto3');
 
-		$s=img_picto('title', '/fullpath/img.png', '', true);
+		$s = img_picto('title', '/fullpath/img.png', '', true);
 		print __METHOD__." s=".$s."\n";
 		$this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto4');
 
-		$s=img_picto('title', 'delete', '', 0, 1);
+		$s = img_picto('title', 'delete', '', 0, 1);
 		print __METHOD__." s=".$s."\n";
 		$this->assertEquals(DOL_URL_ROOT.'/theme/eldy/img/delete.png', $s, 'testImgPicto5');
 	}
@@ -1221,10 +1221,10 @@ 
 	 */
 	public function testDolNow()
 	{
-		$now=dol_now('gmt');
-		$nowtzserver=dol_now('tzserver');
-		print __METHOD__." getServerTimeZoneInt=".(getServerTimeZoneInt('now')*3600)."\n";
-		$this->assertEquals(getServerTimeZoneInt('now')*3600, ($nowtzserver-$now));
+		$now = dol_now('gmt');
+		$nowtzserver = dol_now('tzserver');
+		print __METHOD__." getServerTimeZoneInt=".(getServerTimeZoneInt('now') * 3600)."\n";
+		$this->assertEquals(getServerTimeZoneInt('now') * 3600, ($nowtzserver - $now));
 	}
 
 	/**
@@ -1234,25 +1234,25 @@ 
 	 */
 	public function testVerifCond()
 	{
-		$verifcond=verifCond('1==1');
+		$verifcond = verifCond('1==1');
 		$this->assertTrue($verifcond, 'Test a true comparison');
 
-		$verifcond=verifCond('1==2');
+		$verifcond = verifCond('1==2');
 		$this->assertFalse($verifcond, 'Test a false comparison');
 
-		$verifcond=verifCond('isModEnabled("facture")');
+		$verifcond = verifCond('isModEnabled("facture")');
 		$this->assertTrue($verifcond, 'Test that the conf property of a module reports true when enabled');
 
-		$verifcond=verifCond('isModEnabled("moduledummy")');
+		$verifcond = verifCond('isModEnabled("moduledummy")');
 		$this->assertFalse($verifcond, 'Test that the conf property of a module reports false when disabled');
 
-		$verifcond=verifCond(0);
+		$verifcond = verifCond(0);
 		$this->assertFalse($verifcond, 'Test that verifConf(0) return False');
 
-		$verifcond=verifCond("0");
+		$verifcond = verifCond("0");
 		$this->assertFalse($verifcond, 'Test that verifConf("0") return False');
 
-		$verifcond=verifCond('');
+		$verifcond = verifCond('');
 		$this->assertTrue($verifcond, 'Test that verifConf("") return False (special case)');
 	}
 
@@ -1263,75 +1263,75 @@ 
 	 */
 	public function testGetDefaultTva()
 	{
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		// Sellers
-		$companyfrnovat=new Societe($db);
-		$companyfrnovat->country_code='FR';
-		$companyfrnovat->tva_assuj=0;
+		$companyfrnovat = new Societe($db);
+		$companyfrnovat->country_code = 'FR';
+		$companyfrnovat->tva_assuj = 0;
 
-		$companyfr=new Societe($db);
-		$companyfr->country_code='FR';
-		$companyfr->tva_assuj=1;
-		$companyfr->tva_intra='FR9999';
+		$companyfr = new Societe($db);
+		$companyfr->country_code = 'FR';
+		$companyfr->tva_assuj = 1;
+		$companyfr->tva_intra = 'FR9999';
 
 		// Buyers
-		$companymc=new Societe($db);
-		$companymc->country_code='MC';
-		$companymc->tva_assuj=1;
-		$companyfr->tva_intra='MC9999';
+		$companymc = new Societe($db);
+		$companymc->country_code = 'MC';
+		$companymc->tva_assuj = 1;
+		$companyfr->tva_intra = 'MC9999';
 
-		$companyit=new Societe($db);
-		$companyit->country_code='IT';
-		$companyit->tva_assuj=1;
-		$companyit->tva_intra='IT99999';
+		$companyit = new Societe($db);
+		$companyit->country_code = 'IT';
+		$companyit->tva_assuj = 1;
+		$companyit->tva_intra = 'IT99999';
 
-		$companyde=new Societe($db);
-		$companyde->country_code='DE';
-		$companyde->tva_assuj=1;
-		$companyde->tva_intra='DE99999';
+		$companyde = new Societe($db);
+		$companyde->country_code = 'DE';
+		$companyde->tva_assuj = 1;
+		$companyde->tva_intra = 'DE99999';
 
-		$notcompanyde=new Societe($db);
-		$notcompanyde->country_code='DE';
-		$notcompanyde->tva_assuj=0;
-		$notcompanyde->tva_intra='';
-		$notcompanyde->typent_code='TE_PRIVATE';
+		$notcompanyde = new Societe($db);
+		$notcompanyde->country_code = 'DE';
+		$notcompanyde->tva_assuj = 0;
+		$notcompanyde->tva_intra = '';
+		$notcompanyde->typent_code = 'TE_PRIVATE';
 
-		$companyus=new Societe($db);
-		$companyus->country_code='US';
-		$companyus->tva_assuj=1;
-		$companyus->tva_intra='';
+		$companyus = new Societe($db);
+		$companyus->country_code = 'US';
+		$companyus->tva_assuj = 1;
+		$companyus->tva_intra = '';
 
 
 		// Test RULE 0 (FR-DE)
 		// Not tested
 
 		// Test RULE 1
-		$vat=get_default_tva($companyfrnovat, $companymc, 0);
+		$vat = get_default_tva($companyfrnovat, $companymc, 0);
 		$this->assertEquals(0, $vat, 'RULE 1');
 
 		// Test RULE 2 (FR-FR)
-		$vat=get_default_tva($companyfr, $companyfr, 0);
+		$vat = get_default_tva($companyfr, $companyfr, 0);
 		$this->assertEquals(20, $vat, 'RULE 2');
 
 		// Test RULE 2 (FR-MC)
-		$vat=get_default_tva($companyfr, $companymc, 0);
+		$vat = get_default_tva($companyfr, $companymc, 0);
 		$this->assertEquals(20, $vat, 'RULE 2');
 
 		// Test RULE 3 (FR-DE company)
-		$vat=get_default_tva($companyfr, $companyit, 0);
+		$vat = get_default_tva($companyfr, $companyit, 0);
 		$this->assertEquals(0, $vat, 'RULE 3');
 
 		// Test RULE 4 (FR-DE not a company)
-		$vat=get_default_tva($companyfr, $notcompanyde, 0);
+		$vat = get_default_tva($companyfr, $notcompanyde, 0);
 		$this->assertEquals(20, $vat, 'RULE 4');
 
 		// Test RULE 5 (FR-US)
-		$vat=get_default_tva($companyfr, $companyus, 0);
+		$vat = get_default_tva($companyfr, $companyus, 0);
 		$this->assertEquals(0, $vat, 'RULE 5');
 
 
@@ -1339,23 +1339,23 @@ 
 		$conf->global->SERVICE_ARE_ECOMMERCE_200238EC = 1;
 
 		// Test RULE 1 (FR-US)
-		$vat=get_default_tva($companyfr, $companyus, 0);
+		$vat = get_default_tva($companyfr, $companyus, 0);
 		$this->assertEquals(0, $vat, 'RULE 1 ECOMMERCE_200238EC');
 
 		// Test RULE 2 (FR-FR)
-		$vat=get_default_tva($companyfr, $companyfr, 0);
+		$vat = get_default_tva($companyfr, $companyfr, 0);
 		$this->assertEquals(20, $vat, 'RULE 2 ECOMMERCE_200238EC');
 
 		// Test RULE 3 (FR-DE company)
-		$vat=get_default_tva($companyfr, $companyde, 0);
+		$vat = get_default_tva($companyfr, $companyde, 0);
 		$this->assertEquals(0, $vat, 'RULE 3 ECOMMERCE_200238EC');
 
 		// Test RULE 4 (FR-DE not a company)
-		$vat=get_default_tva($companyfr, $notcompanyde, 0);
+		$vat = get_default_tva($companyfr, $notcompanyde, 0);
 		$this->assertEquals(19, $vat, 'RULE 4 ECOMMERCE_200238EC');
 
 		// Test RULE 5 (FR-US)
-		$vat=get_default_tva($companyfr, $companyus, 0);
+		$vat = get_default_tva($companyfr, $companyus, 0);
 		$this->assertEquals(0, $vat, 'RULE 5 ECOMMERCE_200238EC');
 	}
 
@@ -1366,73 +1366,73 @@ 
 	 */
 	public function testGetDefaultLocalTax()
 	{
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		$companyfrnovat=new Societe($db);
-		$companyfrnovat->country_code='FR';
-		$companyfrnovat->tva_assuj=0;
-		$companyfrnovat->localtax1_assuj=0;
-		$companyfrnovat->localtax2_assuj=0;
-
-		$companyes=new Societe($db);
-		$companyes->country_code='ES';
-		$companyes->tva_assuj=1;
-		$companyes->localtax1_assuj=1;
-		$companyes->localtax2_assuj=1;
-
-		$companymc=new Societe($db);
-		$companymc->country_code='MC';
-		$companymc->tva_assuj=1;
-		$companymc->localtax1_assuj=0;
-		$companymc->localtax2_assuj=0;
-
-		$companyit=new Societe($db);
-		$companyit->country_code='IT';
-		$companyit->tva_assuj=1;
-		$companyit->tva_intra='IT99999';
-		$companyit->localtax1_assuj=0;
-		$companyit->localtax2_assuj=0;
-
-		$notcompanyit=new Societe($db);
-		$notcompanyit->country_code='IT';
-		$notcompanyit->tva_assuj=1;
-		$notcompanyit->tva_intra='';
-		$notcompanyit->typent_code='TE_PRIVATE';
-		$notcompanyit->localtax1_assuj=0;
-		$notcompanyit->localtax2_assuj=0;
-
-		$companyus=new Societe($db);
-		$companyus->country_code='US';
-		$companyus->tva_assuj=1;
-		$companyus->tva_intra='';
-		$companyus->localtax1_assuj=0;
-		$companyus->localtax2_assuj=0;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
+
+		$companyfrnovat = new Societe($db);
+		$companyfrnovat->country_code = 'FR';
+		$companyfrnovat->tva_assuj = 0;
+		$companyfrnovat->localtax1_assuj = 0;
+		$companyfrnovat->localtax2_assuj = 0;
+
+		$companyes = new Societe($db);
+		$companyes->country_code = 'ES';
+		$companyes->tva_assuj = 1;
+		$companyes->localtax1_assuj = 1;
+		$companyes->localtax2_assuj = 1;
+
+		$companymc = new Societe($db);
+		$companymc->country_code = 'MC';
+		$companymc->tva_assuj = 1;
+		$companymc->localtax1_assuj = 0;
+		$companymc->localtax2_assuj = 0;
+
+		$companyit = new Societe($db);
+		$companyit->country_code = 'IT';
+		$companyit->tva_assuj = 1;
+		$companyit->tva_intra = 'IT99999';
+		$companyit->localtax1_assuj = 0;
+		$companyit->localtax2_assuj = 0;
+
+		$notcompanyit = new Societe($db);
+		$notcompanyit->country_code = 'IT';
+		$notcompanyit->tva_assuj = 1;
+		$notcompanyit->tva_intra = '';
+		$notcompanyit->typent_code = 'TE_PRIVATE';
+		$notcompanyit->localtax1_assuj = 0;
+		$notcompanyit->localtax2_assuj = 0;
+
+		$companyus = new Societe($db);
+		$companyus->country_code = 'US';
+		$companyus->tva_assuj = 1;
+		$companyus->tva_intra = '';
+		$companyus->localtax1_assuj = 0;
+		$companyus->localtax2_assuj = 0;
 
 		// Test RULE FR-MC
-		$vat1=get_default_localtax($companyfrnovat, $companymc, 1, 0);
-		$vat2=get_default_localtax($companyfrnovat, $companymc, 2, 0);
+		$vat1 = get_default_localtax($companyfrnovat, $companymc, 1, 0);
+		$vat2 = get_default_localtax($companyfrnovat, $companymc, 2, 0);
 		$this->assertEquals(0, $vat1);
 		$this->assertEquals(0, $vat2);
 
 		// Test RULE ES-ES
-		$vat1=get_default_localtax($companyes, $companyes, 1, 0);
-		$vat2=get_default_localtax($companyes, $companyes, 2, 0);
+		$vat1 = get_default_localtax($companyes, $companyes, 1, 0);
+		$vat2 = get_default_localtax($companyes, $companyes, 2, 0);
 		$this->assertEquals($vat1, 5.2);
-		$this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
+		$this->assertStringStartsWith((string) $vat2, '-19:-15:-9'); // Can be -19 (old version) or '-19:-15:-9' (new setup)
 
 		// Test RULE ES-IT
-		$vat1=get_default_localtax($companyes, $companyit, 1, 0);
-		$vat2=get_default_localtax($companyes, $companyit, 2, 0);
+		$vat1 = get_default_localtax($companyes, $companyit, 1, 0);
+		$vat2 = get_default_localtax($companyes, $companyit, 2, 0);
 		$this->assertEquals(0, $vat1);
 		$this->assertEquals(0, $vat2);
 
 		// Test RULE ES-IT
-		$vat1=get_default_localtax($companyes, $notcompanyit, 1, 0);
-		$vat2=get_default_localtax($companyes, $notcompanyit, 2, 0);
+		$vat1 = get_default_localtax($companyes, $notcompanyit, 1, 0);
+		$vat2 = get_default_localtax($companyes, $notcompanyit, 2, 0);
 		$this->assertEquals(0, $vat1);
 		$this->assertEquals(0, $vat2);
 
@@ -1440,8 +1440,8 @@ 
 		// Not tested
 
 		// Test RULE ES-US
-		$vat1=get_default_localtax($companyes, $companyus, 1, 0);
-		$vat2=get_default_localtax($companyes, $companyus, 2, 0);
+		$vat1 = get_default_localtax($companyes, $companyus, 1, 0);
+		$vat2 = get_default_localtax($companyes, $companyus, 2, 0);
 		$this->assertEquals(0, $vat1);
 		$this->assertEquals(0, $vat2);
 	}
@@ -1475,14 +1475,14 @@ 
 	 */
 	public function testDolExplodeIntoArray()
 	{
-		$stringtoexplode='AA=B/B.CC=.EE=FF.HH=GG;.';
-		$tmp=dolExplodeIntoArray($stringtoexplode, '.', '=');
+		$stringtoexplode = 'AA=B/B.CC=.EE=FF.HH=GG;.';
+		$tmp = dolExplodeIntoArray($stringtoexplode, '.', '=');
 
 		print __METHOD__." tmp=".json_encode($tmp)."\n";
 		$this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}', json_encode($tmp));
 
-		$stringtoexplode="AA=B/B;CC=\n\rEE=FF\nHH=GG;;;\nII=JJ\n";
-		$tmp=dolExplodeIntoArray($stringtoexplode, "(\r\n|\n|\r|;)", '=');
+		$stringtoexplode = "AA=B/B;CC=\n\rEE=FF\nHH=GG;;;\nII=JJ\n";
+		$tmp = dolExplodeIntoArray($stringtoexplode, "(\r\n|\n|\r|;)", '=');
 
 		print __METHOD__." tmp=".json_encode($tmp)."\n";
 		$this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG","II":"JJ"}', json_encode($tmp));
@@ -1610,48 +1610,48 @@ 
 
 		$conf->global->MAIN_START_WEEK = 0;
 
-		$tmp=dol_getdate(24*60*60+1, false, 'UTC');		// 2/1/1970 and 1 second = friday
+		$tmp = dol_getdate(24 * 60 * 60 + 1, false, 'UTC'); // 2/1/1970 and 1 second = friday
 		$this->assertEquals(5, $tmp['wday'], 'Bad value of day in week');
 
 		$conf->global->MAIN_START_WEEK = 1;
 
-		$tmp=dol_getdate(1, false, 'UTC');				// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1, false, 'UTC'); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(4, $tmp['wday'], 'Bad value of day in week');
 
-		$tmp=dol_getdate(24*60*60+1, false, 'UTC');		// 2/1/1970 and 1 second = friday
+		$tmp = dol_getdate(24 * 60 * 60 + 1, false, 'UTC'); // 2/1/1970 and 1 second = friday
 		$this->assertEquals(5, $tmp['wday'], 'Bad value of day in week');
 
-		$tmp=dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1, false, "Europe/Paris"); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(1, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(4, $tmp['wday']);
 		$this->assertEquals(0, $tmp['yday']);
-		$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+		$this->assertEquals(1, $tmp['hours']); // We are winter, so we are GMT+1 even during summer
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(15638401, false, "Europe/Paris");					// 1/7/1970 and 1 second = wednesday
+		$tmp = dol_getdate(15638401, false, "Europe/Paris"); // 1/7/1970 and 1 second = wednesday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
 		$this->assertEquals(181, $tmp['yday']);
-		$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+		$this->assertEquals(1, $tmp['hours']); // There is no daylight in 1970, so we are GMT+1 even during summer
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(1593561601, false, "Europe/Paris");				// 1/7/2020 and 1 second = wednesday
+		$tmp = dol_getdate(1593561601, false, "Europe/Paris"); // 1/7/2020 and 1 second = wednesday
 		$this->assertEquals(2020, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
-		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
-		$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+		$this->assertEquals(182, $tmp['yday']); // 182 and not 181, due to the 29th february
+		$this->assertEquals(2, $tmp['hours']); // There is a daylight, so we are GMT+2
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(1, false, 'UTC');						// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1, false, 'UTC'); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(1, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
@@ -1662,7 +1662,7 @@ 
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(15638401, false, 'UTC');				// 1/7/1970 and 1 second = wednesday
+		$tmp = dol_getdate(15638401, false, 'UTC'); // 1/7/1970 and 1 second = wednesday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
@@ -1673,12 +1673,12 @@ 
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp=dol_getdate(1593561601, false, 'UTC');				// 1/7/2020 and 1 second = wednesday
+		$tmp = dol_getdate(1593561601, false, 'UTC'); // 1/7/2020 and 1 second = wednesday
 		$this->assertEquals(2020, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
-		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+		$this->assertEquals(182, $tmp['yday']); // 182 and not 181, due to the 29th february
 		// We must disable this because on CI, timezone is may be UTC or something else
 		//$this->assertEquals(2, $tmp['hours']);	// There is a daylight, so we are GMT+2
 		$this->assertEquals(0, $tmp['minutes']);
@@ -1735,11 +1735,11 @@ 
 	{
 		global $conf, $langs;
 
-		$chaine='This is an ISO string';
+		$chaine = 'This is an ISO string';
 		$result = dol_string_is_good_iso($chaine);
 		$this->assertEquals($result, 1);
 
-		$chaine='This is a not ISO string '.chr(0);
+		$chaine = 'This is a not ISO string '.chr(0);
 		$result = dol_string_is_good_iso($chaine);
 		$this->assertEquals($result, 0);
 
@@ -1795,18 +1795,18 @@ 
 	{
 		global $conf, $langs;
 
-		$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4';
-		$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = '1.2.3.4';
+		$_SERVER['HTTP_CLIENT_IP'] = '5.6.7.8';
 		$result = getUserRemoteIP();
 		$this->assertEquals($result, '1.2.3.4');
 
-		$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4<corrupted>';
-		$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = '1.2.3.4<corrupted>';
+		$_SERVER['HTTP_CLIENT_IP'] = '5.6.7.8';
 		$result = getUserRemoteIP();
 		$this->assertEquals($result, '5.6.7.8');
 
-		$_SERVER['HTTP_X_FORWARDED_FOR']='[1:2:3:4]';
-		$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = '[1:2:3:4]';
+		$_SERVER['HTTP_CLIENT_IP'] = '5.6.7.8';
 		$result = getUserRemoteIP();
 		$this->assertEquals($result, '[1:2:3:4]');
 

test/phpunit/FactureFournisseurTest.php

Spacing +43 added lines, -43 removed lines

@@ -25,7 +25,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,15 +56,15 @@ 
 	 */
 	public function testFactureFournisseurCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new FactureFournisseur($db);
+		$localobject = new FactureFournisseur($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		print __METHOD__." result=".$result."\n";
@@ -82,14 +82,14 @@ 
 	 */
 	public function testFactureFournisseurFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new FactureFournisseur($db);
-		$result=$localobject->fetch($id);
+		$localobject = new FactureFournisseur($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -107,14 +107,14 @@ 
 	 */
 	public function testFactureFournisseurUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject->note='New note after update';
-		$result=$localobject->update($user);
+		$localobject->note = 'New note after update';
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -132,13 +132,13 @@ 
 	 */
 	public function testFactureFournisseurValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->validate($user);
+		$result = $localobject->validate($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -156,11 +156,11 @@ 
 	 */
 	public function testFactureFournisseurOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		/*$result=$localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -185,15 +185,15 @@ 
 	 */
 	public function testFactureFournisseurDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new FactureFournisseur($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new FactureFournisseur($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());

test/phpunit/CommonClassTest.class.php

Spacing +14 added lines, -14 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    Class that extends all PHPunit tests. To share similare code between each test.
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -80,7 +80,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('agenda')) {
@@ -113,7 +113,7 @@ 
 		// Show log file
 		print "\n----- Test fails. Show last ".$nbLinesToShow." lines of dolibarr.log file -----\n";
 		foreach ($dernieresLignes as $ligne) {
-			print $ligne . "<br>";
+			print $ligne."<br>";
 		}
 
 		parent::onNotSuccessfulTest($t);
@@ -126,12 +126,12 @@ 
 	 */
 	protected function setUp(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";

test/phpunit/WebservicesProductsTest.php

Spacing +41 added lines, -41 removed lines

@@ -26,12 +26,12 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
@@ -39,9 +39,9 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_UMASK = '0666';
 
 if (!isModEnabled('service')) {
 	print "Error: Module service must be enabled.\n";
@@ -64,28 +64,28 @@ 
 	 */
 	public function testWSProductsCreateProductOrService()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$datestring=dol_print_date(dol_now(), 'dayhourlog');
+		$datestring = dol_print_date(dol_now(), 'dayhourlog');
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
 		$WS_METHOD  = 'createProductOrService';
-		$ns='http://www.dolibarr.org/ns/';
+		$ns = 'http://www.dolibarr.org/ns/';
 
 		// Set the WebService URL
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$soapclient = new nusoap_client($WS_DOL_URL);
 		if ($soapclient) {
-			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->soap_defencoding = 'UTF-8';
 			$soapclient->decodeUTF8(false);
 		}
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
@@ -94,9 +94,9 @@ 
 		);
 
 		// Test URL
-		$result='';
+		$result = '';
 		$parameters = array(
-			'authentication'=>$authentication,'product'=>array(
+			'authentication'=>$authentication, 'product'=>array(
 				'ref'=>'NewProductFromWS'.$datestring,
 				'label'=>'New Product From WS '.$datestring,
 				'type'=>1,
@@ -113,9 +113,9 @@ 
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+		if (!$result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";
@@ -141,26 +141,26 @@ 
 	 */
 	public function testWSProductsGetProductOrService($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
 		$WS_METHOD  = 'getProductOrService';
-		$ns='http://www.dolibarr.org/ns/';
+		$ns = 'http://www.dolibarr.org/ns/';
 
 		// Set the WebService URL
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$soapclient = new nusoap_client($WS_DOL_URL);
 		if ($soapclient) {
-			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->soap_defencoding = 'UTF-8';
 			$soapclient->decodeUTF8(false);
 		}
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
@@ -169,16 +169,16 @@ 
 		);
 
 		// Test URL
-		$result='';
-		$parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>'');
+		$result = '';
+		$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'');
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";
@@ -204,26 +204,26 @@ 
 	 */
 	public function testWSProductsDeleteProductOrService($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
 		$WS_METHOD  = 'deleteProductOrService';
-		$ns='http://www.dolibarr.org/ns/';
+		$ns = 'http://www.dolibarr.org/ns/';
 
 		// Set the WebService URL
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$soapclient = new nusoap_client($WS_DOL_URL);
 		if ($soapclient) {
-			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->soap_defencoding = 'UTF-8';
 			$soapclient->decodeUTF8(false);
 		}
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
@@ -232,16 +232,16 @@ 
 		);
 
 		// Test URL
-		$result='';
-		$parameters = array('authentication'=>$authentication,'listofid'=>$id);
+		$result = '';
+		$parameters = array('authentication'=>$authentication, 'listofid'=>$id);
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+		if (!$result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
 			//var_dump($soapclient);
 			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";

test/phpunit/ChargeSocialesTest.php

Spacing +38 added lines, -38 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,15 +55,15 @@ 
 	 */
 	public function testChargeSocialesCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new ChargeSociales($db);
+		$localobject = new ChargeSociales($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user, $langs, $conf);
+		$result = $localobject->create($user, $langs, $conf);
 		print __METHOD__." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -81,14 +81,14 @@ 
 	 */
 	public function testChargeSocialesFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new ChargeSociales($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -106,13 +106,13 @@ 
 	 */
 	public function testChargeSocialesValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->setPaid($user);
+		$result = $localobject->setPaid($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -130,17 +130,17 @@ 
 	 */
 	public function testChargeSocialesOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->getNomUrl(1);
+		$result = $localobject->getNomUrl(1);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertNotEquals($result, '');
 
-		$result=$localobject->getSommePaiement();
+		$result = $localobject->getSommePaiement();
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);
 
@@ -158,16 +158,16 @@ 
 	 */
 	public function testChargeSocialesDelete($id)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new ChargeSociales($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		$localobject = new ChargeSociales($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/GetUrlLibTest.php

Spacing +39 added lines, -39 removed lines

@@ -25,7 +25,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,41 +56,41 @@ 
 	 */
 	public function testGetRootURLFromURL()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
+		$result = getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('http://www.dolimed.com', $result, 'Test 1');
 
-		$result=getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
+		$result = getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('https://www.dolimed.com', $result, 'Test 2');
 
-		$result=getRootURLFromURL('http://www.dolimed.com/screenshots');
+		$result = getRootURLFromURL('http://www.dolimed.com/screenshots');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('http://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com/screenshots');
+		$result = getRootURLFromURL('https://www.dolimed.com/screenshots');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('https://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('http://www.dolimed.com/');
+		$result = getRootURLFromURL('http://www.dolimed.com/');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('http://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com/');
+		$result = getRootURLFromURL('https://www.dolimed.com/');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('https://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('http://www.dolimed.com');
+		$result = getRootURLFromURL('http://www.dolimed.com');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('http://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com');
+		$result = getRootURLFromURL('https://www.dolimed.com');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('https://www.dolimed.com', $result);
 
@@ -104,65 +104,65 @@ 
 	 */
 	public function testGetDomainFromURL()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// Tests with param 0
 
-		$result=getDomainFromURL('http://localhost');
+		$result = getDomainFromURL('http://localhost');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('localhost', $result, 'Test localhost 0');
 
-		$result=getDomainFromURL('http://localhost', 1);
+		$result = getDomainFromURL('http://localhost', 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('localhost', $result, 'Test localhost 1');
 
-		$result=getDomainFromURL('https://dolimed.com');
+		$result = getDomainFromURL('https://dolimed.com');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed', $result, 'Test dolimed.com 0');
 
-		$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile');
+		$result = getDomainFromURL('http://www.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed', $result, 'Test dolimed.com/... 0');
 
-		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile');
+		$result = getDomainFromURL('http://www.with.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed', $result, 'Test ...dolimed.com/ 0');
 
 		// Tests with param 1
 
-		$result=getDomainFromURL('https://dolimed.com', 1);
+		$result = getDomainFromURL('https://dolimed.com', 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed.com', $result, 'Test dolimed.com 1');
 
-		$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile', 1);
+		$result = getDomainFromURL('http://www.dolimed.com/screenshots/afile', 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed.com', $result, 'Test dolimed.com/... 1');
 
-		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 1);
+		$result = getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed.com', $result, 'Test .../dolimed.com 1');
 
 		// Tests with param 2
 
-		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 2);
+		$result = getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('with.dolimed.com', $result, 'Test .../dolimed.com 2');
 
 		// For domains with top domain on 2 levels
 
-		$result=getDomainFromURL('https://www.with.dolimed.com.mx', 0);
+		$result = getDomainFromURL('https://www.with.dolimed.com.mx', 0);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed', $result, 'Test dolimed.com.mx 0');
 
-		$result=getDomainFromURL('https://www.with.dolimed.com.mx', 1);
+		$result = getDomainFromURL('https://www.with.dolimed.com.mx', 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dolimed.com.mx', $result, 'Test dolimed.com.mx 1');
 
-		$result=getDomainFromURL('https://www.with.dolimed.com.mx', 2);
+		$result = getDomainFromURL('https://www.with.dolimed.com.mx', 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('with.dolimed.com.mx', $result, 'Test dolimed.com.mx 2');
 
@@ -176,17 +176,17 @@ 
 	 */
 	public function testRemoveHtmlComment()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
+		$result = removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('abcdef', $result, 'Test 1');
 
-		$result=removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
+		$result = removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('abcbbdef', $result, 'Test 1');
 

test/phpunit/CommandeTest.php

Spacing +50 added lines, -50 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,7 +55,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('commande')) {
@@ -74,21 +74,21 @@ 
 	 */
 	public function testCommandeCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$soc = new Societe($db);
 		$soc->name = "CommandeTest Unittest";
 		$socid = $soc->create($user);
 		$this->assertLessThan($socid, 0, $soc->errorsToString());
 
-		$localobject=new Commande($db);
+		$localobject = new Commande($db);
 		$localobject->initAsSpecimen();
 		$localobject->socid = $socid;
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		print __METHOD__." result=".$result."\n";
@@ -106,14 +106,14 @@ 
 	 */
 	public function testCommandeFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Commande($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Commande($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -131,14 +131,14 @@ 
 	 */
 	public function testCommandeUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject->note_private='New note private after update';
-		$result=$localobject->update($user);
+		$localobject->note_private = 'New note private after update';
+		$result = $localobject->update($user);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -156,13 +156,13 @@ 
 	 */
 	public function testCommandeValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->valid($user);
+		$result = $localobject->valid($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -180,13 +180,13 @@ 
 	 */
 	public function testCommandeCancel($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->cancel();
+		$result = $localobject->cancel();
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -204,11 +204,11 @@ 
 	 */
 	public function testCommandeOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		/*$result=$localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -233,15 +233,15 @@ 
 	 */
 	public function testCommandeDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Commande($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Commande($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/RepositoryTest.php

Spacing +21 added lines, -21 removed lines

@@ -24,42 +24,42 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 if (empty($user->id)) {
@@ -67,7 +67,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -88,15 +88,15 @@ 
 	 */
 	public function testJqueryOnce()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		// Scan dir to guarantee we don't have library jquery twice
-		$foundfiles=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
+		$foundfiles = dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
 		print __METHOD__." count(founddirs)=".count($foundfiles)."\n";
 		$this->assertEquals(1, count($foundfiles), 'We found jquery lib (jquery.js) twice');
 
 		// Scan dir to guarantee we don't have library jquery twice
-		$foundfiles=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.min\.js', array('ckeditor'));
+		$foundfiles = dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.min\.js', array('ckeditor'));
 		print __METHOD__." count(founddirs)=".count($foundfiles)."\n";
 		$this->assertEquals(1, count($foundfiles), 'We found jquery lib (jquery.min.js) twice '.(empty($foundfiles[0]) ? '' : $foundfiles[0]['fullname']).' '.(empty($foundfiles[1]) ? '' : $foundfiles[1]['fullname']));
 	}
@@ -109,11 +109,11 @@ 
 	 */
 	public function testRepository()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'directories', 1, '', array('\/custom\/'), 'fullname', SORT_ASC, 0, 1, '', 1);

test/phpunit/LesscTest.php

Spacing +18 added lines, -18 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -32,35 +32,35 @@ 
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 if (empty($user->id)) {
@@ -68,7 +68,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -87,11 +87,11 @@ 
 	 */
 	public function testLessc()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/lessc.class.php';