Dolibarr / dolibarr

test/phpunit/RestAPIUserTest.php

Spacing +26 added lines, -26 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';
@@ -37,8 +37,8 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -60,7 +60,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')) {
@@ -78,24 +78,24 @@ 
 	*/
 	protected function setUp(): void
 	{
-		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;
 
 		$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']));
@@ -114,28 +114,28 @@ 
 	 */
 	public function testRestGetUser()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		$url = $this->api_url.'/users/123456789?api_key='.$this->api_key;
 		//$addheaders=array('Content-Type: application/json');
 
 		print __METHOD__." Request GET url=".$url."\n";
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		//print __METHOD__." result for get on unexisting user: ".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);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertEquals(404, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error code is not 404');
 
 		$url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
 		print __METHOD__." Request GET url=".$url."\n";
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		print __METHOD__." result for get on an existing user: ".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);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertEquals(1, $object['statut']);
 
@@ -154,7 +154,7 @@ 
 	{
 		// attempt to create without mandatory fields :
 		$url = $this->api_url.'/users?api_key='.$this->api_key;
-		$addheaders=array('Content-Type: application/json');
+		$addheaders = array('Content-Type: application/json');
 
 		$bodyobj = array(
 			"lastname"=>"testRestUser",
@@ -164,11 +164,11 @@ 
 		$body = json_encode($bodyobj);
 
 		print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		//print __METHOD__." Result for creating incomplete user".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);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must no be null");
 		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 
@@ -182,11 +182,11 @@ 
 		);
 		$body = json_encode($bodyobj);
 		print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		print __METHOD__." result code for creating non existing user = ".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 no be null");
 		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']) || empty($object['error']['code'])) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
@@ -194,11 +194,11 @@ 
 
 		// attempt to create duplicated user
 		print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		//print __METHOD__." Result for creating duplicate user".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);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must no be null");
 		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 	}

test/phpunit/JsonLibTest.php

Spacing +37 added lines, -37 removed lines

@@ -24,41 +24,41 @@ 
  *      \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__).'/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,56 +79,56 @@ 
 	public function testJsonEncode()
 	{
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		// Try to decode a string encoded with serialize
 		$encoded = 'a:1:{s:7:"options";a:3:{s:3:"app";s:11:"Application";s:6:"system";s:6:"System";s:6:"option";s:6:"Option";}}';
-		$decoded=json_decode($encoded, true);
+		$decoded = json_decode($encoded, true);
 		$this->assertEquals(null, $decoded, 'test to json_decode() a string that was encoded with serialize()');
 
 		$encoded = 'rubishstring!aa{bcd';
-		$decoded=json_decode($encoded, true);
+		$decoded = json_decode($encoded, true);
 		$this->assertEquals(null, $decoded, 'test to json_decode() a string that was encoded with serialize()');
 
 		// Do a test with an array starting with 0
-		$arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
+		$arraytotest = array(0=>array('key'=>1, 'value'=>'PRODREF', 'label'=>'Product ref with é and special chars \\ \' "'));
+		$arrayencodedexpected = '[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
 
-		$encoded=json_encode($arraytotest);
+		$encoded = json_encode($arraytotest);
 		$this->assertEquals($arrayencodedexpected, $encoded);
-		$decoded=json_decode($encoded, true);
+		$decoded = json_decode($encoded, true);
 		$this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
 
-		$encoded=dol_json_encode($arraytotest);
+		$encoded = dol_json_encode($arraytotest);
 		$this->assertEquals($arrayencodedexpected, $encoded);
-		$decoded=dol_json_decode($encoded, true);
+		$decoded = dol_json_decode($encoded, true);
 		$this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
 
 		// Same test but array start with 2 instead of 0
-		$arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
+		$arraytotest = array(2=>array('key'=>1, 'value'=>'PRODREF', 'label'=>'Product ref with é and special chars \\ \' "'));
+		$arrayencodedexpected = '{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
 
-		$encoded=json_encode($arraytotest);
+		$encoded = json_encode($arraytotest);
 		$this->assertEquals($arrayencodedexpected, $encoded);
-		$decoded=json_decode($encoded, true);
+		$decoded = json_decode($encoded, true);
 		$this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
 
-		$encoded=dol_json_encode($arraytotest);
+		$encoded = dol_json_encode($arraytotest);
 		$this->assertEquals($arrayencodedexpected, $encoded);
-		$decoded=dol_json_decode($encoded, true);
+		$decoded = dol_json_decode($encoded, true);
 		$this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
 
 		// Test with object
-		$now=gmmktime(12, 0, 0, 1, 1, 1970);
-		$objecttotest=new stdClass();
-		$objecttotest->property1='abc';
-		$objecttotest->property2=1234;
-		$objecttotest->property3=$now;
-		$encoded=dol_json_encode($objecttotest);
+		$now = gmmktime(12, 0, 0, 1, 1, 1970);
+		$objecttotest = new stdClass();
+		$objecttotest->property1 = 'abc';
+		$objecttotest->property2 = 1234;
+		$objecttotest->property3 = $now;
+		$encoded = dol_json_encode($objecttotest);
 		$this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}', $encoded);
 	}
 }

