alxarafe / alixar

dolibarr/test/phpunit/CommonInvoiceTest.php

Indentation +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -110,7 +110,7 @@ 
      * End phpunit tests
      *
      * @return  void
-    */
+     */
     protected function tearDown()
     {
         print __METHOD__."\n";

Spacing +20 added lines, -20 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';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$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;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        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.
 
         print __METHOD__."\n";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
      */
     protected function setUp()
     {
-        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";
     }
@@ -124,13 +124,13 @@ 
      */
     public function testCalculateDateLimReglement()
     {
-        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 Facture($this->savdb);
+        $localobject = new Facture($this->savdb);
         $localobject->fetch(1);
         $localobject->date = dol_mktime(12, 0, 0, 1, 1, 2010);
 

dolibarr/test/phpunit/AdminLibTest.php

Indentation +15 added lines, -15 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -152,18 +152,18 @@ 
      */
     public function testEnableModule()
     {
-    	global $conf, $db, $langs, $user;
-
-		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
-		print "Enable module modExpenseReport";
-		$moduledescriptor=new modExpenseReport($db);
-		$moduledescriptor->init();
-		$conf->setValues($db);
-
-		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
-		print "Enable module modAPI";
-		$moduledescriptor=new modApi($db);
-		$moduledescriptor->init();
-		$conf->setValues($db);
+        global $conf, $db, $langs, $user;
+
+        require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
+        print "Enable module modExpenseReport";
+        $moduledescriptor=new modExpenseReport($db);
+        $moduledescriptor->init();
+        $conf->setValues($db);
+
+        require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
+        print "Enable module modAPI";
+        $moduledescriptor=new modApi($db);
+        $moduledescriptor->init();
+        $conf->setValues($db);
     }
 }

Spacing +29 added lines, -29 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';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$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;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        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.
 
         print __METHOD__."\n";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
      */
     protected function setUp()
     {
-        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";
     }
@@ -123,24 +123,24 @@ 
      */
     public function testVersionCompare()
     {
-        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=versioncompare(array(3,1,-4),array(3,1,1));
+        $result = versioncompare(array(3, 1, -4), array(3, 1, 1));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-3,$result);
-        $result=versioncompare(array(3,1,0),array(3,1,1));
+        $this->assertEquals(-3, $result);
+        $result = versioncompare(array(3, 1, 0), array(3, 1, 1));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-3,$result);
-        $result=versioncompare(array(3,1,0),array(3,2,0));
+        $this->assertEquals(-3, $result);
+        $result = versioncompare(array(3, 1, 0), array(3, 2, 0));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-2,$result);
-        $result=versioncompare(array(3,1,0),array(3,1,0));
+        $this->assertEquals(-2, $result);
+        $result = versioncompare(array(3, 1, 0), array(3, 1, 0));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0,$result);
+        $this->assertEquals(0, $result);
 
         return $result;
     }
