Dolibarr / dolibarr

htdocs/core/customreports.php

Spacing +17 added lines, -17 removed lines

@@ -162,7 +162,7 @@ 
 }
 
 // Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label('all');	// We load all extrafields definitions for all objects
+$extrafields->fetch_name_optionals_label('all'); // We load all extrafields definitions for all objects
 //$extrafields->fetch_name_optionals_label($object->table_element_line);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
@@ -175,7 +175,7 @@ 
 
 // If string is not an universal filter string, we try to convert it into universal filter syntax string
 $errorstr = '';
-forgeSQLFromUniversalSearchCriteria($search_component_params_input, $errorstr);	// Try converstion UFS->SQL
+forgeSQLFromUniversalSearchCriteria($search_component_params_input, $errorstr); // Try converstion UFS->SQL
 //var_dump($errorstr);
 if ($errorstr) {
 	$value = $search_component_params_input;
@@ -187,14 +187,14 @@ 
 	$crits = explode(' ', trim($value)); // the string after the name of the field. Explode on each AND
 	$res = '';
 
-	$i1 = 0;	// count the nb of and criteria added (all fields / criteria)
+	$i1 = 0; // count the nb of and criteria added (all fields / criteria)
 	foreach ($crits as $crit) {		// Loop on each AND criteria
 		$crit = trim($crit);
 
-		$i2 = 0;	// count the nb of valid criteria added for this first criteria
+		$i2 = 0; // count the nb of valid criteria added for this first criteria
 		$newres = '';
 		$tmpcrits = explode('|', $crit);
-		$i3 = 0;	// count the nb of valid criteria added for this current field
+		$i3 = 0; // count the nb of valid criteria added for this current field
 		foreach ($tmpcrits as $tmpcrit) {
 			if ($tmpcrit !== '0' && empty($tmpcrit)) {
 				continue;
@@ -212,8 +212,8 @@ 
 				}
 			}
 
-			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit);		// the name of the field
-			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit);	// the condition after the name of the field
+			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit); // the name of the field
+			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit); // the condition after the name of the field
 			//var_dump($field); var_dump($tmpcrit); var_dump($i3);
 
 			$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
@@ -572,7 +572,7 @@ 
 foreach ($arrayofmesures as $key => $val) {
 	$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
 }
-print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
+print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures")); // Fill the array $arrayofmeasures with possible fields
 print '</div>';
 
 // XAxis
@@ -580,14 +580,14 @@ 
 print '<div class="divadvancedsearchfield">';
 print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span><span class="fas fa-caret-down caretdownaxis" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span></div>';
 //var_dump($arrayofxaxis);
-print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400');	// Fill the array $arrayofxaxis with possible fields
+print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400'); // Fill the array $arrayofxaxis with possible fields
 print '</div>';
 
 // Group by
 $count = 0;
 print '<div class="divadvancedsearchfield">';
 print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("GroupBy")).'"></span></div>';
-print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy"));	// Fill the array $arrayofgroupby with possible fields
+print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy")); // Fill the array $arrayofgroupby with possible fields
 print '</div>';
 
 
