Dolibarr / dolibarr

test/phpunit/PdfDocTest.php

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
  *      			See also BuildDocTest to PDF generation
  */
 
-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';
@@ -40,7 +40,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -59,13 +59,13 @@ 
 	 */
 	public function testPdfDocGetLineDesc()
 	{
-		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;
 
-		$localproduct=new Product($db);
+		$localproduct = new Product($db);
 		$result = $localproduct->fetch(0, 'PINKDRESS');
 		if ($result < 0) {
 			print "\n".__METHOD__." Failed to make the fetch of product PINKDRESS. ".$localproduct->error;
@@ -77,19 +77,19 @@ 
 			die(1);
 		}
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
-		$localobject->lines=array();
-		$localobject->lines[0]=new FactureLigne($db);
-		$localobject->lines[0]->fk_product=$product_id;
-		$localobject->lines[0]->label='Label 1';
-		$localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)";
+		$localobject->lines = array();
+		$localobject->lines[0] = new FactureLigne($db);
+		$localobject->lines[0]->fk_product = $product_id;
+		$localobject->lines[0]->label = 'Label 1';
+		$localobject->lines[0]->desc = "This is a description with a é accent\n(Country of origin: France)";
 
-		$result=pdf_getlinedesc($localobject, 0, $langs);
+		$result = pdf_getlinedesc($localobject, 0, $langs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("PINKDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)", $result);
 
-		$result=doc_getlinedesc($localobject->lines[0], $langs);
+		$result = doc_getlinedesc($localobject->lines[0], $langs);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("PINKDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)", $result);
 	}
@@ -101,12 +101,12 @@ 
 	*/
 	public function testPdfGetHeightForLogo()
 	{
-		$file=dirname(__FILE__).'/img250x50.jpg';
-		$result=pdf_getHeightForLogo($file);
+		$file = dirname(__FILE__).'/img250x50.jpg';
+		$result = pdf_getHeightForLogo($file);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 20);
-		$file=dirname(__FILE__).'/img250x20.png';
-		$result=pdf_getHeightForLogo($file);
+		$file = dirname(__FILE__).'/img250x20.png';
+		$result = pdf_getHeightForLogo($file);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 10.4);
 	}

test/phpunit/BarcodeTest.php

Spacing +12 added lines, -12 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;
 
 $langs->load("main");
 
@@ -57,11 +57,11 @@ 
 	 */
 	public function testBarcodeZATCAEncode()
 	{
-		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;
 
 		$company = new Societe($db);
 		$company->name = 'Specimen company';
@@ -91,11 +91,11 @@ 
 	 */
 	public function testBarcodeZATCADecode()
 	{
-		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;
 
 		//$string_zatca_base64 = "AQZSYWZlZXECDTEyMzQ1Njc4OVQxMjUDFDIwMjEtMDctMTJUMTQ6MjU6MDlaBAM3ODYFAjI1";
 		$string_zatca_base64 = "ARBTcGVjaW1lbiBjb21wYW55AgkxMjM0NTY3ODkDFDIwMjAtMDEtMDFUMDk6MzQ6NTZaBAMxMjAFAjIw";

test/phpunit/EvalMathTest.php

Spacing +2 added lines, -2 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;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/evalmath.class.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
@@ -35,7 +35,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**

test/phpunit/BankAccountTest.php

Spacing +30 added lines, -30 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;
 
 $langs->load("main");
 
@@ -58,16 +58,16 @@ 
 	 */
 	public function testBankAccountCreate()
 	{
-		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 Account($db);
 		$localobject->initAsSpecimen();
 		$localobject->date_solde = dol_now();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -86,14 +86,14 @@ 
 	 */
 	public function testBankAccountFetch($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 Account($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Account($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -112,11 +112,11 @@ 
 	 */
 	public function testBankAccountOther($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";
@@ -135,7 +135,7 @@ 
 		$this->assertTrue($result);
 
 		// Test checkIbanForAccount for CI account
-		$localobject2=new Account($db);
+		$localobject2 = new Account($db);
 		$localobject2->country = 'CI';
 		$localobject2->iban = 'CI77A12312341234123412341234';
 		$result = checkIbanForAccount($localobject2);
@@ -156,15 +156,15 @@ 
 	 */
 	public function testBankAccountDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Account($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 Account($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/AdherentTest.php

Spacing +113 added lines, -113 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';
@@ -38,7 +38,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -57,7 +57,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')) {
@@ -84,20 +84,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);
 
@@ -115,16 +115,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;
@@ -145,14 +145,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;
@@ -169,11 +169,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);
@@ -194,45 +194,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);
 
@@ -273,13 +273,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__';
@@ -307,11 +307,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);
@@ -349,11 +349,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);
@@ -398,13 +398,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);
 
@@ -422,11 +422,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";
@@ -451,11 +451,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);
@@ -488,13 +488,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);
 
@@ -513,15 +513,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/HolidayTest.php

Spacing +75 added lines, -75 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';
@@ -58,15 +58,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);
@@ -84,14 +84,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);
@@ -110,46 +110,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');
 
