Dolibarr / dolibarr

test/phpunit/ExpenseReportTest.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';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 
@@ -56,33 +56,33 @@ 
 	 */
 	public function testExpenseReportCreate()
 	{
-		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 supplier order with a too low quantity
-		$localobject=new ExpenseReport($db);
-		$localobject->initAsSpecimen();         // Init a specimen with lines
+		$localobject = new ExpenseReport($db);
+		$localobject->initAsSpecimen(); // Init a specimen with lines
 		$localobject->status = 0;
 		$localobject->fk_statut = 0;
-		$localobject->date_fin = null;  // Force bad value
+		$localobject->date_fin = null; // Force bad value
 
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-1, $result, "Error on test ExpenseReport create 1 : ".$localobject->error);       // must be -1 because of missing mandatory fields
+		$this->assertEquals(-1, $result, "Error on test ExpenseReport create 1 : ".$localobject->error); // must be -1 because of missing mandatory fields
 
-		$sql="DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
 		$db->query($sql);
 
 		// Create supplier order
-		$localobject2=new ExpenseReport($db);
-		$localobject2->initAsSpecimen();        // Init a specimen with lines
+		$localobject2 = new ExpenseReport($db);
+		$localobject2->initAsSpecimen(); // Init a specimen with lines
 		$localobject2->status = 0;
 		$localobject2->fk_statut = 0;
 
-		$result=$localobject2->create($user);
+		$result = $localobject2->create($user);
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, "Error on test ExpenseReport create 2 : ".$localobject2->error);
 