@@ -743,7 +743,7 @@ 
 			//var_dump($arrayofgroupby);
 			$tmpforloop = dolExplodeIntoArray($arrayofxaxis[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -770,7 +770,7 @@ 
 			//var_dump($arrayofgroupby[$val]); var_dump($tmpval);
 			$tmpforloop = dolExplodeIntoArray($arrayofgroupby[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -797,7 +797,7 @@ 
 			//var_dump($arrayofgroupby);
 			$tmpforloop = dolExplodeIntoArray($arrayofmesures[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -1185,28 +1185,28 @@ 
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.1',
+					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-average'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.2',
+					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-min'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.3',
+					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-max'] = array(
 					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.4',
+					'position' => ($position + ($count * 100000)).'.4',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);

htdocs/core/lib/website.lib.php

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,7 @@ 
 {
 	$str = str_replace('<?=', '<?php', $str);
 	$str = str_replace('<?php', '__LTINTPHP__', $str);
-	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this is Off in php.ini
+	$str = str_replace('<?', '<?php', $str); // replace the short_open_tag. It is recommended to set this is Off in php.ini
 	$str = str_replace('__LTINTPHP__', '<?php', $str);
 
 	$newstr = '';
@@ -425,7 +425,7 @@ 
 	}
 
 	if (getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY')) {
-		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite ' . getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY'), $content);
+		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite '.getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY'), $content);
 	}
 
 	$content = dolReplaceSmileyCodeWithUTF8($content);
@@ -462,7 +462,7 @@ 
 			$sql .= " WHERE rowid = ".((int) $websiteid);
 
 			$resql = $db->query($sql);
-			if (! $resql) {
+			if (!$resql) {
 				return -1;
 			}
 		}
@@ -546,7 +546,7 @@ 
 			unset($tmpwebsitepage);
 		}
 		if ($result > 0) {
-			$currenturi = $_SERVER["REQUEST_URI"];	// Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&nocache=1708177483
+			$currenturi = $_SERVER["REQUEST_URI"]; // Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&nocache=1708177483
 			$regtmp = array();
 			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp)) {
 				if ($regtmp[0] == $containerref) {
@@ -875,7 +875,7 @@ 
 		$hashtags = trim(implode(' #', array_map('trim', explode(',', $websitepage->keywords))));
 
 		// Open Graph
-		$out .= '<meta name="og:type" content="website">'."\n";	// TODO If blogpost, use type article
+		$out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article
 		$out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n";
 		if ($websitepage->image) {
 			$out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n";
@@ -992,9 +992,9 @@ 
 	$sql = "SELECT COUNT(rowid) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql .= " WHERE entity IN (".getEntity($object->element).")";
-	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
+	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id); // Filter on object
 	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
-	$sql .= " AND share IS NOT NULL";	// Only image that are public
+	$sql .= " AND share IS NOT NULL"; // Only image that are public
 
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -1029,7 +1029,7 @@ 
 	$sql = "SELECT rowid, ref, share, filename, cover, position";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql .= " WHERE entity IN (".getEntity($object->element).")";
-	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
+	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id); // Filter on object
 	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
 	$sql .= $db->order("cover,position,rowid", "ASC,ASC,ASC");
 

dev/tools/apstats.php

Spacing +3 added lines, -3 removed lines

@@ -26,12 +26,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = dirname(__FILE__) . '/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit();
 }
 
@@ -717,7 +717,7 @@ 
 // Last security errors
 
 $html .= '<section class="chapter" id="linesofcode">'."\n";
-$html .= '<h2><span class="fas fa-code pictofixedwidth"></span>Last security issues <span class="opacitymedium">(last '.($nbofmonth > 1 ? $nbofmonth.' months':'month').')</span></h2>'."\n";
+$html .= '<h2><span class="fas fa-code pictofixedwidth"></span>Last security issues <span class="opacitymedium">(last '.($nbofmonth > 1 ? $nbofmonth.' months' : 'month').')</span></h2>'."\n";
 
 $html .= '<div class="boxallwidth">'."\n";
 $html .= '<div class="div-table-responsive">'."\n";

test/phpunit/RestAPIDocumentTest.php

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
  *      \brief      PHPUnit test
  *      \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';
@@ -59,7 +59,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('api')) {
@@ -77,7 +77,7 @@ 
 	 */
 	protected function setUp(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -85,16 +85,16 @@ 
 
 		$this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
 
-		$login='admin';
-		$password='admin';
-		$url=$this->api_url.'/login?login='.$login.'&password='.$password;
+		$login = 'admin';
+		$password = 'admin';
+		$url = $this->api_url.'/login?login='.$login.'&password='.$password;
 		// Call the API login method to save api_key for this test class.
 		// At first call, if token is not defined a random value is generated and returned.
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		print __METHOD__." result = ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+		$object = json_decode($result['content'], true); // If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
@@ -112,7 +112,7 @@ 
 	 */
 	public function testPushDocument()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		$url = $this->api_url.'/documents/upload?api_key='.$this->api_key;
 

test/phpunit/Functions2LibTest.php

Spacing +26 added lines, -26 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/functions2.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)
 }
 
 