@@ -156,13 +156,13 @@ 
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
-		$moduledescriptor=new modExpenseReport($db);
+		$moduledescriptor = new modExpenseReport($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
 		print "Enable module modAPI";
-		$moduledescriptor=new modApi($db);
+		$moduledescriptor = new modApi($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
     }

dolibarr/test/phpunit/AccountingAccountTest.php

Indentation +13 added lines, -13 removed lines

@@ -59,7 +59,7 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
@@ -184,18 +184,18 @@ 
      */
     public function testAccountingAccountUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject->label='New label';
-    	$result=$localobject->update($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject->id;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->label='New label';
+        $result=$localobject->update($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject->id;
     }
 
     /**

Spacing +44 added lines, -44 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';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
         //$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;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        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 (empty($conf->accounting->enabled)) { print __METHOD__." module accouting must be enabled.\n"; die(); }
@@ -87,7 +87,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -100,11 +100,11 @@ 
      */
     protected function setUp()
     {
-        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";
@@ -127,13 +127,13 @@ 
      */
     public function testAccountingAccountCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
+        $localobject = new AccountingAccount($this->savdb);
         $localobject->fk_pcg_version = 'PCG99-ABREGE';
         $localobject->account_category = 0;
         $localobject->pcg_type = 'XXXXX';
@@ -141,7 +141,7 @@ 
         $localobject->account_parent = 0;
         $localobject->label = 'Account specimen';
         $localobject->active = 0;
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -159,14 +159,14 @@ 
      */
     public function testAccountingAccountFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new AccountingAccount($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -184,14 +184,14 @@ 
      */
     public function testAccountingAccountUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
-    	$localobject->label='New label';
-    	$result=$localobject->update($user);
+    	$localobject->label = 'New label';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -209,15 +209,15 @@ 
      */
     public function testAccountingAccountDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new AccountingAccount($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject = new AccountingAccount($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/FactureTestRounding.php

Indentation +157 added lines, -157 removed lines

@@ -31,9 +31,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,75 +47,75 @@ 
  */
 class FactureTestRounding extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FactureTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		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;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return FactureTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
 
-    	print __METHOD__."\n";
+        //$this->sharedFixture
+        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;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        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";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function setUp()
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
+    protected function setUp()
     {
-    	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 __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function tearDown()
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -134,7 +134,7 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
         $localobject=new Facture($this->savdb);
         $localobject->initAsSpecimen();
@@ -211,35 +211,35 @@ 
      */
     public function testFactureAddLine1()
     {
-    	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;
-
-    	$localobject1a=new Facture($this->savdb);
-    	$localobject1a->initAsSpecimen('nolines');
-    	$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;
-
-    	$localobject1b=new Facture($this->savdb);
-    	$localobject1b->initAsSpecimen('nolines');
-    	$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');
-    	$this->assertEquals(115.43, $localobject1b->total_ttc, 'testFactureAddLine1 total_ttc');
+        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;
+
+        $localobject1a=new Facture($this->savdb);
+        $localobject1a->initAsSpecimen('nolines');
+        $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;
+
+        $localobject1b=new Facture($this->savdb);
+        $localobject1b->initAsSpecimen('nolines');
+        $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');
+        $this->assertEquals(115.43, $localobject1b->total_ttc, 'testFactureAddLine1 total_ttc');
     }
 
     /**
@@ -252,39 +252,39 @@ 
      */
     public function testFactureAddLine2()
     {
-    	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;
-
-    	$localobject2=new Facture($this->savdb);
-    	$localobject2->initAsSpecimen('nolines');
-    	$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);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject2->total_ht);
-    	$this->assertEquals(20.04, $localobject2->total_tva);
-    	$this->assertEquals(115.44, $localobject2->total_ttc);
-
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
-
-    	$localobject2=new Facture($this->savdb);
-    	$localobject2->initAsSpecimen('nolines');
-    	$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);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject2->total_ht);
-    	$this->assertEquals(20.03, $localobject2->total_tva);
-    	$this->assertEquals(115.43, $localobject2->total_ttc);
+        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;
+
+        $localobject2=new Facture($this->savdb);
+        $localobject2->initAsSpecimen('nolines');
+        $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);
+        print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
+        $this->assertEquals(95.40, $localobject2->total_ht);
+        $this->assertEquals(20.04, $localobject2->total_tva);
+        $this->assertEquals(115.44, $localobject2->total_ttc);
+
+        // With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
+        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+
+        $localobject2=new Facture($this->savdb);
+        $localobject2->initAsSpecimen('nolines');
+        $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);
+        print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
+        $this->assertEquals(95.40, $localobject2->total_ht);
+        $this->assertEquals(20.03, $localobject2->total_tva);
+        $this->assertEquals(115.43, $localobject2->total_ttc);
     }
 
     /**
@@ -297,42 +297,42 @@ 
      */
     public function testFactureAddLine3()
     {
-    	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;
-
-    	$localobject3=new Facture($this->savdb);
-    	$localobject3->initAsSpecimen('nolines');
-    	$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);
-    	$localobject3->addline('Line 4', 6.36, 3, 21);
-    	$localobject3->addline('Line 5', 6.36, 3, 21);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject3->total_ht);
-    	$this->assertEquals(20.05, $localobject3->total_tva);
-    	$this->assertEquals(115.45, $localobject3->total_ttc);
-
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
-
-    	$localobject3=new Facture($this->savdb);
-    	$localobject3->initAsSpecimen('nolines');
-    	$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);
-    	$localobject3->addline('Line 4', 6.36, 3, 21);
-    	$localobject3->addline('Line 5', 6.36, 3, 21);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject3->total_ht);
-    	$this->assertEquals(20.03, $localobject3->total_tva);
-    	$this->assertEquals(115.43, $localobject3->total_ttc);
+        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;
+
+        $localobject3=new Facture($this->savdb);
+        $localobject3->initAsSpecimen('nolines');
+        $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);
+        $localobject3->addline('Line 4', 6.36, 3, 21);
+        $localobject3->addline('Line 5', 6.36, 3, 21);
+        print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
+        $this->assertEquals(95.40, $localobject3->total_ht);
+        $this->assertEquals(20.05, $localobject3->total_tva);
+        $this->assertEquals(115.45, $localobject3->total_ttc);
+
+        // With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
+        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+
+        $localobject3=new Facture($this->savdb);
+        $localobject3->initAsSpecimen('nolines');
+        $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);
+        $localobject3->addline('Line 4', 6.36, 3, 21);
+        $localobject3->addline('Line 5', 6.36, 3, 21);
+        print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
+        $this->assertEquals(95.40, $localobject3->total_ht);
+        $this->assertEquals(20.03, $localobject3->total_tva);
+        $this->assertEquals(115.43, $localobject3->total_ttc);
     }
 }

