Dolibarr / dolibarr

test/phpunit/AdherentTest.php

Spacing +124 added lines, -124 removed lines

@@ -25,7 +25,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -66,11 +66,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -84,7 +84,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 (getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {
@@ -108,7 +108,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -121,11 +121,11 @@ 
 	 */
 	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;
 
 		print __METHOD__."\n";
 	}
@@ -146,20 +146,20 @@ 
 	 */
 	public function testAdherentTypeCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new AdherentType($db);
-		$localobject->statut=1;
-		$localobject->label='Adherent type test';
-		$localobject->subscription=1;
-		$localobject->amount=0;
-		$localobject->vote=1;
-		$localobject->company='Old company label';
-		$result=$localobject->create($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new AdherentType($db);
+		$localobject->statut = 1;
+		$localobject->label = 'Adherent type test';
+		$localobject->subscription = 1;
+		$localobject->amount = 0;
+		$localobject->vote = 1;
+		$localobject->company = 'Old company label';
+		$result = $localobject->create($user);
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -177,16 +177,16 @@ 
 	 */
 	public function testAdherentCreate($fk_adherent_type)
 	{
-		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 Adherent($db);
+		$localobject = new Adherent($db);
 		$localobject->initAsSpecimen();
-		$localobject->typeid=$fk_adherent_type;
-		$result=$localobject->create($user);
+		$localobject->typeid = $fk_adherent_type;
+		$result = $localobject->create($user);
 		print __METHOD__." result=".$result."\n";
 		if ($result < 0) {
 			print $localobject->error;
@@ -207,14 +207,14 @@ 
 	 */
 	public function testAdherentFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Adherent($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Adherent($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 		return $localobject;
@@ -231,11 +231,11 @@ 
 	 */
 	public function testAdherentFetchLogin(Adherent $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;
 
 		$newobject = new Adherent($db);
 		$result = $newobject->fetch_login($localobject->login);
@@ -256,45 +256,45 @@ 
 	 */
 	public function testAdherentUpdate(Adherent $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;
 
 		$timestamp = dol_now();
 
 		$localobject->civility_id = 0;
-		$localobject->login='newlogin';
-		$localobject->company='New company label';
-		$localobject->note_public='New note public after update';
-		$localobject->note_private='New note private after update';
-		$localobject->lastname='New name';
-		$localobject->firstname='New firstname';
-		$localobject->gender='man';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-		$localobject->country_id=2;
-		$localobject->statut=0;
-		$localobject->morphy=0;
-		$localobject->phone='New tel pro';
-		$localobject->phone_perso='New tel perso';
-		$localobject->phone_mobile='New tel mobile';
-		$localobject->email='newemail@newemail.com';
-		$localobject->birth=$timestamp;
-		$result=$localobject->update($user);
+		$localobject->login = 'newlogin';
+		$localobject->company = 'New company label';
+		$localobject->note_public = 'New note public after update';
+		$localobject->note_private = 'New note private after update';
+		$localobject->lastname = 'New name';
+		$localobject->firstname = 'New firstname';
+		$localobject->gender = 'man';
+		$localobject->address = 'New address';
+		$localobject->zip = 'New zip';
+		$localobject->town = 'New town';
+		$localobject->country_id = 2;
+		$localobject->statut = 0;
+		$localobject->morphy = 0;
+		$localobject->phone = 'New tel pro';
+		$localobject->phone_perso = 'New tel perso';
+		$localobject->phone_mobile = 'New tel mobile';
+		$localobject->email = 'newemail@newemail.com';
+		$localobject->birth = $timestamp;
+		$result = $localobject->update($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
-		$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);
-		$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);
 
-		$newobject=new Adherent($db);
-		$result=$newobject->fetch($localobject->id);
+		$newobject = new Adherent($db);
+		$result = $newobject->fetch($localobject->id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -335,13 +335,13 @@ 
 	 */
 	public function testAdherentMakeSubstitution(Adherent $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;
 
-		$conf->global->MAIN_FIRSTNAME_NAME_POSITION = 0;	// Force setup for firstname+lastname
+		$conf->global->MAIN_FIRSTNAME_NAME_POSITION = 0; // Force setup for firstname+lastname
 
 		$template = '__CIVILITY__,__FIRSTNAME__,__LASTNAME__,__FULLNAME__,__COMPANY__,';
 		$template .= '__ADDRESS__,__ZIP__,__TOWN__,__COUNTRY__,__EMAIL__,__BIRTH__,__PHOTO__,__LOGIN__';
@@ -369,11 +369,11 @@ 
 	 */
 	public function testAdherentSetUserId(Adherent $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;
 
 		//We associate member with user
 		$result = $localobject->setUserId($user->id);
@@ -411,11 +411,11 @@ 
 	 */
 	public function testAdherentSetThirdPartyId(Adherent $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;
 
 		//Create a Third Party
 		$thirdparty = new Societe($db);
@@ -460,13 +460,13 @@ 
 	 */
 	public function testAdherentValidate(Adherent $localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->validate($user);
+		$result = $localobject->validate($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -484,11 +484,11 @@ 
 	 */
 	public function testAdherentOther(Adherent $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";
@@ -513,11 +513,11 @@ 
 	 */
 	public function testAdherentResiliate(Adherent $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;
 
 		//Let's resilie un adherent
 		$result = $localobject->resiliate($user);
@@ -550,13 +550,13 @@ 
 	 */
 	public function testAdherentDelete($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->delete($localobject->id, $user);
+		$result = $localobject->delete($localobject->id, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -575,15 +575,15 @@ 
 	 */
 	public function testAdherentTypeDelete($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobjectat=new AdherentType($db);
-		$result=$localobjectat->fetch($localobject->typeid);
-		$result=$localobjectat->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobjectat = new AdherentType($db);
+		$result = $localobjectat->fetch($localobject->typeid);
+		$result = $localobjectat->delete($user);
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 

test/phpunit/ContactTest.php

Spacing +100 added lines, -100 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';
@@ -42,7 +42,7 @@ 
 	$user->getrights();
 }
 
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -71,11 +71,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -89,9 +89,9 @@ 
 	 */
 	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.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -116,11 +116,11 @@ 
 	 */
 	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;
 
 		print __METHOD__."\n";
 	}
@@ -141,15 +141,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);
@@ -167,14 +167,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);
@@ -193,45 +193,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');
 
@@ -284,19 +284,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);
 
@@ -318,16 +318,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);
 
@@ -341,56 +341,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/ChargeSocialesTest.php

Spacing +51 added lines, -51 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;
 
 
 /**
@@ -64,11 +64,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -82,8 +82,8 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -95,7 +95,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -108,11 +108,11 @@ 
 	 */
 	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;
 
 		print __METHOD__."\n";
 	}
@@ -133,15 +133,15 @@ 
 	 */
 	public function testChargeSocialesCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new ChargeSociales($db);
+		$localobject = new ChargeSociales($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user, $langs, $conf);
+		$result = $localobject->create($user, $langs, $conf);
 		print __METHOD__." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -159,14 +159,14 @@ 
 	 */
 	public function testChargeSocialesFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new ChargeSociales($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -184,13 +184,13 @@ 
 	 */
 	public function testChargeSocialesValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->setPaid($user);
+		$result = $localobject->setPaid($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -208,17 +208,17 @@ 
 	 */
 	public function testChargeSocialesOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->getNomUrl(1);
+		$result = $localobject->getNomUrl(1);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertNotEquals($result, '');
 
-		$result=$localobject->getSommePaiement();
+		$result = $localobject->getSommePaiement();
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);
 
@@ -236,16 +236,16 @@ 
 	 */
 	public function testChargeSocialesDelete($id)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new ChargeSociales($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		$localobject = new ChargeSociales($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/HolidayTest.php

Spacing +88 added lines, -88 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';
@@ -66,11 +66,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -84,9 +84,9 @@ 
 	 */
 	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.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -98,7 +98,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -111,11 +111,11 @@ 
 	 */
 	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;
 
 		print __METHOD__."\n";
 	}
@@ -136,15 +136,15 @@ 
 	 */
 	public function testHolidayCreate()
 	{
-		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 Holiday($db);
+		$localobject = new Holiday($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -162,14 +162,14 @@ 
 	 */
 	public function testHolidayFetch($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 Holiday($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Holiday($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -188,46 +188,46 @@ 
 	 */
 	public function testHolidayUpdate($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->jabberid='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->jabberid = '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, 'Holiday::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, 'Holiday::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, 'Holiday::update_note (public) error');
 
 
-		$newobject=new Holiday($db);
-		$result=$newobject->fetch($localobject->id);
+		$newobject = new Holiday($db);
+		$result = $newobject->fetch($localobject->id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::fetch error');
 
@@ -250,11 +250,11 @@ 
 	 */
 	public function testHolidayOther($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->fetchUsers(true, true, '');
 		$this->assertNotEquals($result, -1);
@@ -282,16 +282,16 @@ 
 	 */
 	public function testHolidayDelete($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 Holiday($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Holiday($db);
+		$result = $localobject->fetch($id);
 
-		$result=$localobject->delete($user);
+		$result = $localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -305,55 +305,55 @@ 
 	 */
 	public function testVerifDateHolidayCP()
 	{
-		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;
 
 		// Create a leave request the 1st morning only
-		$localobjecta=new Holiday($db);
+		$localobjecta = new Holiday($db);
 		$localobjecta->initAsSpecimen();
 		$localobjecta->date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
 		$localobjecta->date_fin = dol_mktime(0, 0, 0, 1, 1, 2020);
 		$localobjecta->halfday = 1;
-		$result=$localobjecta->create($user);
+		$result = $localobjecta->create($user);
 
 		// Create a leave request the 2 afternoon only
-		$localobjectb=new Holiday($db);
+		$localobjectb = new Holiday($db);
 		$localobjectb->initAsSpecimen();
 		$localobjectb->date_debut = dol_mktime(0, 0, 0, 1, 2, 2020);
 		$localobjectb->date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
 		$localobjectb->halfday = -1;
-		$result=$localobjectb->create($user);
+		$result = $localobjectb->create($user);
 
 		$date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
 		$date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
 
-		$localobjectc=new Holiday($db);
+		$localobjectc = new Holiday($db);
 
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
 		$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
 		$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
 		$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
 
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
 		$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
 		$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
 		$this->assertTrue($result, 'result should be true, there is no overlapping');
 
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
 		$this->assertTrue($result, 'result should be true, there is no overlapping');
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
 		$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
 		$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
 
-		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
+		$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2); // start afternoon and end morning
 		$this->assertTrue($result, 'result should be true, there is no overlapping');
 	}
 
@@ -366,7 +366,7 @@ 
 	{
 		global $db;
 
-		$localobjecta=new Holiday($db);
+		$localobjecta = new Holiday($db);
 
 		$localobjecta->updateConfCP('lastUpdate', '20100101120000');
 		$result = $localobjecta->updateBalance();