@@ -79,7 +79,7 @@ 
 	 */
 	public function testJsUnEscape()
 	{
-		$result=jsUnEscape('%u03BD%u03B5%u03BF');
+		$result = jsUnEscape('%u03BD%u03B5%u03BF');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
 	}
@@ -111,7 +111,7 @@ 
 		$result = isValidUrl('http://google.com');
 		$this->assertEquals(1, $result);
 
-		$result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
+		$result = isValidUrl('goo=gle'); // This is good, it might be an alias of hostname
 		$this->assertEquals(1, $result);
 
 		//With scheme check
@@ -173,35 +173,35 @@ 
 	public function testIsIP()
 	{
 		// Not valid
-		$ip='a299.299.299.299';
-		$result=is_ip($ip);
+		$ip = 'a299.299.299.299';
+		$result = is_ip($ip);
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		$this->assertEquals(0, $result, $ip);
 
 		// Reserved IP range (not checked by is_ip function)
-		$ip='169.254.0.0';
-		$result=is_ip($ip);
+		$ip = '169.254.0.0';
+		$result = is_ip($ip);
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		//$this->assertEquals(2,$result,$ip);      // Assertion disabled because returned value differs between PHP patch version
 
-		$ip='1.2.3.4';
-		$result=is_ip($ip);
+		$ip = '1.2.3.4';
+		$result = is_ip($ip);
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		$this->assertEquals(1, $result, $ip);
 
 		// Private IP ranges
-		$ip='10.0.0.0';
-		$result=is_ip($ip);
+		$ip = '10.0.0.0';
+		$result = is_ip($ip);
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		$this->assertEquals(2, $result, $ip);
 
-		$ip='172.16.0.0';
-		$result=is_ip($ip);
+		$ip = '172.16.0.0';
+		$result = is_ip($ip);
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		$this->assertEquals(2, $result, $ip);
 
-		$ip='192.168.0.0';
-		$result=is_ip($ip);
+		$ip = '192.168.0.0';
+		$result = is_ip($ip);
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		$this->assertEquals(2, $result, $ip);
 	}

test/phpunit/ExportTest.php

Spacing +67 added lines, -67 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/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)
 }
 
 
@@ -80,15 +80,15 @@ 
 	 */
 	public function testExportCsvUtf()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$model='csvutf8';
+		$model = 'csvutf8';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-		print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
@@ -97,31 +97,31 @@ 
 		// First test without option USE_STRICT_CSV_RULES
 		unset($conf->global->USE_STRICT_CSV_RULES);
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -130,31 +130,31 @@ 
 		// Same tests with strict mode
 		$conf->global->USE_STRICT_CSV_RULES = 1;
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"');
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -169,15 +169,15 @@ 
 	 */
 	public function testExportOther()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$model='csviso';
+		$model = 'csviso';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-		print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
@@ -186,31 +186,31 @@ 
 		// First test without option USE_STRICT_CSV_RULES
 		unset($conf->global->USE_STRICT_CSV_RULES);
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -219,31 +219,31 @@ 
 		// Same tests with strict mode
 		$conf->global->USE_STRICT_CSV_RULES = 1;
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"');
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -258,54 +258,54 @@ 
 	 */
 	public function testExportPersonalizedExport()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		$sql = "SELECT f.ref as f_ref, f.total_ht as f_total, f.total_tva as f_tva FROM ".MAIN_DB_PREFIX."facture f";
 
-		$objexport=new Export($db);
+		$objexport = new Export($db);
 		//$objexport->load_arrays($user,$datatoexport);
 
 		// Define properties
