Dolibarr / dolibarr

htdocs/comm/action/class/actioncomm.class.php

Spacing +15 added lines, -15 removed lines

@@ -562,8 +562,8 @@ 
 		$sql .= "ip";
 		$sql .= ") VALUES (";
 		$sql .= "'(PROV)', ";
-		$sql .= "'".$this->db->idate($now)."', ";	// date creation
-		$sql .= "'".$this->db->idate($this->datep)."', ";	// date start event
+		$sql .= "'".$this->db->idate($now)."', "; // date creation
+		$sql .= "'".$this->db->idate($this->datep)."', "; // date start event
 		$sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
 		$sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
 		$sql .= (isset($this->type_id) ? $this->type_id : "null").",";
@@ -637,7 +637,7 @@ 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$error++;
-							dol_syslog('Error to process userassigned: ' . $this->db->lasterror(), LOG_ERR);
+							dol_syslog('Error to process userassigned: '.$this->db->lasterror(), LOG_ERR);
 							$this->errors[] = $this->db->lasterror();
 						} else {
 							$already_inserted[$val['id']] = true;
@@ -662,7 +662,7 @@ 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$error++;
-							dol_syslog('Error to process socpeopleassigned: ' . $this->db->lasterror(), LOG_ERR);
+							dol_syslog('Error to process socpeopleassigned: '.$this->db->lasterror(), LOG_ERR);
 							$this->errors[] = $this->db->lasterror();
 						} else {
 							$already_inserted[$id] = true;
@@ -1176,7 +1176,7 @@ 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm";
 		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
 		$sql .= ", fk_action = ".(int) $this->type_id;
-		$sql .= ", code = " . ($code ? "'".$this->db->escape($code)."'" : "null");
+		$sql .= ", code = ".($code ? "'".$this->db->escape($code)."'" : "null");
 		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -1332,7 +1332,7 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
-		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters); // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
 			$sql .= $hookmanager->resPrint;
 		}
@@ -1356,7 +1356,7 @@ 
 		}
 		// Fields where hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
-		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters); // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
 			$sql .= $hookmanager->resPrint;
 		}
@@ -1433,7 +1433,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$response = null;  // Ensure the variable is defined
+			$response = null; // Ensure the variable is defined
 			if (empty($load_state_board)) {
 				$agenda_static = new ActionComm($this->db);
 				$response = new WorkboardResponse();
@@ -1645,9 +1645,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('category') && !$nofetch) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
 		}
 
 		return $datas;
@@ -1737,8 +1737,8 @@ 
 		}
 		if (!empty($this->note_private)) {
 			$tooltip .= '<br><hr>';
-			$texttoshow = dolGetFirstLineOfText($this->note_private, 8);	// Try to limit length of content
-			$tooltip .= '<div class="tenlinesmax">';						// Restrict height of content into the tooltip
+			$texttoshow = dolGetFirstLineOfText($this->note_private, 8); // Try to limit length of content
+			$tooltip .= '<div class="tenlinesmax">'; // Restrict height of content into the tooltip
 			$tooltip .= (dol_textishtml($texttoshow) ? str_replace(array("\r", "\n"), "", $texttoshow) : str_replace(array("\r", "\n"), '<br>', $texttoshow));
 			$tooltip .= '</div>';
 		}