Spacing +72 added lines, -72 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;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$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;
@@ -77,8 +77,8 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	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";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
 	protected function setUp()
     {
-    	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";
     }
@@ -128,29 +128,29 @@ 
      */
     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($this->savdb);
+        $localobject = new Facture($this->savdb);
         $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($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->fetch($result);
         //var_dump($newlocalobject);
 
@@ -171,29 +171,29 @@ 
      */
     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($this->savdb);
+        $localobject = new Facture($this->savdb);
         $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($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->fetch($result);
         //var_dump($newlocalobject);
 
@@ -211,31 +211,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($this->savdb);
+    	$localobject1a = new Facture($this->savdb);
     	$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($this->savdb);
+    	$localobject1b = new Facture($this->savdb);
     	$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');
@@ -252,18 +252,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($this->savdb);
+    	$localobject2 = new Facture($this->savdb);
     	$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);
@@ -273,11 +273,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($this->savdb);
+    	$localobject2 = new Facture($this->savdb);
     	$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);
@@ -297,18 +297,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($this->savdb);
+    	$localobject3 = new Facture($this->savdb);
     	$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);
@@ -320,11 +320,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($this->savdb);
+    	$localobject3 = new Facture($this->savdb);
     	$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);

dolibarr/test/phpunit/ImportTest.php

Indentation +53 added lines, -53 removed lines

@@ -49,74 +49,74 @@ 
  */
 class ImportTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ImportTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		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;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ImportTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        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;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
     {
-    	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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		//$db->rollback();
+        global $conf,$user,$langs,$db;
+        //$db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	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 __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -134,6 +134,6 @@ 
         // according to option
 
 
-		return true;
+        return true;
     }
 }

Spacing +24 added lines, -24 removed lines

@@ -23,21 +23,21 @@ 
  *		\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';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-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('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 /**
@@ -65,11 +65,11 @@ 
 		parent::__construct();
 
 		//$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;
@@ -79,7 +79,7 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	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.
 
     	print __METHOD__."\n";
@@ -88,7 +88,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		//$db->rollback();
 
 		print __METHOD__."\n";
@@ -101,11 +101,11 @@ 
 	 */
     protected function setUp()
     {
-    	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";
     }
@@ -127,7 +127,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

Braces +33 added lines, -10 removed lines