-		$datatoexport='test';
+		$datatoexport = 'test';
 		$array_selected = array("f.ref"=>1, "f.total"=>2, "f.tva"=>3);
 		$array_export_fields = array("f.ref"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
 		$array_alias = array("f_ref"=>"ref", "f_total"=>"total", "f_tva"=>"tva");
-		$objexport->array_export_fields[0]=$array_export_fields;
-		$objexport->array_export_alias[0]=$array_alias;
+		$objexport->array_export_fields[0] = $array_export_fields;
+		$objexport->array_export_alias[0] = $array_alias;
 
 		dol_mkdir($conf->export->dir_temp);
 
-		$model='csviso';
+		$model = 'csviso';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in CSV export');
 
-		$model='csvutf8';
+		$model = 'csvutf8';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in CSV export');
 
-		$model='tsv';
+		$model = 'tsv';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
-		$expectedresult=1;
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in TSV export');
 
-		$model='excel2007';
+		$model = 'excel2007';
 
 		// Build export file
 		/* ko on php 7.4 on travis (zip not available) */
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
-		$expectedresult=1;
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in Excel2007 export');
 
 		return true;
@@ -319,7 +319,7 @@ 
 	 */
 	public function testExportPersonalizedWithFilter()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		/*
 		$sql = "SELECT f.ref as f_ref, f.total_ht as f_total_ht, f.total_tva as f_total_tva FROM ".MAIN_DB_PREFIX."facture f";
 
@@ -371,38 +371,38 @@ 
 	 */
 	public function testExportModulesDatasets()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$model='csviso';
+		$model = 'csviso';
 
-		$filterdatatoexport='';
+		$filterdatatoexport = '';
 		//$filterdatatoexport='';
 		//$array_selected = array("s.rowid"=>1, "s.nom"=>2);	// Must be fields found into declaration of dataset
 
 		// Load properties of arrays to make export
-		$objexport=new Export($db);
-		$result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
+		$objexport = new Export($db);
+		$result = $objexport->load_arrays($user, $filterdatatoexport); // This load ->array_export_xxx properties for datatoexport
 
 		// Loop on each dataset
 		foreach ($objexport->array_export_code as $key => $datatoexport) {
-			$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
+			$exportfile = $conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
 			print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
 			dol_delete_file($exportfile);
 
 			// Generate $array_selected
-			$i=0;
-			$array_selected=array();
+			$i = 0;
+			$array_selected = array();
 			foreach ($objexport->array_export_fields[$key] as $key => $val) {
-				$array_selected[$key]=$i++;
+				$array_selected[$key] = $i++;
 			}
 			//var_dump($array_selected);
 
 			// Build export file
 			$sql = "";
-			$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+			$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 			$expectedresult = 1;
 			$this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error);
-			$result=dol_is_file($exportfile);
+			$result = dol_is_file($exportfile);
 			$this->assertTrue($result, 'File '.$exportfile.' not found');
 		}
 

test/phpunit/InventoryTest.php