test/phpunit/CMailFileTest.php

Spacing +23 added lines, -23 removed lines

@@ -27,9 +27,9 @@ 
 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/class/CMailFile.class.php';
-require_once dirname(__FILE__) . '/../../htdocs/core/lib/files.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
@@ -65,8 +65,8 @@ 
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
 
 		$result = $localobject->sendfile();
-		print __METHOD__ . " result=" . $result . "\n";
-		$this->assertFalse($result);   // False because mail send disabled
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result); // False because mail send disabled
 
 		return $result;
 	}
@@ -88,42 +88,42 @@ 
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 0);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 1);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '<john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 2);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'john@doe.com');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 3, 0);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"John Doe" <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 3, 1);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 4);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe');
 
 		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
 		$result = $localobject->getValidAddress($src, 4);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
 
 		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
 		$result = $localobject->getValidAddress($src, 4, 0, 2);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe,John Doe2...');
 
 		return $result;
@@ -146,9 +146,9 @@ 
 		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
 		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
 
-		dol_delete_dir_recursive(DOL_DATA_ROOT . '/medias/image');
-		dol_mkdir(DOL_DATA_ROOT . '/medias/image');
-		dol_copy(dirname(__FILE__) . '/img250x20.png', DOL_DATA_ROOT . '/medias/image/img250x20.png');
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/image');
+		dol_mkdir(DOL_DATA_ROOT.'/medias/image');
+		dol_copy(dirname(__FILE__).'/img250x20.png', DOL_DATA_ROOT.'/medias/image/img250x20.png');
 
 		$msg = '<html><body>';
 		$msg .= '<img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/img250x20.png" style="height:39px; width:150px" />';
@@ -159,31 +159,31 @@ 
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', '/tmp');
 
 		$result = count($localobject->html_images);