@@ -28,16 +28,39 @@
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-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('NOREQUIREUSER')) {
+    define('NOREQUIREUSER','1');
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 
 /**

dolibarr/test/phpunit/JsonLibTest.php

Indentation +15 added lines, -15 removed lines

@@ -62,9 +62,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -94,11 +94,11 @@ 
         print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
         global $conf,$user,$langs,$db;
@@ -109,11 +109,11 @@ 
 
         print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
         print __METHOD__."\n";
@@ -135,7 +135,7 @@ 
 
         // Do a test with an array starting with 0
         $arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
+        $arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
 
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
@@ -147,9 +147,9 @@ 
         $decoded=dol_json_decode($encoded,true);
         $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
 
-		// Same test but array start with 2 instead of 0
+        // Same test but array start with 2 instead of 0
         $arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
+        $arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
 
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);

Spacing +55 added lines, -55 removed lines

@@ -23,21 +23,21 @@ 
  *		\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';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-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('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 /**
@@ -65,11 +65,11 @@ 
     	parent::__construct();
 
     	//$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;
@@ -79,7 +79,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        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.
 
         print __METHOD__."\n";
@@ -88,7 +88,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->rollback();
 
         print __METHOD__."\n";
@@ -101,11 +101,11 @@ 
 	 */
     protected function setUp()
     {
-        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";
     }
@@ -127,47 +127,47 @@ 
     public function testJsonEncode()
     {
         //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         // Do a test with an array starting with 0
-        $arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
+        $arraytotest = array(0=>array('key'=>1, 'value'=>'PRODREF', 'label'=>'Product ref with é and special chars \\ \' "'));
+		$arrayencodedexpected = '[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
 
-        $encoded=json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected,$encoded);
-        $decoded=json_decode($encoded,true);
-        $this->assertEquals($arraytotest,$decoded,'test for json_xxx');
+        $encoded = json_encode($arraytotest);
+        $this->assertEquals($arrayencodedexpected, $encoded);
+        $decoded = json_decode($encoded, true);
+        $this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
 
-        $encoded=dol_json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected,$encoded);
-        $decoded=dol_json_decode($encoded,true);
-        $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
+        $encoded = dol_json_encode($arraytotest);
+        $this->assertEquals($arrayencodedexpected, $encoded);
+        $decoded = dol_json_decode($encoded, true);
+        $this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
 
 		// Same test but array start with 2 instead of 0
-        $arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
+        $arraytotest = array(2=>array('key'=>1, 'value'=>'PRODREF', 'label'=>'Product ref with é and special chars \\ \' "'));
+		$arrayencodedexpected = '{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
 
-        $encoded=json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected,$encoded);
-        $decoded=json_decode($encoded,true);
-        $this->assertEquals($arraytotest,$decoded,'test for json_xxx');
+        $encoded = json_encode($arraytotest);
+        $this->assertEquals($arrayencodedexpected, $encoded);
+        $decoded = json_decode($encoded, true);
+        $this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
 
-        $encoded=dol_json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected,$encoded);
-        $decoded=dol_json_decode($encoded,true);
-        $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
+        $encoded = dol_json_encode($arraytotest);
+        $this->assertEquals($arrayencodedexpected, $encoded);
+        $decoded = dol_json_decode($encoded, true);
+        $this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
 
         // Test with object
-        $now=gmmktime(12,0,0,1,1,1970);
-        $objecttotest=new stdClass();
-        $objecttotest->property1='abc';
-        $objecttotest->property2=1234;
-        $objecttotest->property3=$now;
-        $encoded=dol_json_encode($objecttotest);
-        $this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}',$encoded);
+        $now = gmmktime(12, 0, 0, 1, 1, 1970);
+        $objecttotest = new stdClass();
+        $objecttotest->property1 = 'abc';
+        $objecttotest->property2 = 1234;
+        $objecttotest->property3 = $now;
+        $encoded = dol_json_encode($objecttotest);
+        $this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}', $encoded);
     }
 }

Braces +33 added lines, -10 removed lines