@@ -101,14 +101,14 @@ 
 	 */
 	public function testExpenseReportFetch($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 ExpenseReport($db);
-		$result=$localobject->fetch($id);
+		$localobject = new ExpenseReport($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -126,13 +126,13 @@ 
 	 */
 	public function testExpenseReportValid($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->setValidate($user);
+		$result = $localobject->setValidate($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -150,13 +150,13 @@ 
 	 */
 	public function testExpenseReportApprove($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->setApproved($user);
+		$result = $localobject->setApproved($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -174,13 +174,13 @@ 
 	 */
 	public function testExpenseReportCancel($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->set_cancel($user, 'Because...');
+		$result = $localobject->set_cancel($user, 'Because...');
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -198,13 +198,13 @@ 
 	 */
 	public function testExpenseReportOther($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->getSumPayments();
+		$result = $localobject->getSumPayments();
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result);
 
@@ -222,15 +222,15 @@ 
 	 */
 	public function testExpenseReportDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ExpenseReport($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 ExpenseReport($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);

test/phpunit/CategorieTest.php

Spacing +65 added lines, -65 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,37 +56,37 @@ 
 	 */
 	public function testCategorieCreate()
 	{
-		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 category
-		$localobject=new Categorie($db);
+		$localobject = new Categorie($db);
 		$localobject->initAsSpecimen();
 
 		// Check it does not exist (return 0)
-		$resultCheck=$localobject->already_exists();
+		$resultCheck = $localobject->already_exists();
 		print __METHOD__." resultCheck=".$resultCheck."\n";
 		$this->assertEquals(0, $resultCheck);
 
 		// Create
-		$resultFirstCreate=$localobject->create($user);
+		$resultFirstCreate = $localobject->create($user);
 		print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n";
 		$this->assertGreaterThan(0, $resultFirstCreate);
 
 		// We try to create another one with same ref
-		$localobject2=new Categorie($db);
+		$localobject2 = new Categorie($db);
 		$localobject2->initAsSpecimen();
 
 		// Check it does exist (return 1)
-		$resultCheck=$localobject2->already_exists();
+		$resultCheck = $localobject2->already_exists();
 		print __METHOD__." resultCheck=".$resultCheck."\n";
 		$this->assertGreaterThan(0, $resultCheck);
 
-		$resultSecondCreate=$localobject2->create($user);
+		$resultSecondCreate = $localobject2->create($user);
 		print __METHOD__." result=".$resultSecondCreate."\n";
 		$this->assertEquals(-4, $resultSecondCreate);
 
@@ -104,38 +104,38 @@ 
 	 */
 	public function testCategorieProduct($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;
 
-		$localobjecttmp=new Categorie($db);
+		$localobjecttmp = new Categorie($db);
 		$localobjecttmp->initAsSpecimen();
-		$localobjecttmp->label='Specimen Category for product';
-		$localobjecttmp->type=0;    // product category
-		$catid=$localobjecttmp->create($user);
+		$localobjecttmp->label = 'Specimen Category for product';
+		$localobjecttmp->type = 0; // product category
+		$catid = $localobjecttmp->create($user);
 
 		print __METHOD__." catid=".$catid."\n";
 		$this->assertGreaterThan(0, $catid);
 
 		// Try to create product linked to category
-		$localobject2=new Product($db);
+		$localobject2 = new Product($db);
 		$localobject2->initAsSpecimen();
-		$localobject2->ref.='-CATEG';
-		$localobject2->tva_npr=1;
-		$result=$localobject2->create($user);
+		$localobject2->ref .= '-CATEG';
+		$localobject2->tva_npr = 1;
+		$result = $localobject2->create($user);
 		$cat = new Categorie($db);
 		$cat->id = $catid;
 		$cat->type = 0;
-		$result=$cat->add_type($localobject2, "product");
+		$result = $cat->add_type($localobject2, "product");
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
 		// Get list of categories for product
-		$localcateg=new Categorie($db);
-		$listofcateg=$localcateg->containing($localobject2->id, Categorie::TYPE_PRODUCT, 'label');
+		$localcateg = new Categorie($db);
+		$listofcateg = $localcateg->containing($localobject2->id, Categorie::TYPE_PRODUCT, 'label');
 		$this->assertTrue(in_array('Specimen Category for product', $listofcateg), 'Categ not found linked to product when it should');
 
 		return $id;
@@ -152,14 +152,14 @@ 
 	 */
 	public function testCategorieFetch($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 Categorie($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Categorie($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
@@ -177,14 +177,14 @@ 
 	 */
 	public function testCategorieUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject->note_private ='New note after update';
-		$result=$localobject->update($user);
+		$localobject->note_private = 'New note after update';
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
@@ -203,18 +203,18 @@ 
 	 */
 	public function testCategorieOther($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";
 		$this->assertLessThan($result, 0);
 		*/
 
-		$retarray=$localobject->liste_photos('/');
+		$retarray = $localobject->liste_photos('/');
 		print __METHOD__." retarray size=".count($retarray)."\n";
 		$this->assertTrue(is_array($retarray));
 
@@ -232,15 +232,15 @@ 
 	 */
 	public function testCategorieDelete($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 Categorie($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		$localobject = new Categorie($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
@@ -256,14 +256,14 @@ 
 	 */
 	public function testCategorieStatic()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Categorie($db);
-		$retarray=$localobject->get_full_arbo(3);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Categorie($db);
+		$retarray = $localobject->get_full_arbo(3);
 
 		print __METHOD__." retarray size=".count($retarray)."\n";
 		$this->assertTrue(is_array($retarray));

test/phpunit/FormAdminTest.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,14 +55,14 @@ 
 	 */
 	public function testSelectPaperFormat()
 	{
-		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 FormAdmin($db);
-		$result=$localobject->select_paper_format('', 'paperformat_id', 'A4', 0, 1);
+		$localobject = new FormAdmin($db);
+		$result = $localobject->select_paper_format('', 'paperformat_id', 'A4', 0, 1);
 
 		$this->assertEquals($result, '<select class="flat" id="paperformat_id" name="paperformat_id"><option value="EUA4">Format A4 - 210x297 mm</option></select>');
 		print __METHOD__." result=".$result."\n";

test/phpunit/PaypalTest.php

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,14 +56,14 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if (!isModEnabled('paypal')) {
 			print __METHOD__." Module Paypal must be enabled.\n";
 			die(1);
 		}
 
-		$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";
 	}
@@ -76,16 +76,16 @@ 
 	 */
 	public function testPaypalOk()
 	{
-		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;
 
-		$urltotest=getOnlinePaymentUrl(0, 'free');
+		$urltotest = getOnlinePaymentUrl(0, 'free');
 		print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
 		print __METHOD__." result=".$result['http_code']."\n";
 		$this->assertEquals(200, $result['http_code']);

test/phpunit/ImportTest.php

Spacing +13 added lines, -13 removed lines

@@ -24,41 +24,41 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 
@@ -78,7 +78,7 @@ 
 	 */
 	public function testImportSample1()
 	{
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
 
 		// TODO
 		// Run import on file and check the record with field "auto" are filled

test/phpunit/ODFTest.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
  * \brief   PHPUnit test for odf class.
  */
 
-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;
 
 $langs->load("main");
 
@@ -56,11 +56,11 @@ 
 	 */
 	public function testODFconvertVarToOdf()
 	{
-		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 test using template_invoice, it does not matter, we just need a valid odt.
 		$filename = '../../htdocs/install/doctemplates/invoices/template_invoice.odt';
@@ -283,7 +283,7 @@ 
 			],
 		];
 
-		$odf=new Odf($filename, array());
+		$odf = new Odf($filename, array());
 		if (is_object($odf)) {
 			$result = 1;
 		} // Just to test

test/phpunit/LoanTest.php

Spacing +31 added lines, -31 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,15 +55,15 @@ 
 	 */
 	public function testLoanCreate()
 	{
-		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 Loan($db);
+		$localobject = new Loan($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -81,14 +81,14 @@ 
 	 */
 	public function testLoanFetch($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 Loan($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Loan($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -106,13 +106,13 @@ 
 	 */
 	public function testLoanOther($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);
@@ -130,15 +130,15 @@ 
 	 */
 	public function testLoanDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($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 Loan($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/WebsiteTest.php

Spacing +13 added lines, -13 removed lines

@@ -24,33 +24,33 @@ 
  *		\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__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
-if (! defined("NOSESSION")) {
+if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
@@ -69,7 +69,7 @@ 
 		$user->rights->website = new stdClass();
 	}
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -88,9 +88,9 @@ 
 	 */
 	public function testGetPagesFromSearchCriterias()
 	{
-		global $db, $website;	// We need the $website as global, it is used by the getPagesFromSearchCriterias()
+		global $db, $website; // We need the $website as global, it is used by the getPagesFromSearchCriterias()
 
-		$website = new Website($db);	// $website must be defined globally for getPagesFromSearchCriterias()
+		$website = new Website($db); // $website must be defined globally for getPagesFromSearchCriterias()
 
 		$s = "123') OR 1=1-- \' xxx";
 		/*

test/phpunit/CommonObjectTest.php

Spacing +23 added lines, -23 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,16 +56,16 @@ 
 	 */
 	public function testFetchUser()
 	{
-		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 Commande($db);
+		$localobject = new Commande($db);
 		$localobject->fetch(1);
 
-		$result=$localobject->fetch_user(1);
+		$result = $localobject->fetch_user(1);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($localobject->user->id, 0);
@@ -79,15 +79,15 @@ 
 	 */
 	public function testFetchProject()
 	{
-		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 Commande($db);
+		$localobject = new Commande($db);
 		$localobject->fetch(1);
-		$result=$localobject->fetch_projet();
+		$result = $localobject->fetch_projet();
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);
@@ -101,16 +101,16 @@ 
 	 */
 	public function testFetchThirdParty()
 	{
-		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 Commande($db);
+		$localobject = new Commande($db);
 		$localobject->fetch(1);
 
-		$result=$localobject->fetch_thirdparty();
+		$result = $localobject->fetch_thirdparty();
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);