@@ -2495,7 +2495,7 @@ 
 	 */
 	public static function replaceProduct(DoliDB $dbs, $origin_id, $dest_id)
 	{
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'actioncomm SET fk_element = ' . ((int) $dest_id) . ' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'actioncomm SET fk_element = '.((int) $dest_id).' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
 		// using $dbs, not $this->db because function is static
 		if (!$dbs->query($sql)) {
 			//$this->errors = $dbs->lasterror();
@@ -2620,7 +2620,7 @@ 
 		//Select all action comm reminders
 		$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
 		$sql .= " WHERE typeremind = 'email'";
-		$sql .= " AND status = 0";	// 0=No yet sent, -1=Error. TODO Include reminder in error once we can count number of error, so we can try 5 times and not more on errors.
+		$sql .= " AND status = 0"; // 0=No yet sent, -1=Error. TODO Include reminder in error once we can count number of error, so we can try 5 times and not more on errors.
 		$sql .= " AND dateremind <= '".$this->db->idate($now)."'";
 		$sql .= " AND entity IN (".getEntity('actioncomm').")";
 		$sql .= $this->db->order("dateremind", "ASC");
@@ -2629,7 +2629,7 @@ 
 		if ($resql) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$formmail = new FormMail($this->db);
-			$to = null;  // Ensure 'to' is defined for static analysis
+			$to = null; // Ensure 'to' is defined for static analysis
 
 			while ($obj = $this->db->fetch_object($resql)) {
 				$res = $actionCommReminder->fetch($obj->id);

test/phpunit/FunctionsLibTest.php

Indentation +4 added lines, -4 removed lines

@@ -472,10 +472,10 @@
 
 
 	/**
-	* testGetBrowserInfo
-	*
-	* @return void
-	*/
+	 * testGetBrowserInfo
+	 *
+	 * @return void
+	 */
 	public function testGetBrowserInfo()
 	{
 		// MSIE 5.0

Spacing +72 added lines, -72 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);
 		}
@@ -256,9 +256,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)";
@@ -677,13 +677,13 @@ 
 		$input = 'xxx < br>';
 		$after = dol_textishtml($input);
 		$this->assertFalse($after);
-		$input = 'xxx <email@email.com>';	// <em> is html, <em... is not
+		$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);
 		$this->assertFalse($after);
-		$input = 'This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
+		$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);
 
@@ -739,17 +739,17 @@ 
 	public function testDolConcat()
 	{
 		$text1 = "A string 1";
-		$text2 = "A string 2";	// text 1 and 2 are text, concat need only \n
+		$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
+		$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
+		$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);
 
@@ -851,19 +851,19 @@ 
 		// Text not already HTML
 
 		$input = "A string\nwith a é, &, < and >.";
-		$after = dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$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>
+		$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
@@ -876,11 +876,11 @@ 
 		$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
+		$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
+		$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);
 
@@ -1044,43 +1044,43 @@ 
 		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);
 	}
@@ -1093,7 +1093,7 @@ 
 	 */
 	public function testDolEscapeJs()
 	{
-		$input = "x&<b>#</b>,\"'";    // " will be converted into '
+		$input = "x&<b>#</b>,\"'"; // " will be converted into '
 		$result = dol_escape_js($input);
 		$this->assertEquals("x&<b>#</b>,\'\'", $result, "Test mode=0");
 
@@ -1112,15 +1112,15 @@ 
 	 */
 	public function testDolEscapeHtmlTag()
 	{
-		$input = 'x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
+		$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
+		$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);
 
-		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
+		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">'; // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
 		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">', $result);
 
@@ -1145,7 +1145,7 @@ 
 	 */
 	public function testDolFormatAddress()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -1183,7 +1183,7 @@ 
 	 */
 	public function testDolPrintPhone()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -1262,13 +1262,13 @@ 
 	public function verifCondDataProvider(): array
 	{
 		return [
-			'Test a true comparison' => ['1==1', true,],
-			'Test a false comparison' => ['1==2', false,],
-			'Test that the conf property of a module reports true when enabled' => ['isModEnabled("facture")', true,],
-			'Test that the conf property of a module reports false when disabled' => ['isModEnabled("moduledummy")', false,],
-			'Test that verifConf(0) returns false' => [0, false,],
-			'Test that verifConf("0") returns false' => ["0", false,],
-			'Test that verifConf("") returns false (special case)' => ['', true,],
+			'Test a true comparison' => ['1==1', true, ],
+			'Test a false comparison' => ['1==2', false, ],
+			'Test that the conf property of a module reports true when enabled' => ['isModEnabled("facture")', true, ],
+			'Test that the conf property of a module reports false when disabled' => ['isModEnabled("moduledummy")', false, ],
+			'Test that verifConf(0) returns false' => [0, false, ],
+			'Test that verifConf("0") returns false' => ["0", false, ],
+			'Test that verifConf("") returns false (special case)' => ['', true, ],
 		];
 	}
 
@@ -1298,7 +1298,7 @@ 
 	 */
 	public function testGetDefaultTva()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$this->savconf = $conf;
 		$this->savuser = $user;
 		$this->savlangs = $langs;
@@ -1401,7 +1401,7 @@ 
 	 */
 	public function testGetDefaultLocalTax()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$this->savconf = $conf;
 		$this->savuser = $user;
 		$this->savlangs = $langs;
@@ -1457,7 +1457,7 @@ 
 		$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);
@@ -1645,48 +1645,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']);
@@ -1697,7 +1697,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']);
@@ -1708,12 +1708,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']);