@@ -28,16 +28,39 @@
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-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('NOREQUIREUSER')) {
+    define('NOREQUIREUSER','1');
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 
 /**

dolibarr/test/phpunit/TicketTest.php

Indentation +364 added lines, -364 removed lines

@@ -31,9 +31,9 @@ 
 require_once dirname(__FILE__).'/../../htdocs/ticket/class/ticket.class.php';
 
 if (empty($user->id)) {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,366 +47,366 @@ 
  */
 class TicketTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ContratTest
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		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;
-		print "\n";
-	}
-
-	// Static methods
-	public static function setUpBeforeClass()
-	{
-		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";
-	}
-
-	// tear down after class
-	public static function tearDownAfterClass()
-	{
-		global $conf,$user,$langs,$db;
-		$db->rollback();
-
-		print __METHOD__."\n";
-	}
-
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function setUp()
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		print __METHOD__."\n";
-	}
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function tearDown()
-	{
-		print __METHOD__."\n";
-	}
-
-	/**
-	 * testTicketCreate
-	 *
-	 * @return	int
-	 */
-	public function testTicketCreate()
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		// Try to create one with bad values
-		$localobject=new Ticket($this->savdb);
-		$localobject->initAsSpecimen();
-		$localobject->ref = '';
-		$result=$localobject->create($user);
-
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-3, $result, $localobject->error.join(',', $localobject->errors));
-
-		// Try to create one with correct values
-		$localobject=new Ticket($this->savdb);
-		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
-
-		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThan(0, $result, $localobject->error.join(',', $localobject->errors));
-
-		return $result;
-	}
-
-	/**
-	 * testTicketFetch
-	 *
-	 * @param	int		$id		Id of ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketCreate
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketFetch($id)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Ticket($this->savdb);
-		$result=$localobject->fetch($id);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-		$this->assertGreaterThan(0, $result);
-
-		return $localobject;
-	}
-
-	/**
-	 * testTicketmarkAsRead
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketmarkAsRead($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$result=$localobject->markAsRead($user);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketsetProject
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketsetProject($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$project_id = 1;
-
-		$result=$localobject->setProject($project_id);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketsetContract
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketsetContract($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$contract_id = 1;
-
-		$result=$localobject->setContract($contract_id);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketsetProgression
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketsetProgression($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$percent = 80;
-
-		$result=$localobject->setProgression($percent);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketassignUser
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketassignUser($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$user_id_to_assign = 1;
-
-		$result=$localobject->assignUser($user, $user_id_to_assign);
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ContratTest
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        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;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        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";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+    }
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+    /**
+     * testTicketCreate
+     *
+     * @return	int
+     */
+    public function testTicketCreate()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        // Try to create one with bad values
+        $localobject=new Ticket($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->ref = '';
+        $result=$localobject->create($user);
+
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(-3, $result, $localobject->error.join(',', $localobject->errors));
+
+        // Try to create one with correct values
+        $localobject=new Ticket($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThan(0, $result, $localobject->error.join(',', $localobject->errors));
+
+        return $result;
+    }
+
+    /**
+     * testTicketFetch
+     *
+     * @param	int		$id		Id of ticket
+     * @return	int
+     *
+     * @depends	testTicketCreate
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketFetch($id)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Ticket($this->savdb);
+        $result=$localobject->fetch($id);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
+
+        return $localobject;
+    }
+
+    /**
+     * testTicketmarkAsRead
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketmarkAsRead($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=$localobject->markAsRead($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketsetProject
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketsetProject($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $project_id = 1;
+
+        $result=$localobject->setProject($project_id);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketsetContract
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketsetContract($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $contract_id = 1;
+
+        $result=$localobject->setContract($contract_id);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketsetProgression
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketsetProgression($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $percent = 80;
+
+        $result=$localobject->setProgression($percent);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketassignUser
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketassignUser($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $user_id_to_assign = 1;
+
+        $result=$localobject->assignUser($user, $user_id_to_assign);
         ;
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketassignUserOther
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketassignUserOther($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$user_id_to_assign = 2;
-
-		$result=$localobject->assignUser($user, $user_id_to_assign);
-		;
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketcreateTicketLog
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketcreateTicketLog($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-
-		$message = 'Test ticket log';
-		$noemail = 1;
-		$result=$localobject->createTicketLog($user, $message, $noemail);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject;
-	}
-
-	/**
-	 * testTicketclose
-	 *
-	 * @param	Ticket		$localobject		Ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketFetch
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketclose($localobject)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$result=$localobject->close();
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-		$this->assertGreaterThan(0, $result);
-		return $localobject->id;
-	}
-
-
-	/**
-	 * testTicketDelete
-	 *
-	 * @param	int		$id		Id of ticket
-	 * @return	int
-	 *
-	 * @depends	testTicketclose
-	 * The depends says test is run only if previous is ok
-	 */
-	public function testTicketDelete($id)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Ticket($this->savdb);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-		$this->assertGreaterThan(0, $result);
-		return $result;
-	}
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketassignUserOther
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketassignUserOther($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $user_id_to_assign = 2;
+
+        $result=$localobject->assignUser($user, $user_id_to_assign);
+        ;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketcreateTicketLog
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketcreateTicketLog($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+
+        $message = 'Test ticket log';
+        $noemail = 1;
+        $result=$localobject->createTicketLog($user, $message, $noemail);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
+    }
+
+    /**
+     * testTicketclose
+     *
+     * @param	Ticket		$localobject		Ticket
+     * @return	int
+     *
+     * @depends	testTicketFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketclose($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=$localobject->close();
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+        $this->assertGreaterThan(0, $result);
+        return $localobject->id;
+    }
+
+
+    /**
+     * testTicketDelete
+     *
+     * @param	int		$id		Id of ticket
+     * @return	int
+     *
+     * @depends	testTicketclose
+     * The depends says test is run only if previous is ok
+     */
+    public function testTicketDelete($id)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Ticket($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
+        return $result;
+    }
 }