-		print __METHOD__ . " result count image detected in the mail=" . $result . "\n";
+		print __METHOD__." result count image detected in the mail=".$result."\n";
 		$this->assertEquals($result, 2);
 
 
 		foreach ($localobject->html_images as $i => $val)
 		if ($localobject->html_images[$i]) {
 			if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
-				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				print __METHOD__." content type must be image png =".$localobject->html_images[$i]['content_type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
-				print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";
+				print __METHOD__." type must be cidfromurl =".$localobject->html_images[$i]['type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromurl');
 
 				$fileSize = 9744;
-				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				print __METHOD__." File size must be =".$fileSize."\n";
 				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
 			} elseif (preg_match('/\.png/i', $localobject->html_images[$i]['fullpath'])) {
-				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				print __METHOD__." content type must be image png =".$localobject->html_images[$i]['content_type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
-				print __METHOD__ . " type must be cidfromdata =" . $localobject->html_images[$i]['type'] . "\n";
+				print __METHOD__." type must be cidfromdata =".$localobject->html_images[$i]['type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromdata');
 
 				$fileSize = 85;
-				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				print __METHOD__." File size must be =".$fileSize."\n";
 				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
 			}
 		}

test/phpunit/ModulesTest.php

Spacing +22 added lines, -22 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';
@@ -35,7 +35,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -54,35 +54,35 @@ 
 	 */
 	public function testModulesInit()
 	{
-		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;
 
-		$modulelist=array('Accounting','Adherent','Agenda','Api','Asset','Banque','Barcode','BlockedLog','Bom','Bookmark',
-		'Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','DataPolicy','Dav','DebugBar','Deplacement','DocumentGeneration','Don','DynamicPrices',
-		'ECM','EmailCollector','EventOrganization','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Intracommreport',
-		'KnowledgeManagement','Label','Ldap','Loan',
-		'Mailing','MailmanSpip','Margin','ModuleBuilder','Mrp','MultiCurrency',
-		'Notification','Oauth','OpenSurvey','Paybox','PaymentByBankTransfer','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale',
-		'ReceiptPrinter','Reception','Recruitment','Resource',
-		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog',
-		'TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow','Workstation','Zapier');
+		$modulelist = array('Accounting', 'Adherent', 'Agenda', 'Api', 'Asset', 'Banque', 'Barcode', 'BlockedLog', 'Bom', 'Bookmark',
+		'Categorie', 'ClickToDial', 'Collab', 'Commande', 'Comptabilite', 'Contrat', 'Cron', 'DataPolicy', 'Dav', 'DebugBar', 'Deplacement', 'DocumentGeneration', 'Don', 'DynamicPrices',
+		'ECM', 'EmailCollector', 'EventOrganization', 'Expedition', 'ExpenseReport', 'Export', 'ExternalRss', 'ExternalSite',
+		'Facture', 'Fckeditor', 'Ficheinter', 'Fournisseur', 'FTP', 'GeoIPMaxmind', 'Gravatar', 'Holiday', 'HRM', 'Import', 'Incoterm', 'Intracommreport',
+		'KnowledgeManagement', 'Label', 'Ldap', 'Loan',
+		'Mailing', 'MailmanSpip', 'Margin', 'ModuleBuilder', 'Mrp', 'MultiCurrency',
+		'Notification', 'Oauth', 'OpenSurvey', 'Paybox', 'PaymentByBankTransfer', 'Paypal', 'Prelevement', 'Printing', 'Product', 'ProductBatch', 'Projet', 'Propale',
+		'ReceiptPrinter', 'Reception', 'Recruitment', 'Resource',
+		'Salaries', 'Service', 'SocialNetworks', 'Societe', 'Stock', 'Stripe', 'SupplierProposal', 'Syslog',
+		'TakePos', 'Tax', 'Ticket', 'User', 'Variants', 'WebServices', 'WebServicesClient', 'Website', 'Workflow', 'Workstation', 'Zapier');
 		foreach ($modulelist as $modlabel) {
 			require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
-			$class='mod'.$modlabel;
-			$mod=new $class($db);
+			$class = 'mod'.$modlabel;
+			$mod = new $class($db);
 
-			$result=$mod->remove();
-			$result=$mod->init();
+			$result = $mod->remove();
+			$result = $mod->init();
 
 			$this->assertLessThan($result, 0, $modlabel." ".$mod->error);
 			print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
 
 			if (in_array($modlabel, array('Ldap', 'MailmanSpip'))) {
-				$result=$mod->remove();
+				$result = $mod->remove();
 			}
 		}
 

test/phpunit/PropalTest.php

Spacing +47 added lines, -47 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,15 +55,15 @@ 
 	 */
 	public function testPropalCreate()
 	{
-		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 Propal($db);
+		$localobject = new Propal($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -81,14 +81,14 @@ 
 	 */
 	public function testPropalFetch($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 Propal($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Propal($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -106,11 +106,11 @@ 
 	 */
 	public function testPropalUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$localobject->note_private = 'New note private after update';
 		$result = $localobject->update($user);
@@ -131,14 +131,14 @@ 
 	 */
 	public function testPropalAddLine($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->fetch_thirdparty();
-		$result=$localobject->addline('Added line', 10, 2, 19.6);
+		$result = $localobject->addline('Added line', 10, 2, 19.6);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -156,13 +156,13 @@ 
 	 */
 	public function testPropalValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->valid($user);
+		$result = $localobject->valid($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -180,11 +180,11 @@ 
 	 */
 	public function testPropalOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		/*$result=$localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -209,15 +209,15 @@ 
 	 */
 	public function testPropalDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Propal($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Propal($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/AccountingAccountTest.php

Spacing +33 added lines, -33 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,7 +55,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('accounting')) {
@@ -74,13 +74,13 @@ 
 	 */
 	public function testAccountingAccountCreate()
 	{
-		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 AccountingAccount($db);
+		$localobject = new AccountingAccount($db);
 		$localobject->fk_pcg_version = 'PCG99-ABREGE';
 		$localobject->account_category = 0;
 		$localobject->pcg_type = 'XXXXX';
@@ -89,7 +89,7 @@ 
 		$localobject->account_parent = 0;
 		$localobject->label = 'Account specimen';
 		$localobject->active = 0;
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -108,14 +108,14 @@ 
 	 */
 	public function testAccountingAccountFetch($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 AccountingAccount($db);
-		$result=$localobject->fetch($id);
+		$localobject = new AccountingAccount($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -134,14 +134,14 @@ 
 	 */
 	public function testAccountingAccountUpdate($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->label='New label';
-		$result=$localobject->update($user);
+		$localobject->label = 'New label';
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -160,15 +160,15 @@ 
 	 */
 	public function testAccountingAccountDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new AccountingAccount($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new AccountingAccount($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/WebservicesOtherTest.php

Spacing +20 added lines, -20 removed lines

@@ -24,12 +24,12 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
@@ -37,9 +37,9 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -58,26 +58,26 @@ 
 	 */
 	public function testWSOtherGetVersions()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
 		$WS_METHOD  = 'getVersions';
-		$ns='http://www.dolibarr.org/ns/';
+		$ns = 'http://www.dolibarr.org/ns/';
 
 		// Set the WebService URL
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$soapclient = new nusoap_client($WS_DOL_URL);
 		if ($soapclient) {
-			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->soap_defencoding = 'UTF-8';
 			$soapclient->decodeUTF8(false);
 		}
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
@@ -86,20 +86,20 @@ 
 		);
 
 		// Test URL
-		$result='';
+		$result = '';
 		$parameters = array('authentication'=>$authentication);
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
 		if (!empty($result['faultstring'])) {
 			print $result['faultstring']."\n";
-			$result=0;
+			$result = 0;
 		}
-		if (! $result) {
+		if (!$result) {
 			//var_dump($soapclient);
 			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
@@ -113,17 +113,17 @@ 
 		$this->assertEquals('OK', $result['result']['result_code']);
 
 		// Test method that does not exists
-		$WS_METHOD='methodthatdoesnotexists';
-		$result='';
+		$WS_METHOD = 'methodthatdoesnotexists';
+		$result = '';
 		$parameters = array('authentication'=>$authentication);
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";

test/phpunit/WebservicesOrdersTest.php

Spacing +15 added lines, -15 removed lines

@@ -24,12 +24,12 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
@@ -37,9 +37,9 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -58,26 +58,26 @@ 
 	 */
 	public function testWSOrderGetOrder()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
 		$WS_METHOD  = 'getOrder';
-		$ns='http://www.dolibarr.org/ns/';
+		$ns = 'http://www.dolibarr.org/ns/';
 
 		// Set the WebService URL
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$soapclient = new nusoap_client($WS_DOL_URL);
 		if ($soapclient) {
-			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->soap_defencoding = 'UTF-8';
 			$soapclient->decodeUTF8(false);
 		}
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
@@ -86,15 +86,15 @@ 
 		);
 
 		// Test URL
-		$parameters = array('authentication'=>$authentication,'id'=>1);
+		$parameters = array('authentication'=>$authentication, 'id'=>1);
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";

test/phpunit/CodingPhpTest.php

Spacing +106 added lines, -106 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -32,35 +32,35 @@ 
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 if (empty($user->id)) {
@@ -68,7 +68,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -87,11 +87,11 @@ 
 	 */
 	public function testPHP()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname', SORT_ASC, 0, 1, '', 1);
@@ -117,7 +117,7 @@ 
 			}
 
 			//print 'Check php file '.$file['relativename']."\n";
-			$filecontent=file_get_contents($file['fullname']);
+			$filecontent = file_get_contents($file['fullname']);
 
 			if (preg_match('/\.class\.php/', $file['relativename'])
 				|| preg_match('/boxes\/box_/', $file['relativename'])
@@ -125,7 +125,7 @@ 
 				|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
 				|| in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) {
 				// Check into Class files
-				if (! in_array($file['name'], array(
+				if (!in_array($file['name'], array(
 					'api.class.php',
 					'commonobject.class.php',
 					'conf.class.php',
@@ -136,12 +136,12 @@ 
 					'multicurrency.class.php'
 				))) {
 					// Must not find $db->
-					$ok=true;
-					$matches=array();
+					$ok = true;
+					$matches = array();
 					// Check string $db-> inside a class.php file (it should be $this->db-> into such classes)
 					preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 					foreach ($matches as $key => $val) {
-						$ok=false;
+						$ok = false;
 						break;
 					}
 					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -149,7 +149,7 @@ 
 					//exit;
 				}
 
-				if (preg_match('/\.class\.php/', $file['relativename']) && ! in_array($file['relativename'], array(
+				if (preg_match('/\.class\.php/', $file['relativename']) && !in_array($file['relativename'], array(
 					'adherents/canvas/actions_adherentcard_common.class.php',
 					'contact/canvas/actions_contactcard_common.class.php',
 					'compta/facture/class/facture.class.php',
@@ -192,7 +192,7 @@ 
 				}
 			} else {
 				// Check into Include files
-				if (! in_array($file['name'], array(
+				if (!in_array($file['name'], array(
 					'objectline_view.tpl.php',
 					'extrafieldsinexport.inc.php',
 					'extrafieldsinimport.inc.php',
@@ -200,12 +200,12 @@ 
 					'DoliStorage.php'
 				))) {
 					// Must not found $this->db->
-					$ok=true;
-					$matches=array();
+					$ok = true;
+					$matches = array();
 					// Check string $this->db-> into a non class.php file (it should be $db-> into such classes)
 					preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 					foreach ($matches as $key => $val) {
-						$ok=false;
+						$ok = false;
 						break;
 					}
 					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -217,11 +217,11 @@ 
 			// Check we don't miss top_httphead() into any ajax pages
 			if (preg_match('/ajax\//', $file['relativename'])) {
 				print "Analyze ajax page ".$file['relativename']."\n";
-				$ok=true;
-				$matches=array();
+				$ok = true;
+				$matches = array();
 				preg_match_all('/top_httphead/', $filecontent, $matches, PREG_SET_ORDER);
 				if (count($matches) == 0) {
-					$ok=false;
+					$ok = false;
 				}
 				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
 				$this->assertTrue($ok, 'Did not find top_httphead into the ajax page '.$file['relativename']);
@@ -230,14 +230,14 @@ 
 
 			// Check if a var_dump has been forgotten
 			if (!preg_match('/test\/phpunit/', $file['fullname'])) {
-				if (! in_array($file['name'], array('class.nusoap_base.php'))) {
-					$ok=true;
-					$matches=array();
+				if (!in_array($file['name'], array('class.nusoap_base.php'))) {
+					$ok = true;
+					$matches = array();
 					preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
 					//var_dump($matches);
 					foreach ($matches as $key => $val) {
 						if ($val[1] != '/' && $val[1] != '*') {
-							$ok=false;
+							$ok = false;
 							break;
 						}
 						break;
@@ -249,11 +249,11 @@ 
 			}
 
 			// Check get_class followed by __METHOD__
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -261,12 +261,12 @@ 
 			//exit;
 
 			// Check string $this->db->idate without quotes
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != '\'"' && $val[1] != '\'\'') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -278,8 +278,8 @@ 
 
 			// Check sql string DELETE|OR|AND|WHERE|INSERT ... yyy = ".$xxx
 			//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string, or an (int) if int, when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(DELETE|OR|AND|WHERE|INSERT)\s.*([^\s][^\s][^\s])\s*=\s*(\'|")\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[2] == 'ity' && $val[4] == 'con') {		// exclude entity = ".$conf->entity
@@ -292,7 +292,7 @@ 
 					continue;
 				}
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -300,13 +300,13 @@ 
 			//exit;
 
 			// Check that forged sql string is using ' instead of " as string PHP quotes
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\$sql \.= \'\s*VALUES.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//if ($val[1] != '\'"' && $val[1] != '\'\'') {
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 				//}
 				//if ($reg[0] != 'db') $ok=false;
@@ -316,20 +316,20 @@ 
 			//exit;
 
 			// Check that forged sql string is using ' instead of " as string PHP quotes
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\$sql \.?= \'SELECT.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
 
 			// Check sql string VALUES ... , ".$xxx
 			//  with xxx that is not 'db-' (for $db->escape). It means we forget a ' if string, or an (int) if int, when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(VALUES).*,\s*"\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] == 'VALUES' && $val[2] == 'db-') {		// exclude $db->escape(
@@ -339,7 +339,7 @@ 
 					continue;
 				}
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -349,12 +349,12 @@ 
 			// Check '".$xxx non escaped
 
 			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != 'db->' && $val[1] != 'esca') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -362,12 +362,12 @@ 
 			$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 1) in '.$file['relativename'].' - Bad.');
 
 			// Check string sql|set|WHERE|...'".$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
-					$ok=false;	// This will generate error
+				if (!in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
+					$ok = false; // This will generate error
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -377,12 +377,12 @@ 
 			//exit;
 
 			// Check string sql|set...'.$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(\$sql|SET\s|WHERE\s|INSERT\s|VALUES\s|VALUES\().+\s*\'\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
-					$ok=false;
+				if (!in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
+					$ok = false;
 					var_dump($matches);
 					break;
 				}
@@ -395,13 +395,13 @@ 
 			// Checks with IN
 
 			// Check string ' IN (".xxx' or ' IN (\'.xxx'  with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\s+IN\s*\([\'"]\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -411,13 +411,13 @@ 
 			//exit;
 
 			// Check string ' IN (\'".xxx'   with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\s+IN\s*\(\'"\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -427,12 +427,12 @@ 
 			//exit;
 
 			// Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -440,8 +440,8 @@ 
 
 
 			// Check GETPOST(... 'none');
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/GETPOST\s*\(([^\)]+),\s*["\']none["\']/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//var_dump($val);
@@ -450,7 +450,7 @@ 
 						'"mysqldump"', '"postgresqldump"',
 						"'db_pass_root'", "'db_pass'", '"pass"', '"pass1"', '"pass2"', '"password"', "'password'",
 						'"MAIN_MAIL_SMTPS_PW"', '"MAIN_MAIL_SMTPS_PW_EMAILING"', '"MAIN_MAIL_SMTPS_PW_TICKET"'))) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -461,24 +461,24 @@ 
 
 
 			// Test that first param of print_liste_field_titre is a translation key and not the translated value
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			// Check string ='print_liste_field_titre\(\$langs'.
 			preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
 
 
 			// Test we don't have <br />
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/<br\s+\/>/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($file['name'] != 'functions.lib.php') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -486,12 +486,12 @@ 
 
 
 			// Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($file['name'] != 'excludefile.php') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -499,12 +499,12 @@ 
 
 
 			// Test we don't have preg_grep with a param without preg_quote
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/preg_grep\(.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if (strpos($val[0], 'preg_quote') === false) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -512,62 +512,62 @@ 
 
 
 			// Test we don't have "if ($resql >"
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/if \(\$resql >/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a if $resql with a > operator (when $resql is a boolean or resource) in file '.$file['relativename'].'. Please remove the > ... part.');
 
 			// Test we don't have empty($user->hasRight
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/empty\(\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found code empty($user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
 
 			// Test we don't have empty(DolibarrApiAccess::$user->hasRight
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/empty\(DolibarrApiAccess::\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found code empty(DolibarrApiAccess::$user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
 
 			// Test we don't have empty($user->hasRight
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/empty\(getDolGlobal/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found code empty(getDolGlobal... in file '.$file['relativename'].'. empty() must be used on a var not on a function.');
 
 			// Test we don't have @var array(
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
 
 
 			// Test we don't have CURDATE()
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/CURDATE\(\)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');