@@ -172,11 +172,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);
@@ -204,16 +204,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);
 
@@ -227,55 +227,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');
 	}
 
@@ -288,7 +288,7 @@ 
 	{
 		global $db;
 
-		$localobjecta=new Holiday($db);
+		$localobjecta = new Holiday($db);
 
 		$localobjecta->updateConfCP('lastUpdate', '20100101120000');
 		$result = $localobjecta->updateBalance();

test/phpunit/SupplierProposalTest.php

Spacing +49 added lines, -49 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';
@@ -39,7 +39,7 @@ 
 
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -58,8 +58,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.
 
 		if (!getDolGlobalString('MAIN_MODULE_SUPPLIERPROPOSAL')) {
 			print "\n".__METHOD__." module Supplier proposal must be enabled.\n";
@@ -76,11 +76,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";
 		//print $db->getVersion()."\n";
@@ -97,15 +97,15 @@ 
 	 */
 	public function testSupplierProposalCreate()
 	{
-		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 SupplierProposal($db);
+		$localobject = new SupplierProposal($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -123,14 +123,14 @@ 
 	 */
 	public function testSupplierProposalFetch($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 SupplierProposal($db);
-		$result=$localobject->fetch($id);
+		$localobject = new SupplierProposal($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -148,14 +148,14 @@ 
 	 */
 	public function testSupplierProposalAddLine($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";
@@ -173,11 +173,11 @@ 
 	 */
 	public function testSupplierProposalValid($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 = $user->addrights(0, 'supplier_proposal');
 		$this->assertLessThan($result, 0);
@@ -185,7 +185,7 @@ 
 		$result = $user->getrights('supplier_proposal', 1);
 		//$this->assertLessThan($result, 0);
 
-		$result=$localobject->valid($user);
+		$result = $localobject->valid($user);
 		$this->assertLessThan($result, 0);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -204,11 +204,11 @@ 
 	 */
 	public function testSupplierProposalOther($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";
@@ -233,15 +233,15 @@ 
 	 */
 	public function testSupplierProposalDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new SupplierProposal($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 SupplierProposal($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/FactureTestRounding.php

Spacing +59 added lines, -59 removed lines

@@ -23,7 +23,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;
 
 
 /**
@@ -55,28 +55,28 @@ 
 	 */
 	public function testFactureRoundingCreate1()
 	{
-		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_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
-		$localobject->lines=array();
+		$localobject->lines = array();
 		unset($localobject->total_ht);
 		unset($localobject->total_ttc);
 		unset($localobject->total_tva);
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		// Add two lines
-		for ($i=0; $i<2; $i++) {
+		for ($i = 0; $i < 2; $i++) {
 			$localobject->addline('Description '.$i, 1.24, 1, 10);
 		}
 
-		$newlocalobject=new Facture($db);
+		$newlocalobject = new Facture($db);
 		$newlocalobject->fetch($result);
 		//var_dump($newlocalobject);
 
@@ -97,28 +97,28 @@ 
 	 */
 	public function testFactureRoundingCreate2()
 	{
-		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_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
-		$localobject->lines=array();
+		$localobject->lines = array();
 		unset($localobject->total_ht);
 		unset($localobject->total_ttc);
 		unset($localobject->total_vat);
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		// Add two lines
-		for ($i=0; $i<2; $i++) {
+		for ($i = 0; $i < 2; $i++) {
 			$localobject->addline('Description '.$i, 1.24, 1, 10);
 		}
 
-		$newlocalobject=new Facture($db);
+		$newlocalobject = new Facture($db);
 		$newlocalobject->fetch($result);
 		//var_dump($newlocalobject);
 
@@ -136,31 +136,31 @@ 
 	 */
 	public function testFactureAddLine1()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-		$localobject1a=new Facture($db);
+		$localobject1a = new Facture($db);
 		$localobject1a->initAsSpecimen('nolines');
-		$facid=$localobject1a->create($user);
-		$localobject1a->addline('Line 1', 6.36, 15, 21);	// This include update_price
+		$facid = $localobject1a->create($user);
+		$localobject1a->addline('Line 1', 6.36, 15, 21); // This include update_price
 		print __METHOD__." id=".$facid." total_ttc=".$localobject1a->total_ttc."\n";
 		$this->assertEquals(95.40, $localobject1a->total_ht);
 		$this->assertEquals(20.03, $localobject1a->total_tva);
 		$this->assertEquals(115.43, $localobject1a->total_ttc);
 
 		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1;
 
-		$localobject1b=new Facture($db);
+		$localobject1b = new Facture($db);
 		$localobject1b->initAsSpecimen('nolines');
-		$facid=$localobject1b->create($user);
-		$localobject1b->addline('Line 1', 6.36, 15, 21);	// This include update_price
+		$facid = $localobject1b->create($user);
+		$localobject1b->addline('Line 1', 6.36, 15, 21); // This include update_price
 		print __METHOD__." id=".$facid." total_ttc=".$localobject1b->total_ttc."\n";
 		$this->assertEquals(95.40, $localobject1b->total_ht, 'testFactureAddLine1 total_ht');
 		$this->assertEquals(20.03, $localobject1b->total_tva, 'testFactureAddLine1 total_tva');
@@ -177,18 +177,18 @@ 
 	 */
 	public function testFactureAddLine2()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen('nolines');
-		$facid=$localobject2->create($user);
+		$facid = $localobject2->create($user);
 		$localobject2->addline('Line 1', 6.36, 5, 21);
 		$localobject2->addline('Line 2', 6.36, 5, 21);
 		$localobject2->addline('Line 3', 6.36, 5, 21);
@@ -198,11 +198,11 @@ 
 		$this->assertEquals(115.44, $localobject2->total_ttc);
 
 		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1;
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen('nolines');
-		$facid=$localobject2->create($user);
+		$facid = $localobject2->create($user);
 		$localobject2->addline('Line 1', 6.36, 5, 21);
 		$localobject2->addline('Line 2', 6.36, 5, 21);
 		$localobject2->addline('Line 3', 6.36, 5, 21);
@@ -222,18 +222,18 @@ 
 	 */
 	public function testFactureAddLine3()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-		$localobject3=new Facture($db);
+		$localobject3 = new Facture($db);
 		$localobject3->initAsSpecimen('nolines');
-		$facid=$localobject3->create($user);
+		$facid = $localobject3->create($user);
 		$localobject3->addline('Line 1', 6.36, 3, 21);
 		$localobject3->addline('Line 2', 6.36, 3, 21);
 		$localobject3->addline('Line 3', 6.36, 3, 21);
@@ -245,11 +245,11 @@ 
 		$this->assertEquals(115.45, $localobject3->total_ttc);
 
 		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1;
 
-		$localobject3=new Facture($db);
+		$localobject3 = new Facture($db);
 		$localobject3->initAsSpecimen('nolines');
-		$facid=$localobject3->create($user);
+		$facid = $localobject3->create($user);
 		$localobject3->addline('Line 1', 6.36, 3, 21);
 		$localobject3->addline('Line 2', 6.36, 3, 21);
 		$localobject3->addline('Line 3', 6.36, 3, 21);

test/phpunit/MouvementStockTest.php

Spacing +56 added lines, -56 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';
@@ -38,7 +38,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -57,11 +57,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;
 
 		if (!isModEnabled('productbatch')) {
 			print "\n".__METHOD__." module Lot/Serial must be enabled.\n";
@@ -79,98 +79,98 @@ 
 	 */
 	public function testMouvementCreate()
 	{
-		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 create a product for tests
-		$product0=new Product($db);
+		$product0 = new Product($db);
 		$product0->initAsSpecimen();
-		$product0->ref.=' phpunit 0';
-		$product0->label.=' phpunit 0';
+		$product0->ref .= ' phpunit 0';
+		$product0->label .= ' phpunit 0';
 		$product0->status_batch = 1;
-		$product0id=$product0->create($user);
+		$product0id = $product0->create($user);
 
 		print __METHOD__." product0id=".$product0id."\n";
 		$this->assertGreaterThan(0, $product0id, 'Failed to create product');
 
-		$product1=new Product($db);
+		$product1 = new Product($db);
 		$product1->initAsSpecimen();
-		$product1->ref.=' phpunit 1';
-		$product1->label.=' phpunit 1';
-		$product1id=$product1->create($user);
+		$product1->ref .= ' phpunit 1';
+		$product1->label .= ' phpunit 1';
+		$product1id = $product1->create($user);
 
-		$product2=new Product($db);
+		$product2 = new Product($db);
 		$product2->initAsSpecimen();
-		$product2->ref.=' phpunit 2';
-		$product2->label.=' phpunit 2';
-		$product2id=$product2->create($user);
+		$product2->ref .= ' phpunit 2';
+		$product2->label .= ' phpunit 2';
+		$product2id = $product2->create($user);
 
 		// We create a product for tests
-		$warehouse0=new Entrepot($db);
+		$warehouse0 = new Entrepot($db);
 		$warehouse0->initAsSpecimen();
-		$warehouse0->label.=' phpunit 0';
-		$warehouse0->description.=' phpunit 0';
+		$warehouse0->label .= ' phpunit 0';
+		$warehouse0->description .= ' phpunit 0';
 		$warehouse0->statut = 0;
-		$warehouse0id=$warehouse0->create($user);
+		$warehouse0id = $warehouse0->create($user);
 
-		$warehouse1=new Entrepot($db);
+		$warehouse1 = new Entrepot($db);
 		$warehouse1->initAsSpecimen();
-		$warehouse1->label.=' phpunit 1';
-		$warehouse1->description.=' phpunit 1';
-		$warehouse1id=$warehouse1->create($user);
+		$warehouse1->label .= ' phpunit 1';
+		$warehouse1->description .= ' phpunit 1';
+		$warehouse1id = $warehouse1->create($user);
 
-		$warehouse2=new Entrepot($db);
+		$warehouse2 = new Entrepot($db);
 		$warehouse2->initAsSpecimen();
-		$warehouse2->label.=' phpunit 2';
-		$warehouse2->description.=' phpunit 2';
-		$warehouse2id=$warehouse2->create($user);
+		$warehouse2->label .= ' phpunit 2';
+		$warehouse2->description .= ' phpunit 2';
+		$warehouse2id = $warehouse2->create($user);
 
-		$localobject=new MouvementStock($db);
+		$localobject = new MouvementStock($db);
 
 		$datetest1 = dol_mktime(0, 0, 0, 1, 1, 2000);
 		$datetest2 = dol_mktime(0, 0, 0, 1, 2, 2000);
 
 		// Create an input movement movement (type = 3) with value for eatby date and a lot $datetest1
-		$result=$localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest1, $datetest1, 'anotyetuselotnumberA', '', 0, 'Inventory Code Test with batch');
+		$result = $localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest1, $datetest1, 'anotyetuselotnumberA', '', 0, 'Inventory Code Test with batch');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Failed to create a movement with a lot number '.$datetest1.' for product id='.$product0id.' with status_batch=1');
 
-		$result=$localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest1, $datetest1, 'anotyetuselotnumberB', '', 0, 'Inventory Code Test with batch');
+		$result = $localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest1, $datetest1, 'anotyetuselotnumberB', '', 0, 'Inventory Code Test with batch');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Test to check we can create a movement a eatby dare different when lot number is different');
 
 		// Create same input movement movement (type = 3) with same lot but a different value of eatby date
-		$result=$localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest2, $datetest1, 'anotyetuselotnumberA', '', 0, 'Inventory Code Test with batch');
+		$result = $localobject->reception($user, $product0id, $warehouse0id, 5, 999, 'Movement for unit test with batch', $datetest2, $datetest1, 'anotyetuselotnumberA', '', 0, 'Inventory Code Test with batch');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-3, $result, 'Test to check we can t create a movement for a lot with a different eatby date');
 
 		// Do a list of movement into warehouse 1
 
 		// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
-		$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.9, 'Movement for unit test 1', '', '', '', '', 0, 'Inventory Code Test');
+		$result = $localobject->reception($user, $product1id, $warehouse1id, 10, 9.9, 'Movement for unit test 1', '', '', '', '', 0, 'Inventory Code Test');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Return code of 0 was expected for the reception test 1');
 
 		// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.7, 'Movement for unit test 2', '', '', '', '', 0, 'Inventory Code Test');
+		$result = $localobject->reception($user, $product1id, $warehouse1id, 10, 9.7, 'Movement for unit test 2', '', '', '', '', 0, 'Inventory Code Test');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->livraison($user, $product1id, $warehouse1id, 5, 999, 'Movement for unit test 3', '', '', '', '', 0, 'Inventory Code Test');
+		$result = $localobject->livraison($user, $product1id, $warehouse1id, 5, 999, 'Movement for unit test 3', '', '', '', '', 0, 'Inventory Code Test');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
+		$result = $localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
+		$result = $localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
@@ -178,27 +178,27 @@ 
 		// Do same but into warehouse 2
 
 		// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
-		$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.9, 'Movement for unit test 1 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
+		$result = $localobject->reception($user, $product1id, $warehouse2id, 10, 9.9, 'Movement for unit test 1 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.7, 'Movement for unit test 2 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
+		$result = $localobject->reception($user, $product1id, $warehouse2id, 10, 9.7, 'Movement for unit test 2 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->livraison($user, $product1id, $warehouse2id, 5, 999, 'Movement for unit test 3 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
+		$result = $localobject->livraison($user, $product1id, $warehouse2id, 5, 999, 'Movement for unit test 3 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
+		$result = $localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Test create A');
 
 		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-		$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
+		$result = $localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Test create B');
 
@@ -216,11 +216,11 @@ 
 	 */
 	public function testMouvementCheck($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;
 
 		$productid = $localobject->product_id;
 		$warehouseid = $localobject->entrepot_id;
@@ -231,7 +231,7 @@ 
 		$producttotest->fetch($productid);
 
 		print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
-		$this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
+		$this->assertEquals($producttotest->stock_reel, 28); // 28 is result of stock movement defined into testMouvementCreate
 
 		print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
 		$this->assertEquals($producttotest->pmp, 9.8);