Spacing +88 added lines, -88 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;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$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;
@@ -77,8 +77,8 @@ 
 	// Static methods
 	public static function setUpBeforeClass()
 	{
-		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";
 	}
@@ -86,7 +86,7 @@ 
 	// tear down after class
 	public static function tearDownAfterClass()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
 	protected function setUp()
 	{
-		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";
 	}
@@ -124,25 +124,25 @@ 
 	 */
 	public function testTicketCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// Try to create one with bad values
-		$localobject=new Ticket($this->savdb);
+		$localobject = new Ticket($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->ref = '';
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-3, $result, $localobject->error.join(',', $localobject->errors));
 
 		// Try to create one with correct values
-		$localobject=new Ticket($this->savdb);
+		$localobject = new Ticket($this->savdb);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result, $localobject->error.join(',', $localobject->errors));
@@ -161,14 +161,14 @@ 
 	 */
 	public function testTicketFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Ticket($this->savdb);
-		$result=$localobject->fetch($id);
+		$localobject = new Ticket($this->savdb);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
@@ -187,13 +187,13 @@ 
 	 */
 	public function testTicketmarkAsRead($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->markAsRead($user);
+		$result = $localobject->markAsRead($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -211,15 +211,15 @@ 
 	 */
 	public function testTicketsetProject($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$project_id = 1;
 
-		$result=$localobject->setProject($project_id);
+		$result = $localobject->setProject($project_id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -237,15 +237,15 @@ 
 	 */
 	public function testTicketsetContract($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$contract_id = 1;
 
-		$result=$localobject->setContract($contract_id);
+		$result = $localobject->setContract($contract_id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -263,15 +263,15 @@ 
 	 */
 	public function testTicketsetProgression($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$percent = 80;
 
-		$result=$localobject->setProgression($percent);
+		$result = $localobject->setProgression($percent);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -289,15 +289,15 @@ 
 	 */
 	public function testTicketassignUser($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$user_id_to_assign = 1;
 
-		$result=$localobject->assignUser($user, $user_id_to_assign);
+		$result = $localobject->assignUser($user, $user_id_to_assign);
         ;
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
@@ -316,15 +316,15 @@ 
 	 */
 	public function testTicketassignUserOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$user_id_to_assign = 2;
 
-		$result=$localobject->assignUser($user, $user_id_to_assign);
+		$result = $localobject->assignUser($user, $user_id_to_assign);
 		;
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
@@ -343,16 +343,16 @@ 
 	 */
 	public function testTicketcreateTicketLog($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;
 
 
 		$message = 'Test ticket log';
 		$noemail = 1;
-		$result=$localobject->createTicketLog($user, $message, $noemail);
+		$result = $localobject->createTicketLog($user, $message, $noemail);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -370,13 +370,13 @@ 
 	 */
 	public function testTicketclose($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->close();
+		$result = $localobject->close();
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
@@ -395,15 +395,15 @@ 
 	 */
 	public function testTicketDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Ticket($this->savdb);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Ticket($this->savdb);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);

dolibarr/test/phpunit/CompanyBankAccountTest.php

Indentation +93 added lines, -93 removed lines

@@ -31,9 +31,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,75 +47,75 @@ 
  */
 class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CompanyBankAccountTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		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;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CompanyBankAccountTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
 
-    	print __METHOD__."\n";
+        //$this->sharedFixture
+        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;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        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";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		print __METHOD__."\n";
-		//print $db->getVersion()."\n";
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+        //print $db->getVersion()."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -125,19 +125,19 @@ 
      */
     public function testCompanyBankAccountCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new CompanyBankAccount($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	print __METHOD__." result=".$result." id=".$localobject->id."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject->id;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new CompanyBankAccount($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        print __METHOD__." result=".$result." id=".$localobject->id."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject->id;
     }
 
     /**
@@ -151,17 +151,17 @@ 
      */
     public function testCompanyBankAccountFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new CompanyBankAccount($this->savdb);
-    	$result=$localobject->fetch($id);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new CompanyBankAccount($this->savdb);
+        $result=$localobject->fetch($id);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
@@ -197,18 +197,18 @@ 
      */
     public function testCompanyBankAccountUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->owner='New owner';
-    	$result=$localobject->update($user);
-
-	   	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->owner='New owner';
+        $result=$localobject->update($user);
+
+            print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**

Spacing +51 added lines, -51 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;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$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;
@@ -77,8 +77,8 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	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";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
     protected function setUp()
     {
-    	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";
@@ -125,15 +125,15 @@ 
      */
     public function testCompanyBankAccountCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new CompanyBankAccount($this->savdb);
+		$localobject = new CompanyBankAccount($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	print __METHOD__." result=".$result." id=".$localobject->id."\n";
     	$this->assertLessThan($result, 0);
@@ -151,14 +151,14 @@ 
      */
     public function testCompanyBankAccountFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new CompanyBankAccount($this->savdb);
-    	$result=$localobject->fetch($id);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new CompanyBankAccount($this->savdb);
+    	$result = $localobject->fetch($id);
     	print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
     	return $localobject;
@@ -174,13 +174,13 @@ 
      */
     public function testCompanyBankAccountSetAsDefault($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->setAsDefault($localobject->id);
+        $result = $localobject->setAsDefault($localobject->id);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
         return $localobject;
@@ -197,14 +197,14 @@ 
      */
     public function testCompanyBankAccountUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject->owner='New owner';
-    	$result=$localobject->update($user);
+		$localobject->owner = 'New owner';
+    	$result = $localobject->update($user);
 
 	   	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -222,14 +222,14 @@ 
      */
     public function testCompanyBankAccountOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject->owner='New owner';
-        $result=$localobject->update($user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject->owner = 'New owner';
+        $result = $localobject->update($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/MarginsLibTest.php

Indentation +79 added lines, -79 removed lines

@@ -31,9 +31,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,74 +47,74 @@ 
  */
 class MarginsLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		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;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
+
+        //$this->sharedFixture
+        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;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	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 __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -124,29 +124,29 @@ 
      */
     public function testGetMarginInfos()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$result=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
-		//var_dump($result);
-		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
-		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(25,$result[1]);
-		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(20,$result[2]);
-
-		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
-		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
-		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(12.5,$result[1]);
-		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(1/9*100,$result[2]);
-
-		return 0;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
+        //var_dump($result);
+        print __METHOD__." result[0]=".$result[0]."\n";
+        $this->assertEquals(8,$result[0]);
+        print __METHOD__." result[1]=".$result[1]."\n";
+        $this->assertEquals(25,$result[1]);
+        print __METHOD__." result[2]=".$result[2]."\n";
+        $this->assertEquals(20,$result[2]);
+
+        $result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
+        print __METHOD__." result[0]=".$result[0]."\n";
+        $this->assertEquals(8,$result[0]);
+        print __METHOD__." result[1]=".$result[1]."\n";
+        $this->assertEquals(12.5,$result[1]);
+        print __METHOD__." result[2]=".$result[2]."\n";
+        $this->assertEquals(1/9*100,$result[2]);
+
+        return 0;
     }
 }

Spacing +28 added lines, -28 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;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$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;
@@ -77,8 +77,8 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	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";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
     protected function setUp()
     {
-    	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";
     }
@@ -124,28 +124,28 @@ 
      */
     public function testGetMarginInfos()
     {
-    	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=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
+		$result = getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
 		//var_dump($result);
 		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
+		$this->assertEquals(8, $result[0]);
 		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(25,$result[1]);
+		$this->assertEquals(25, $result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(20,$result[2]);
+		$this->assertEquals(20, $result[2]);
 
-		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
+		$result = getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
 		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
+		$this->assertEquals(8, $result[0]);
 		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(12.5,$result[1]);
+		$this->assertEquals(12.5, $result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(1/9*100,$result[2]);
+		$this->assertEquals(1 / 9 * 100, $result[2]);
 
 		return 0;
     }