Dolibarr / dolibarr

test/phpunit/EmailCollectorTest.php

Spacing +32 added lines, -32 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;
 
 
 
@@ -57,23 +57,23 @@ 
 	 */
 	public function testEmailCollectorCreate()
 	{
-		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;
 
 		$langs->load("main");
 
 		// Create supplier order with a too low quantity
-		$localobject=new EmailCollector($db);
-		$localobject->initAsSpecimen();         // Init a specimen with lines
+		$localobject = new EmailCollector($db);
+		$localobject->initAsSpecimen(); // Init a specimen with lines
 
 		$this->filters = array();
 
 		$this->actions = array();
 
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, "Error on test EmailCollector create: ".$localobject->error.' '.join(',', $localobject->errors));
 
@@ -92,14 +92,14 @@ 
 	 */
 	public function testEmailCollectorFetch($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 EmailCollector($db);
-		$result=$localobject->fetch($id);
+		$localobject = new EmailCollector($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -117,13 +117,13 @@ 
 	 */
 	public function testEmailCollectorCollect($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->getConnectStringIMAP();
+		$result = $localobject->getConnectStringIMAP();
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertEquals('{localhost:993/service=imap/ssl/novalidate-cert}', $result, 'Error in getConnectStringIMAP '.$localobject->error);
 
@@ -141,15 +141,15 @@ 
 	 */
 	public function testEmailCollectorDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new EmailCollector($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 EmailCollector($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);

test/phpunit/TicketTest.php

Spacing +69 added lines, -69 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,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,25 +56,25 @@ 
 	 */
 	public function testTicketCreate()
 	{
-		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;
 
 		// Try to create one with bad values
-		$localobject=new Ticket($db);
+		$localobject = new Ticket($db);
 		$localobject->initAsSpecimen();
 		$localobject->ref = '';
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-3, $result, $localobject->error.join(',', $localobject->errors));
 
 		// Try to create one with correct values
-		$localobject=new Ticket($db);
+		$localobject = new Ticket($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, $localobject->error.join(',', $localobject->errors));
@@ -93,14 +93,14 @@ 
 	 */
 	public function testTicketFetch($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 Ticket($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Ticket($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
@@ -119,13 +119,13 @@ 
 	 */
 	public function testTicketmarkAsRead($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->markAsRead($user);
+		$result = $localobject->markAsRead($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -143,15 +143,15 @@ 
 	 */
 	public function testTicketsetProject($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;
 
 		$project_id = 1;
 
-		$result=$localobject->setProject($project_id);
+		$result = $localobject->setProject($project_id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -169,15 +169,15 @@ 
 	 */
 	public function testTicketsetContract($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;
 
 		$contract_id = 1;
 
-		$result=$localobject->setContract($contract_id);
+		$result = $localobject->setContract($contract_id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -195,15 +195,15 @@ 
 	 */
 	public function testTicketsetProgression($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;
 
 		$percent = 80;
 
-		$result=$localobject->setProgression($percent);
+		$result = $localobject->setProgression($percent);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -221,15 +221,15 @@ 
 	 */
 	public function testTicketassignUser($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;
 
 		$user_id_to_assign = 1;
 
-		$result=$localobject->assignUser($user, $user_id_to_assign);
+		$result = $localobject->assignUser($user, $user_id_to_assign);
 		;
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
@@ -248,15 +248,15 @@ 
 	 */
 	public function testTicketassignUserOther($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;
 
 		$user_id_to_assign = 2;
 
-		$result=$localobject->assignUser($user, $user_id_to_assign);
+		$result = $localobject->assignUser($user, $user_id_to_assign);
 		;
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
@@ -275,13 +275,13 @@ 
 	 */
 	public function testTicketclose($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->close($user);
+		$result = $localobject->close($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -300,15 +300,15 @@ 
 	 */
 	public function testTicketDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Ticket($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 Ticket($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);

test/phpunit/CompanyLibTest.php

Spacing +10 added lines, -10 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,20 +55,20 @@ 
 	 */
 	public function testNameCurrency()
 	{
-		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=currency_name('USD');
+		$result = currency_name('USD');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('US Dollars', $result, 'Test to get currency name USD in default language '.$langs->defaultlang);
 
-		$outputlangs=new Translate('', $conf);
+		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang('fr_FR');
 
-		$result=currency_name('USD', 1, $outputlangs);
+		$result = currency_name('USD', 1, $outputlangs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('USD - Dollars US', $result, 'Test to get currency name USD in default language '.$outputlangs->getDefaultLang());
 

test/phpunit/XCalLibTest.php

Spacing +10 added lines, -10 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,18 +55,18 @@ 
 	 */
 	public function testQuotedPrintEncodeDecode()
 	{
-		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;
 
-		$stringtoencode='ABCD=1234;';
-		$result=quotedPrintEncode($stringtoencode);
+		$stringtoencode = 'ABCD=1234;';
+		$result = quotedPrintEncode($stringtoencode);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('ABCD=3D1234;', $result);
 
-		$resultback=quotedPrintDecode($result);
+		$resultback = quotedPrintDecode($result);
 		print __METHOD__." result=".$resultback."\n";
 		$this->assertEquals($stringtoencode, $resultback);
 	}

test/phpunit/ProjectTest.php

Spacing +37 added lines, -37 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,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 testProjectCreate()
 	{
-		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 Project($db);
+		$localobject = new Project($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -82,14 +82,14 @@ 
 	 */
 	public function testProjectFetch($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 Project($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Project($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -107,13 +107,13 @@ 
 	 */
 	public function testProjectValid($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->setValid($user);
+		$result = $localobject->setValid($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -131,13 +131,13 @@ 
 	 */
 	public function testProjectOther($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->setClose($user);
+		$result = $localobject->setClose($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -155,15 +155,15 @@ 
 	 */
 	public function testProjectDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Project($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 Project($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/CodingSqlTest.php

Spacing +66 added lines, -66 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,22 +87,22 @@ 
 	 */
 	public function testEscape()
 	{
-		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;
 
 		if ($db->type == 'mysqli') {
-			$a = 'abc"\'def';	// string is abc"'def
+			$a = 'abc"\'def'; // string is abc"'def
 			print $a;
-			$result = $db->escape($a);	// $result must be abc\"\'def
+			$result = $db->escape($a); // $result must be abc\"\'def
 			$this->assertEquals('abc\"\\\'def', $result);
 		}
 		if ($db->type == 'pgsql') {
-			$a = 'abc"\'def';	// string is abc"'def
+			$a = 'abc"\'def'; // string is abc"'def
 			print $a;
-			$result = $db->escape($a);	// $result must be abc"''def
+			$result = $db->escape($a); // $result must be abc"''def
 			$this->assertEquals('abc"\'\'def', $result);
 		}
 	}
@@ -114,15 +114,15 @@ 
 	 */
 	public function testEscapeForLike()
 	{
-		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;
 
 		$a = 'abc"\'def_ghi%klm\\nop';
 		//print $a;
-		$result = $db->escapeforlike($a);	// $result must be abc"'def\_ghi\%klm\\nop with mysql
+		$result = $db->escapeforlike($a); // $result must be abc"'def\_ghi\%klm\\nop with mysql
 		$this->assertEquals('abc"\'def\_ghi\%klm\\\\nop', $result);
 	}
 
@@ -133,11 +133,11 @@ 
 	 */
 	public function testSql()
 	{
-		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;
 
 		$listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/data', DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
@@ -146,7 +146,7 @@ 
 			$filesarray = scandir($dir);
 
 			foreach ($filesarray as $key => $file) {
-				if (! preg_match('/\.sql$/', $file)) {
+				if (!preg_match('/\.sql$/', $file)) {
 					continue;
 				}
 
@@ -161,37 +161,37 @@ 
 				//$filecontent = preg_replace('/^--.*$/', '', $filecontent);
 				$filecontent = preg_replace('/--.*?\n/', '', $filecontent);
 
-				$result=strpos($filecontent, '`');
+				$result = strpos($filecontent, '`');
 				//print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
-				$this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found back quote into '.$file.'. Bad.');
 
-				$result=strpos($filecontent, '"');
+				$result = strpos($filecontent, '"');
 				//print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
-				$this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) neither (" (used for content with string like isModEnabled("")) into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found double quote that is not [" neither {" (used for json content) neither (" (used for content with string like isModEnabled("")) into '.$file.'. Bad.');
 
-				$result=strpos($filecontent, 'int(');
+				$result = strpos($filecontent, 'int(');
 				//print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
 
-				$result=strpos($filecontent, 'ON DELETE CASCADE');
+				$result = strpos($filecontent, 'ON DELETE CASCADE');
 				//print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
 
-				$result=strpos($filecontent, 'NUMERIC(');
+				$result = strpos($filecontent, 'NUMERIC(');
 				//print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found NUMERIC( into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found NUMERIC( into '.$file.'. Bad.');
 
-				$result=strpos($filecontent, 'NUMERIC(');
+				$result = strpos($filecontent, 'NUMERIC(');
 				//print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found curdate( into '.$file.'. Bad. Current date must be generated with PHP.');
+				$this->assertTrue($result === false, 'Found curdate( into '.$file.'. Bad. Current date must be generated with PHP.');
 
-				$result=strpos($filecontent, 'integer(');
+				$result = strpos($filecontent, 'integer(');
 				//print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
 
-				$result=strpos($filecontent, 'timestamp,');
+				$result = strpos($filecontent, 'timestamp,');
 				//print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found type timestamp with option DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after into '.$file.'. Bad.');
+				$this->assertTrue($result === false, 'Found type timestamp with option DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after into '.$file.'. Bad.');
 
 				if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration') {
 					// Test for migration files only
@@ -202,11 +202,11 @@ 
 						// Test for key files only
 					} else {
 						// Test for non key files only
-						$result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
+						$result = (strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
 						//print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
-						$this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
+						$this->assertTrue($result === false, 'Found KEY into '.$file.'. Bad.');
 
-						$result=stripos($filecontent, 'ENGINE=innodb');
+						$result = stripos($filecontent, 'ENGINE=innodb');
 						//print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
 						$this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
 					}
@@ -224,32 +224,32 @@ 
 	 */
 	public function testInitData()
 	{
-		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;
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdemo');
 		foreach ($filesarray as $key => $file) {
-			if (! preg_match('/\.sql$/', $file)) {
+			if (!preg_match('/\.sql$/', $file)) {
 				continue;
 			}
 
 			print 'Check sql file '.$file."\n";
-			$filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdemo/'.$file);
+			$filecontent = file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdemo/'.$file);
 
-			$result=strpos($filecontent, '@gmail.com');
+			$result = strpos($filecontent, '@gmail.com');
 			print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-			$this->assertTrue($result===false, 'Found a bad key @gmail into file '.$file);
+			$this->assertTrue($result === false, 'Found a bad key @gmail into file '.$file);
 
-			$result=strpos($filecontent, 'eldy@');
+			$result = strpos($filecontent, 'eldy@');
 			print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-			$this->assertTrue($result===false, 'Found a bad key eldy@ into file '.$file);
+			$this->assertTrue($result === false, 'Found a bad key eldy@ into file '.$file);
 
-			$result=strpos($filecontent, 'INSERT INTO `llx_oauth_token`');
+			$result = strpos($filecontent, 'INSERT INTO `llx_oauth_token`');
 			print __METHOD__." Result for checking we don't have data into llx_oauth_token = ".$result."\n";
-			$this->assertTrue($result===false, 'Found a non expected insert into file '.$file);
+			$this->assertTrue($result === false, 'Found a non expected insert into file '.$file);
 		}
 
 		return;

test/phpunit/ContactTest.php

Spacing +87 added lines, -87 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';
@@ -44,7 +44,7 @@ 
 	$user->getrights();
 }
 
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,15 +63,15 @@ 
 	 */
 	public function testContactCreate()
 	{
-		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 Contact($db);
+		$localobject = new Contact($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -89,14 +89,14 @@ 
 	 */
 	public function testContactFetch($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 Contact($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Contact($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -115,45 +115,45 @@ 
 	 */
 	public function testContactUpdate($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->oldcopy = clone $localobject;
 
-		$localobject->note_private='New private note after update';
-		$localobject->note_public='New public note after update';
-		$localobject->lastname='New name';
-		$localobject->firstname='New firstname';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-		$localobject->country_id=2;
+		$localobject->note_private = 'New private note after update';
+		$localobject->note_public = 'New public note after update';
+		$localobject->lastname = 'New name';
+		$localobject->firstname = 'New firstname';
+		$localobject->address = 'New address';
+		$localobject->zip = 'New zip';
+		$localobject->town = 'New town';
+		$localobject->country_id = 2;
 		//$localobject->status=0;
-		$localobject->phone_pro='New tel pro';
-		$localobject->phone_perso='New tel perso';
-		$localobject->phone_mobile='New tel mobile';
-		$localobject->fax='New fax';
-		$localobject->email='newemail@newemail.com';
-		$localobject->socialnetworks['jabber']='New im id';
-		$localobject->default_lang='es_ES';
-
-		$result=$localobject->update($localobject->id, $user);
+		$localobject->phone_pro = 'New tel pro';
+		$localobject->phone_perso = 'New tel perso';
+		$localobject->phone_mobile = 'New tel mobile';
+		$localobject->fax = 'New fax';
+		$localobject->email = 'newemail@newemail.com';
+		$localobject->socialnetworks['jabber'] = 'New im id';
+		$localobject->default_lang = 'es_ES';
+
+		$result = $localobject->update($localobject->id, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Contact::update error');
 
-		$result=$localobject->update_note($localobject->note_private, '_private');
+		$result = $localobject->update_note($localobject->note_private, '_private');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Contact::update_note (private) error');
 
-		$result=$localobject->update_note($localobject->note_public, '_public');
+		$result = $localobject->update_note($localobject->note_public, '_public');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Contact::update_note (public) error');
 
-		$newobject=new Contact($db);
-		$result=$newobject->fetch($localobject->id);
+		$newobject = new Contact($db);
+		$result = $newobject->fetch($localobject->id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Contact::fetch error');
 
@@ -206,19 +206,19 @@ 
 	 */
 	public function testContactOther($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($localobject->id);
 
-		$result=$localobject->getNomUrl(1);
+		$result = $localobject->getNomUrl(1);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertNotEquals($result, '');
 
-		$result=$localobject->getFullAddress(1);
+		$result = $localobject->getFullAddress(1);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nBelgium", $result);
 
@@ -240,16 +240,16 @@ 
 	 */
 	public function testContactDelete($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 Contact($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Contact($db);
+		$result = $localobject->fetch($id);
 
-		$result=$localobject->delete($user);
+		$result = $localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -263,56 +263,56 @@ 
 	 */
 	public function testContactGetFullAddress()
 	{
-		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;
 
-		$localobjectadd=new Contact($db);
+		$localobjectadd = new Contact($db);
 		$localobjectadd->initAsSpecimen();
 
 		// France
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=1;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 1;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nFrance", $result);
 
 		// Belgium
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=2;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 2;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nBelgium", $result);
 
 		// Switzerland
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=6;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 6;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nSwitzerland", $result);
 
 		// USA
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=11;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 11;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew town, New zip\nUnited States", $result);
 

test/phpunit/CompanyBankAccountTest.php

Spacing +38 added lines, -38 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,21 +55,21 @@ 
 	 */
 	public function testCompanyBankAccountCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$soc = new Societe($db);
 		$soc->name = "CompanyBankAccountTest Unittest";
 		$socid = $soc->create($user);
 		$this->assertLessThan($socid, 0, $soc->errorsToString());
 
-		$localobject=new CompanyBankAccount($db);
+		$localobject = new CompanyBankAccount($db);
 		$localobject->initAsSpecimen();
 		$localobject->socid = $socid;
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result." id=".$localobject->id."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -87,14 +87,14 @@ 
 	 */
 	public function testCompanyBankAccountFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new CompanyBankAccount($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new CompanyBankAccount($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 		return $localobject;
@@ -110,13 +110,13 @@ 
 	 */
 	public function testCompanyBankAccountSetAsDefault($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->setAsDefault($localobject->id);
+		$result = $localobject->setAsDefault($localobject->id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 		return $localobject;
@@ -133,14 +133,14 @@ 
 	 */
 	public function testCompanyBankAccountUpdate($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->owner='New owner';
-		$result=$localobject->update($user);
+		$localobject->owner = 'New owner';
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -158,14 +158,14 @@ 
 	 */
 	public function testCompanyBankAccountOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->owner='New owner';
-		$result=$localobject->update($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject->owner = 'New owner';
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/CoreTest.php

Spacing +43 added lines, -43 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__).'/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)
 }
 
 
@@ -92,7 +92,7 @@ 
 		global $dolibarr_main_db_type;
 		global $dolibarr_main_db_prefix;
 
-		$testtodo=0;
+		$testtodo = 0;
 
 		// Case 1:
 		// Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www
@@ -101,12 +101,12 @@ 
 		// - Create link from htdocs to /var/www/dolibarrnew
 		// - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew';
 		if ($testtodo == 1) {
-			$_SERVER["HTTPS"]='';
-			$_SERVER["SERVER_NAME"]='localhost';
-			$_SERVER["SERVER_PORT"]='80';
-			$_SERVER["DOCUMENT_ROOT"]='/var/www';
-			$_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
-			$expectedresult='/dolibarrnew';
+			$_SERVER["HTTPS"] = '';
+			$_SERVER["SERVER_NAME"] = 'localhost';
+			$_SERVER["SERVER_PORT"] = '80';
+			$_SERVER["DOCUMENT_ROOT"] = '/var/www';
+			$_SERVER["SCRIPT_NAME"] = '/dolibarrnew/admin/system/phpinfo.php';
+			$expectedresult = '/dolibarrnew';
 		}
 
 		// Case 2:
@@ -116,12 +116,12 @@ 
 		// - Create link from dolibarr to /var/www/aaa
 		// - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs';
 		if ($testtodo == 2) {
-			$_SERVER["HTTPS"]='';
-			$_SERVER["SERVER_NAME"]='localhost';
-			$_SERVER["SERVER_PORT"]='80';
-			$_SERVER["DOCUMENT_ROOT"]='/var/www';
-			$_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
-			$expectedresult='/aaa/htdocs';
+			$_SERVER["HTTPS"] = '';
+			$_SERVER["SERVER_NAME"] = 'localhost';
+			$_SERVER["SERVER_PORT"] = '80';
+			$_SERVER["DOCUMENT_ROOT"] = '/var/www';
+			$_SERVER["SCRIPT_NAME"] = '/aaa/htdocs/admin/system/phpinfo.php';
+			$expectedresult = '/aaa/htdocs';
 		}
 
 		// Case 3:
@@ -132,12 +132,12 @@ 
 		// - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs
 		// - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs';
 		if ($testtodo == 3) {
-			$_SERVER["HTTPS"]='';
-			$_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-			$_SERVER["SERVER_PORT"]='80';
-			$_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs';
-			$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-			$expectedresult='';
+			$_SERVER["HTTPS"] = '';
+			$_SERVER["SERVER_NAME"] = 'localhostdolibarrnew';
+			$_SERVER["SERVER_PORT"] = '80';
+			$_SERVER["DOCUMENT_ROOT"] = '/home/ldestailleur/git/dolibarr/htdocs';
+			$_SERVER["SCRIPT_NAME"] = '/admin/system/phpinfo.php';
+			$expectedresult = '';
 		}
 
 		// Case 4:
@@ -145,12 +145,12 @@ 
 		// a symbolic link
 		// URL: http://localhostdolibarrnew/admin/system/phpinfo.php
 		if ($testtodo == 4) {
-			$_SERVER["HTTPS"]='';
-			$_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-			$_SERVER["SERVER_PORT"]='80';
-			$_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr';	// This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
-			$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-			$expectedresult='';
+			$_SERVER["HTTPS"] = '';
+			$_SERVER["SERVER_NAME"] = 'localhostdolibarrnew';
+			$_SERVER["SERVER_PORT"] = '80';
+			$_SERVER["DOCUMENT_ROOT"] = '/var/www/dolibarr'; // This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
+			$_SERVER["SCRIPT_NAME"] = '/admin/system/phpinfo.php';
+			$expectedresult = '';
 		}
 
 		// Case 5:
@@ -161,12 +161,12 @@ 
 		// - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
 		// - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias';  (because autodetect will fails in this case)
 		if ($testtodo == 5) {
-			$_SERVER["HTTPS"]='';
-			$_SERVER["SERVER_NAME"]='localhost';
-			$_SERVER["SERVER_PORT"]='80';
-			$_SERVER["DOCUMENT_ROOT"]='/var/www';
-			$_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php';
-			$expectedresult='/dolibarralias';
+			$_SERVER["HTTPS"] = '';
+			$_SERVER["SERVER_NAME"] = 'localhost';
+			$_SERVER["SERVER_PORT"] = '80';
+			$_SERVER["DOCUMENT_ROOT"] = '/var/www';
+			$_SERVER["SCRIPT_NAME"] = '/dolibarralias/admin/system/phpinfo.php';
+			$expectedresult = '/dolibarralias';
 		}
 
 		// Force to rerun filefunc.inc.php