Spacing +67 added lines, -67 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 testInventoryCreate()
 	{
-		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 Inventory($db);
+		$localobject = new Inventory($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 		return $result;
@@ -81,14 +81,14 @@ 
 	 */
 	public function testInventoryFetch($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 Inventory($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Inventory($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -106,15 +106,15 @@ 
 	 */
 	public function testInventoryUpdate($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->status = 9;
 		$localobject->title = 'test';
-		$result=$localobject->update($user, $user);
+		$result = $localobject->update($user, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 		return $localobject;
@@ -132,13 +132,13 @@ 
 	 */
 	public function testInventoryValidate($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);
@@ -157,13 +157,13 @@ 
 	 */
 	public function testInventorySetDraft($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->setDraft($user);
+		$result = $localobject->setDraft($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -182,13 +182,13 @@ 
 	 */
 	public function testInventorySetRecorded($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->setRecorded($user);
+		$result = $localobject->setRecorded($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -207,13 +207,13 @@ 
 		 */
 	public function testInventorySetCanceled($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->setCanceled($user);
+		$result = $localobject->setCanceled($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -231,11 +231,11 @@ 
 	 */
 	public function testInventoryOther($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->info($localobject->id);
 		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
@@ -253,15 +253,15 @@ 
 	 */
 	public function testInventoryDelete($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 Inventory($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		$localobject = new Inventory($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -279,23 +279,23 @@ 
 	 */
 	public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
 	{
-		$retAr=array();
+		$retAr = array();
 
 		if (get_class($oA) !== get_class($oB)) {
-			$retAr[]="Supplied objects are not of same class.";
+			$retAr[] = "Supplied objects are not of same class.";
 		} else {
-			$oVarsA=get_object_vars($oA);
-			$oVarsB=get_object_vars($oB);
-			$aKeys=array_keys($oVarsA);
+			$oVarsA = get_object_vars($oA);
+			$oVarsB = get_object_vars($oB);
+			$aKeys = array_keys($oVarsA);
 			foreach ($aKeys as $sKey) {
 				if (in_array($sKey, $fieldstoignorearray)) {
 					continue;
 				}
-				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
+				if (!$ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+					$retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
+					$retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 			}
 		}

test/phpunit/DateLibTest.php

Spacing +144 added lines, -144 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;
 
 print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
 print "\n".$langs->trans("CurrentHour").' : '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver');
@@ -59,45 +59,45 @@ 
 	 */
 	public function testNumBetweenDay()
 	{
-		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;
 
 		// With same hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2012, 'gmt');
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
+		$date2 = dol_mktime(0, 0, 0, 1, 2, 2012, 'gmt');
 
-		$result=num_between_day($date1, $date2, 1);
+		$result = num_between_day($date1, $date2, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(2, $result);
 
-		$result=num_between_day($date1, $date2, 0);
+		$result = num_between_day($date1, $date2, 0);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
 		// With different hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
-		$date2=dol_mktime(12, 0, 0, 1, 2, 2012, 'gmt');
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
+		$date2 = dol_mktime(12, 0, 0, 1, 2, 2012, 'gmt');
 
-		$result=num_between_day($date1, $date2, 1);
+		$result = num_between_day($date1, $date2, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(2, $result);
 
-		$result=num_between_day($date1, $date2, 0);
+		$result = num_between_day($date1, $date2, 0);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
 		// With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
-		$date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
-		$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
+		$date1 = dol_mktime(0, 0, 0, 3, 28, 2014, true);
+		$date2 = dol_mktime(0, 0, 0, 3, 31, 2014, true);
 
-		$result=num_between_day($date1, $date2, 1);
+		$result = num_between_day($date1, $date2, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(4, $result);
 
-		$result=num_between_day($date1, $date2, 0);
+		$result = num_between_day($date1, $date2, 0);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(3, $result);
 
@@ -111,65 +111,65 @@ 
 	 */
 	public function testNumPublicHoliday()
 	{
-		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;
 
 		// With same hours - Tuesday/Wednesday jan 2013
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
-		$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
+		$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
+		$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
 
-		$result=num_public_holiday($date1, $date2, 'FR', 1);
+		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for FR result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 closed days (country france)
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 closed days (country france)
 
-		$result=num_public_holiday($date1, $date2, 'XX', 1);
+		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for XX result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 closed days (country unknown)
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 closed days (country unknown)
 
 		print '----'."\n";
-		$result=num_public_holiday($date2, $date3, 'FR', 1);
+		$result = num_public_holiday($date2, $date3, 'FR', 1);
 		print __METHOD__." for Wednesday 2 - Thursday 3 jan 2013 for FR result=".$result."\n";
-		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR');   // no closed days
+		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR'); // no closed days
 
 		// Check with easter monday
-		$date1=dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
-		$date2=dol_mktime(0, 0, 0, 4, 23, 2019, 'gmt');
+		$date1 = dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
+		$date2 = dol_mktime(0, 0, 0, 4, 23, 2019, 'gmt');
 
-		$result=num_public_holiday($date1, $date2, 'XX', 1);
+		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX');   // 2 opened day, 1 closed days (sunday)
+		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX'); // 2 opened day, 1 closed days (sunday)
 
-		$result=num_public_holiday($date1, $date2, 'FR', 1);
+		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR');   // 1 opened day, 2 closed days (sunday + easter monday)
+		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR'); // 1 opened day, 2 closed days (sunday + easter monday)
 
 		// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
-		$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
-		$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
+		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
+		$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
 
-		$result=num_public_holiday($date1, $date2, 'FR', 1);
+		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
-		$result=num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
+		$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
-		$result=num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
+		$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for FR');   // 2 opened day, 1 closed days
+		$this->assertEquals(1, $result, 'NumPublicHoliday for FR'); // 2 opened day, 1 closed days
 
-		$result=num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
+		$result = num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0, $result, 'NumPublicHoliday for FR');   // 3 opened day, 0 closed days
+		$this->assertEquals(0, $result, 'NumPublicHoliday for FR'); // 3 opened day, 0 closed days
 
-		$result=num_public_holiday($date1, $date2, 'XX', 1);
+		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
+		$this->assertEquals(2, $result, 'NumPublicHoliday for XX'); // 1 opened day, 2 closed days (even if country unknown)
 	}
 
 	/**
@@ -179,51 +179,51 @@ 
 	 */
 	public function testNumOpenDay()
 	{
-		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;
 
 		// With same hours - Tuesday/Wednesday jan 2013
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');	// tuesday
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');	// wednesday
-		$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');	// thursday
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt'); // tuesday
+		$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt'); // wednesday
+		$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt'); // thursday
 
-		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
+		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 opened days (country france)
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 opened days (country france)
 
-		$result=num_open_day($date1, $date2, 0, 1, 0, 'XX');
+		$result = num_open_day($date1, $date2, 0, 1, 0, 'XX');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 opened days (country unknown)
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 opened days (country unknown)
 
-		$result=num_open_day($date2, $date3, 0, 1, 0, 'FR');
+		$result = num_open_day($date2, $date3, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR');   // 2 opened days
+		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR'); // 2 opened days
 
 		// With same hours - Friday/Sunday jan 2013
-		$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');	// friday
-		$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');	// sunday
+		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // friday
+		$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt'); // sunday
 
-		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
+		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay for FR');   // 1 opened day, 2 closed
+		$this->assertEquals(1, $result, 'NumOpenDay for FR'); // 1 opened day, 2 closed
 
-		$result=num_open_day($date1, $date2, 'XX', 1);
+		$result = num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
+		$this->assertEquals(1, $result, 'NumOpenDay for XX'); // 1 opened day, 2 closes (even if country unknown)
 
 		// Test option MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY and MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY
 		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 0;
-		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
+		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day');   //2 opened day, 1 closed
+		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day'); //2 opened day, 1 closed
 
 		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 0;
-		$result=num_open_day($date1, $date2, 'XX', 1);
+		$result = num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days');   // 3 opened day, 0 closes (even if country unknown)
+		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days'); // 3 opened day, 0 closes (even if country unknown)
 	}
 
 	/**
@@ -233,13 +233,13 @@ 
 	 */
 	public function testConvertTime2Seconds()
 	{
-		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=convertTime2Seconds(1, 1, 2);
+		$result = convertTime2Seconds(1, 1, 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(3662, $result);
 
@@ -253,17 +253,17 @@ 
 	 */
 	public function testConvertSecondToTime()
 	{
-		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=convertSecondToTime(0, 'all', 86400);
+		$result = convertSecondToTime(0, 'all', 86400);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('0', $result);
 
-		$result=convertSecondToTime(86400, 'all', 86400);
+		$result = convertSecondToTime(86400, 'all', 86400);
 		print __METHOD__." result=".$result."\n";
 		$this->assertSame('1 '.$langs->trans("d"), $result);
 
@@ -277,64 +277,64 @@ 
 	 */
 	public function testDolPrintDate()
 	{
-		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;
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result=dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true);	// A case for compatibility check
+		$result = dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true); // A case for compatibility check
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1970-01-01 00:00:00', $result);
 
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result=dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
+		$result = dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1970-01-01 00:00:00', $result);
 
 		// Same with T and Z
-		$result=dol_print_date(0, '%Y-%m-%dT%H:%M:%SZ', true);
+		$result = dol_print_date(0, '%Y-%m-%dT%H:%M:%SZ', true);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1970-01-01T00:00:00Z', $result);
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('2500-01-01 00:00:00', $result);
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result=dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1912-01-01 00:00:00', $result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+		$this->assertEquals('1912-01-01 00:00:00', $result); // dol_print_date use TZ (good) but epoch converter does not use it.
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result=dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1600-01-01 00:00:00', $result);
 
 		// test with negative timezone
-		$result=dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1969-12-31 23:59:59', $result);
 
 		// Check dayhour format for fr_FR
-		$outputlangs=new Translate('', $conf);
+		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang('fr_FR');
 		$outputlangs->load("main");
 
-		$result=dol_print_date(0+24*3600, 'dayhour', true, $outputlangs);
+		$result = dol_print_date(0 + 24 * 3600, 'dayhour', true, $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('02/01/1970 00:00', $result);
 
 		// Check %a and %b format for fr_FR
-		$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
+		$result = dol_print_date(0, '%a %b %B', true, $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('Jeu Jan. Janvier', $result);
 
 
-		$result=dol_print_date(1619388000, '%Y-%m-%d %a', 'gmt', $outputlangs);
+		$result = dol_print_date(1619388000, '%Y-%m-%d %a', 'gmt', $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('2021-04-25 Dim', $result);
 
@@ -345,16 +345,16 @@ 
 		*/
 
 		// Check day format for en_US
-		$outputlangs=new Translate('', $conf);
+		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang('en_US');
 		$outputlangs->load("main");
 
-		$result=dol_print_date(0+24*3600, 'day', true, $outputlangs);
+		$result = dol_print_date(0 + 24 * 3600, 'day', true, $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('01/02/1970', $result);
 
 		// Check %a and %b format for en_US
-		$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
+		$result = dol_print_date(0, '%a %b %B', true, $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('Thu Jan January', $result);
 
@@ -368,18 +368,18 @@ 
 	 */
 	public function testDolTimePlusDuree()
 	{
-		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;
 
 		// Check dayhour format for fr_FR
-		$outputlangs=new Translate('', $conf);
+		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang('fr_FR');
 		$outputlangs->load("main");
 
-		$result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
+		$result = dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('02/02/1971 00:00', $result);
 
@@ -393,34 +393,34 @@ 
 	 */
 	public function testDolStringToTime()
 	{
-		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;
 
-		$stime='19700102';
-		$result=dol_stringtotime($stime);
+		$stime = '19700102';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(86400, $result);
 
-		$stime='1970-01-01T02:00:00Z';
-		$result=dol_stringtotime($stime);
+		$stime = '1970-01-01T02:00:00Z';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
-		$stime='1970-01-01 02:00:00';
-		$result=dol_stringtotime($stime);
+		$stime = '1970-01-01 02:00:00';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
-		$stime='19700101T020000Z';
-		$result=dol_stringtotime($stime);
+		$stime = '19700101T020000Z';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
-		$stime='19700101020000';
-		$result=dol_stringtotime($stime);
+		$stime = '19700101020000';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
@@ -436,19 +436,19 @@ 
 	{
 		global $conf;
 
-		$day=3;
-		$month=2;
-		$year=2015;
-		$conf->global->MAIN_START_WEEK = 1;	// start on monday
+		$day = 3;
+		$month = 2;
+		$year = 2015;
+		$conf->global->MAIN_START_WEEK = 1; // start on monday
 		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
+		$this->assertEquals(2, (int) $prev['first_day']); // monday for month 2, year 2014 is the 2
 
-		$day=3;
-		$month=2;
-		$year=2015;
-		$conf->global->MAIN_START_WEEK = 0;	// start on sunday
+		$day = 3;
+		$month = 2;
+		$year = 2015;
+		$conf->global->MAIN_START_WEEK = 0; // start on sunday
 		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
+		$this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st
 
 		return 1;
 	}
@@ -463,15 +463,15 @@ 
 	{
 		global $conf;
 
-		$now = 1800 + (24 * 3600 * 10);	// The 11th of january 1970 at 0:30 in UTC
+		$now = 1800 + (24 * 3600 * 10); // The 11th of january 1970 at 0:30 in UTC
 		$result = dol_get_first_hour($now, 'gmt');
 		print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
-		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt'));		// monday for month 2, year 2014 is the 2
+		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
 
-		$now = 23.5 * 3600 + (24 * 3600 * 10);	// The 11th of january 1970 at 23:30 in UTC
+		$now = 23.5 * 3600 + (24 * 3600 * 10); // The 11th of january 1970 at 23:30 in UTC
 		$result = dol_get_first_hour($now, 'gmt');
 		print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
-		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt'));		// monday for month 2, year 2014 is the 2
+		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
 
 		return 1;
 	}

test/phpunit/DoliDBTest.php

Spacing +7 added lines, -7 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,11 +55,11 @@ 
 	 */
 	public function testDDLUpdateField()
 	{
-		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;
 
 		print __METHOD__.' db->type = '.$db->type."\n";