alxarafe / alixar

dolibarr/test/phpunit/BuildDocTest.php

Indentation +6 added lines, -6 removed lines

@@ -89,9 +89,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -235,10 +235,10 @@ 
     }
 
     /**
-    * testFactureFournisseurBuild
-    *
-    * @return int
-    */
+     * testFactureFournisseurBuild
+     *
+     * @return int
+     */
     public function testFactureFournisseurBuild()
     {
         global $conf,$user,$langs,$db;

Spacing +110 added lines, -110 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -64,7 +64,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -92,11 +92,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;
@@ -106,15 +106,15 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
-        if (! $conf->facture->enabled) { print __METHOD__." invoice module not enabled\n"; die(); }
-        if (! $conf->commande->enabled) { print __METHOD__." order module not enabled\n"; die(); }
-        if (! $conf->propal->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
-        if (! $conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); }
-        if (! $conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); }
-        if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
-        if (! $conf->expensereport->enabled) { print __METHOD__." expensereport module not enabled\n"; die(); }
+        if (!$conf->facture->enabled) { print __METHOD__." invoice module not enabled\n"; die(); }
+        if (!$conf->commande->enabled) { print __METHOD__." order module not enabled\n"; die(); }
+        if (!$conf->propal->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
+        if (!$conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); }
+        if (!$conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); }
+        if (!$conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
+        if (!$conf->expensereport->enabled) { print __METHOD__." expensereport module not enabled\n"; die(); }
 
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
@@ -124,7 +124,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -137,11 +137,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";
     }
@@ -162,71 +162,71 @@ 
      */
     public function testFactureBuild()
     {
-        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->facture->dir_output.='/temp';
+        $conf->facture->dir_output .= '/temp';
 
-        $localobjectcom=new Commande($this->savdb);
+        $localobjectcom = new Commande($this->savdb);
         $localobjectcom->initAsSpecimen();
 
-        $localobject=new Facture($this->savdb);
+        $localobject = new Facture($this->savdb);
         $localobject->createFromOrder($localobjectcom, $user);
-        $localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
+        $localobject->date_lim_reglement = dol_now() + 3600 * 24 * 30;
 
         // Crabe (english)
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $langs);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Crabe (japanese)
-        $newlangs1=new Translate("",$conf);
+        $newlangs1 = new Translate("", $conf);
         $newlangs1->setDefaultLang('ja_JP');
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Crabe (saudiarabia)
-        $newlangs2a=new Translate("",$conf);
+        $newlangs2a = new Translate("", $conf);
         $newlangs2a->setDefaultLang('sa_SA');
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Crabe (english_saudiarabia)
-        $newlangs2b=new Translate("",$conf);
+        $newlangs2b = new Translate("", $conf);
         $newlangs2b->setDefaultLang('en_SA');
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Crabe (greek)
-        $newlangs3=new Translate("",$conf);
+        $newlangs3 = new Translate("", $conf);
         $newlangs3->setDefaultLang('el_GR');
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Crabe (chinese)
-        $newlangs4=new Translate("",$conf);
+        $newlangs4 = new Translate("", $conf);
         $newlangs4->setDefaultLang('zh_CN');
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Crabe (russian)
-        $newlangs5=new Translate("",$conf);
+        $newlangs5 = new Translate("", $conf);
         $newlangs5->setDefaultLang('ru_RU');
-        $localobject->modelpdf='crabe';
+        $localobject->modelpdf = 'crabe';
         $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -241,18 +241,18 @@ 
     */
     public function testFactureFournisseurBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $conf->fournisseur->facture->dir_output.='/temp';
-        $localobject=new FactureFournisseur($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $conf->fournisseur->facture->dir_output .= '/temp';
+        $localobject = new FactureFournisseur($this->savdb);
         $localobject->initAsSpecimen();
 
         // Canelle
-        $localobject->modelpdf='canelle';
+        $localobject->modelpdf = 'canelle';
         $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
@@ -268,18 +268,18 @@ 
      */
     public function testCommandeBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $conf->commande->dir_output.='/temp';
-        $localobject=new Commande($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $conf->commande->dir_output .= '/temp';
+        $localobject = new Commande($this->savdb);
         $localobject->initAsSpecimen();
 
         // Einstein
-        $localobject->modelpdf='einstein';
+        $localobject->modelpdf = 'einstein';
         $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
@@ -296,19 +296,19 @@ 
      */
     public function testCommandeFournisseurBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $conf->fournisseur->commande->dir_output.='/temp';
-        $localobject=new CommandeFournisseur($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $conf->fournisseur->commande->dir_output .= '/temp';
+        $localobject = new CommandeFournisseur($this->savdb);
         $localobject->initAsSpecimen();
 
         // Muscadet
-        $localobject->modelpdf='muscadet';
-        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
+        $localobject->modelpdf = 'muscadet';
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -323,18 +323,18 @@ 
      */
     public function testPropalBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $conf->propal->dir_output.='/temp';
-        $localobject=new Propal($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $conf->propal->dir_output .= '/temp';
+        $localobject = new Propal($this->savdb);
         $localobject->initAsSpecimen();
 
         // Azur
-        $localobject->modelpdf='azur';
+        $localobject->modelpdf = 'azur';
         $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
@@ -350,17 +350,17 @@ 
      */
     public function testProjectBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-        $conf->projet->dir_output.='/temp';
-        $localobject=new Project($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+        $conf->projet->dir_output .= '/temp';
+        $localobject = new Project($this->savdb);
         $localobject->initAsSpecimen();
 
         // Baleine
-        $localobject->modelpdf='baleine';
+        $localobject->modelpdf = 'baleine';
         $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
@@ -376,19 +376,19 @@ 
      */
     public function testFichinterBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $conf->ficheinter->dir_output.='/temp';
-        $localobject=new Fichinter($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $conf->ficheinter->dir_output .= '/temp';
+        $localobject = new Fichinter($this->savdb);
         $localobject->initAsSpecimen();
 
         // Soleil
-        $localobject->modelpdf='soleil';
-        $result=fichinter_create($db, $localobject, $localobject->modelpdf, $langs);
+        $localobject->modelpdf = 'soleil';
+        $result = fichinter_create($db, $localobject, $localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -403,26 +403,26 @@ 
      */
     public function testExpeditionBuild()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $conf->expedition->dir_output.='/temp';
-        $localobject=new Expedition($this->savdb);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $conf->expedition->dir_output .= '/temp';
+        $localobject = new Expedition($this->savdb);
         $localobject->initAsSpecimen();
 
         // Merou
-        $localobject->modelpdf='merou';
-        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
+        $localobject->modelpdf = 'merou';
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Rouget
-        $localobject->modelpdf='rouget';
-        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
+        $localobject->modelpdf = 'rouget';
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";

dolibarr/test/phpunit/FichinterTest.php

Indentation +99 added lines, -99 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 FichinterTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ContratTest
-	 */
-	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 ContratTest
+     */
+    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;
+        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,20 +124,20 @@ 
      */
     public function testFichinterCreate()
     {
-    	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 Fichinter($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Fichinter($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -151,19 +151,19 @@ 
      */
     public function testFichinterFetch($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 Fichinter($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Fichinter($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
@@ -177,20 +177,20 @@ 
      */
     public function testFichinterValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->setValid($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->setValid($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
-   /**
+    /**
      * testFichinterValid
      *
      * @param	Object	$localobject	Object intervention
@@ -230,18 +230,18 @@ 
      */
     public function testFichinterDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Fichinter($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Fichinter($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +49 added lines, -49 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,15 +124,15 @@ 
      */
     public function testFichinterCreate()
     {
-    	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 Fichinter($this->savdb);
+		$localobject = new Fichinter($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -151,14 +151,14 @@ 
      */
     public function testFichinterFetch($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 Fichinter($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Fichinter($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -177,13 +177,13 @@ 
      */
     public function testFichinterValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-    	$result=$localobject->setValid($user);
+    	$result = $localobject->setValid($user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
     	$this->assertLessThan($result, 0);
@@ -201,11 +201,11 @@ 
      */
     public function testFichinterOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -230,15 +230,15 @@ 
      */
     public function testFichinterDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Fichinter($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 Fichinter($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/DiscountTest.php

Indentation +95 added lines, -95 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 DiscountTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DiscountTest
-	 */
-	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 DiscountTest
+     */
+    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;
-
-		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 testDiscountCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new DiscountAbsolute($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new DiscountAbsolute($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
@@ -151,18 +151,18 @@ 
      */
     public function testDiscountFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new DiscountAbsolute($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $id;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new DiscountAbsolute($this->savdb);
+        $result=$localobject->fetch($id);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $id;
     }
 
     /**
@@ -176,18 +176,18 @@ 
      */
     public function testDiscountDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new DiscountAbsolute($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new DiscountAbsolute($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +38 added lines, -38 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 testDiscountCreate()
     {
-    	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 DiscountAbsolute($this->savdb);
+		$localobject = new DiscountAbsolute($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
@@ -151,14 +151,14 @@ 
      */
     public function testDiscountFetch($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 DiscountAbsolute($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new DiscountAbsolute($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -176,15 +176,15 @@ 
      */
     public function testDiscountDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new DiscountAbsolute($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 DiscountAbsolute($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/UserTest.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;
@@ -284,19 +284,19 @@ 
      */
     public function testUserAddPermission($id)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject=new User($this->savdb);
-    	$result=$localobject->fetch(1);			// Other tests use the user id 1
-    	$result=$localobject->addrights(0, 'supplier_proposal');
-
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new User($this->savdb);
+        $result=$localobject->fetch(1);			// Other tests use the user id 1
+        $result=$localobject->addrights(0, 'supplier_proposal');
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
 

Spacing +77 added lines, -77 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,11 +76,11 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
-        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        if (!empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
     }
@@ -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,15 +127,15 @@ 
      */
     public function testUserCreate()
     {
-        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 User($this->savdb);
+        $localobject = new User($this->savdb);
         $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -152,14 +152,14 @@ 
      */
     public function testUserFetch($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 User($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new User($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -176,23 +176,23 @@ 
      */
     public function testUserUpdate($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;
 
         $this->changeProperties($localobject);
-        $result=$localobject->update($user);
+        $result = $localobject->update($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
         // Test everything are still same than specimen
-        $newlocalobject=new User($this->savdb);
+        $newlocalobject = new User($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id', 'socid', 'societe_id', 'ref', 'pass', 'pass_indatabase', 'pass_indatabase_crypted', 'datec', 'datem', 'datelastlogin', 'datepreviouslogin')), array()); // Actual, Expected
 
         return $localobject;
     }
@@ -207,13 +207,13 @@ 
      */
     public function testUserDisable($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->setstatus(0);
+        $result = $localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         $this->assertLessThan($result, 0);
@@ -231,11 +231,11 @@ 
      */
     public function testUserOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -259,15 +259,15 @@ 
      */
     public function testUserDelete($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 User($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($id);
+        $localobject = new User($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -284,15 +284,15 @@ 
      */
     public function testUserAddPermission($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 User($this->savdb);
-    	$result=$localobject->fetch(1);			// Other tests use the user id 1
-    	$result=$localobject->addrights(0, 'supplier_proposal');
+    	$localobject = new User($this->savdb);
+    	$result = $localobject->fetch(1); // Other tests use the user id 1
+    	$result = $localobject->addrights(0, 'supplier_proposal');
 
     	print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -309,7 +309,7 @@ 
      */
     public function changeProperties(&$localobject)
     {
-        $localobject->note='New note after update';
+        $localobject->note = 'New note after update';
     }
 
     /**
@@ -321,24 +321,24 @@ 
      * @param   array       $fieldstoignorearray    Array of fields to ignore in diff
      * @return  array                               Array with differences
      */
-    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
+    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
     {
-        $retAr=array();
+        $retAr = array();
 
         if (get_class($oA) !== get_class($oB)) {
-            $retAr[]="Supplied objects are not of same class.";
+            $retAr[] = "Supplied objects are not of same class.";
         } else {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey) {
-                if (in_array($sKey,$fieldstoignorearray))
+            $oVarsA = get_object_vars($oA);
+            $oVarsB = get_object_vars($oB);
+            $aKeys = array_keys($oVarsA);
+            foreach ($aKeys as $sKey) {
+                if (in_array($sKey, $fieldstoignorearray))
                     continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                if (!$ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
                 if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey]) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
             }
         }

Braces +3 added lines, -2 removed lines

@@ -332,8 +332,9 @@
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
             foreach($aKeys as $sKey) {
-                if (in_array($sKey,$fieldstoignorearray))
-                    continue;
+                if (in_array($sKey,$fieldstoignorearray)) {
+                                    continue;
+                }
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
                 }

dolibarr/test/phpunit/PdfDocTest.php

Indentation +87 added lines, -87 removed lines

@@ -34,9 +34,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;
 
@@ -50,74 +50,74 @@ 
  */
 class PdfDocTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return PdfDocTest
-	 */
-	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 PdfDocTest
+     */
+    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";
     }
 
     /**
@@ -127,48 +127,48 @@ 
      */
     public function testPdfDocGetLineDesc()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localproduct=new Product($this->savdb);
-		$localproduct->fetch(0,'PIDRESS');
-		$product_id=$localproduct->id;
-		if ($product_id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
-
-		$localobject=new Facture($this->savdb);
-		$localobject->initAsSpecimen();
-		$localobject->lines=array();
-		$localobject->lines[0]=new FactureLigne($this->savdb);
-		$localobject->lines[0]->fk_product=$product_id;
-		$localobject->lines[0]->label='Label 1';
-		$localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)";
-
-    	$result=pdf_getlinedesc($localobject,0,$langs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,"PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
-
-    	$result=doc_getlinedesc($localobject->lines[0],$langs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,"PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localproduct=new Product($this->savdb);
+        $localproduct->fetch(0,'PIDRESS');
+        $product_id=$localproduct->id;
+        if ($product_id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->lines=array();
+        $localobject->lines[0]=new FactureLigne($this->savdb);
+        $localobject->lines[0]->fk_product=$product_id;
+        $localobject->lines[0]->label='Label 1';
+        $localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)";
+
+        $result=pdf_getlinedesc($localobject,0,$langs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,"PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
+
+        $result=doc_getlinedesc($localobject->lines[0],$langs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,"PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
     }
 
     /**
-    * testPdfGetHeightForLogo
-    *
-    * @return void
-    */
+     * testPdfGetHeightForLogo
+     *
+     * @return void
+     */
     public function testPdfGetHeightForLogo()
     {
         $file=dirname(__FILE__).'/img250x50.jpg';
         $result=pdf_getHeightForLogo($file);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,22);
+        $this->assertEquals($result,22);
         $file=dirname(__FILE__).'/img250x20.png';
         $result=pdf_getHeightForLogo($file);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,10.4);
+        $this->assertEquals($result,10.4);
     }
 }

Spacing +40 added lines, -40 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';
@@ -38,7 +38,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -66,11 +66,11 @@ 
 		parent::__construct();
 
 		//$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;
@@ -80,8 +80,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";
     }
@@ -89,7 +89,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -102,11 +102,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,32 +127,32 @@ 
      */
     public function testPdfDocGetLineDesc()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localproduct=new Product($this->savdb);
-		$localproduct->fetch(0,'PIDRESS');
-		$product_id=$localproduct->id;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localproduct = new Product($this->savdb);
+		$localproduct->fetch(0, 'PIDRESS');
+		$product_id = $localproduct->id;
 		if ($product_id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
 
-		$localobject=new Facture($this->savdb);
+		$localobject = new Facture($this->savdb);
 		$localobject->initAsSpecimen();
-		$localobject->lines=array();
-		$localobject->lines[0]=new FactureLigne($this->savdb);
-		$localobject->lines[0]->fk_product=$product_id;
-		$localobject->lines[0]->label='Label 1';
-		$localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)";
+		$localobject->lines = array();
+		$localobject->lines[0] = new FactureLigne($this->savdb);
+		$localobject->lines[0]->fk_product = $product_id;
+		$localobject->lines[0]->label = 'Label 1';
+		$localobject->lines[0]->desc = "This is a description with a é accent\n(Country of origin: France)";
 
-    	$result=pdf_getlinedesc($localobject,0,$langs);
+    	$result = pdf_getlinedesc($localobject, 0, $langs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,"PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
+    	$this->assertEquals($result, "PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
 
-    	$result=doc_getlinedesc($localobject->lines[0],$langs);
+    	$result = doc_getlinedesc($localobject->lines[0], $langs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,"PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
+    	$this->assertEquals($result, "PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
     }
 
     /**
@@ -162,13 +162,13 @@ 
     */
     public function testPdfGetHeightForLogo()
     {
-        $file=dirname(__FILE__).'/img250x50.jpg';
-        $result=pdf_getHeightForLogo($file);
+        $file = dirname(__FILE__).'/img250x50.jpg';
+        $result = pdf_getHeightForLogo($file);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,22);
-        $file=dirname(__FILE__).'/img250x20.png';
-        $result=pdf_getHeightForLogo($file);
+    	$this->assertEquals($result, 22);
+        $file = dirname(__FILE__).'/img250x20.png';
+        $result = pdf_getHeightForLogo($file);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result,10.4);
+    	$this->assertEquals($result, 10.4);
     }
 }

dolibarr/test/phpunit/LoanTest.php

Indentation +98 added lines, -98 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 LoanTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return LoanTest
-	 */
-	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 LoanTest
+     */
+    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;
-
-		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 testLoanCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Loan($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
@@ -151,21 +151,21 @@ 
      */
     public function testLoanFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Loan($this->savdb);
+        $result=$localobject->fetch($id);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
-	/**
+    /**
      * testLoanOther
      *
      * @param	Loan	$localobject	Loan
@@ -184,8 +184,8 @@ 
 
         $result=$localobject->set_paid($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
         return $localobject->id;
     }
 
@@ -200,18 +200,18 @@ 
      */
     public function testLoanDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Loan($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

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';
@@ -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 testLoanCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Loan($this->savdb);
+		$localobject = new Loan($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
@@ -151,14 +151,14 @@ 
      */
     public function testLoanFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Loan($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Loan($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -176,13 +176,13 @@ 
      */
     public function testLoanOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->set_paid($user);
+        $result = $localobject->set_paid($user);
 
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -200,15 +200,15 @@ 
      */
     public function testLoanDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($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 Loan($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/AdherentTest.php

Indentation +12 added lines, -12 removed lines

@@ -61,9 +61,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -270,7 +270,7 @@ 
         $result=$localobject->update_note($localobject->note,'_private');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
-		$result=$localobject->update_note($localobject->note,'_public');
+        $result=$localobject->update_note($localobject->note,'_public');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -338,15 +338,15 @@ 
         return $localobject;
     }
 
-     /**
-     * testAdherentSetUserId
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentMakeSubstitution
-     * The depends says test is run only if previous is ok
-     */
+        /**
+         * testAdherentSetUserId
+         *
+         * @param   Adherent    $localobject    Member instance
+         * @return  Adherent
+         *
+         * @depends testAdherentMakeSubstitution
+         * The depends says test is run only if previous is ok
+         */
     public function testAdherentSetUserId(Adherent $localobject)
     {
         global $conf,$user,$langs,$db;

Spacing +126 added lines, -126 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -64,11 +64,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;
@@ -78,15 +78,15 @@ 
     // 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->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+        if (!empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }
-        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
-        if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
+        if (!empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        if (!empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
 
         print __METHOD__."\n";
     }
@@ -94,7 +94,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -107,11 +107,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";
     }
@@ -132,18 +132,18 @@ 
      */
     public function testAdherentTypeCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new AdherentType($this->savdb);
-        $localobject->statut=1;
-        $localobject->label='Adherent type test';
-        $localobject->subscription=1;
-        $localobject->vote=1;
-        $result=$localobject->create($user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject = new AdherentType($this->savdb);
+        $localobject->statut = 1;
+        $localobject->label = 'Adherent type test';
+        $localobject->subscription = 1;
+        $localobject->vote = 1;
+        $result = $localobject->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -161,16 +161,16 @@ 
      */
     public function testAdherentCreate($fk_adherent_type)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new Adherent($this->savdb);
+        $localobject = new Adherent($this->savdb);
         $localobject->initAsSpecimen();
-        $localobject->typeid=$fk_adherent_type;
-        $result=$localobject->create($user);
+        $localobject->typeid = $fk_adherent_type;
+        $result = $localobject->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -188,14 +188,14 @@ 
      */
     public function testAdherentFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Adherent($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 Adherent($this->savdb);
+        $result = $localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
         return $localobject;
@@ -212,11 +212,11 @@ 
      */
     public function testAdherentFetchLogin(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         $newobject = new Adherent($this->savdb);
         $result = $newobject->fetch_login($localobject->login);
@@ -237,45 +237,45 @@ 
      */
     public function testAdherentUpdate(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         $timestamp = dol_now();
 
         $localobject->civility_id = 0;
-        $localobject->login='newlogin';
-        $localobject->societe='New company';
-        $localobject->note='New note after update';
+        $localobject->login = 'newlogin';
+        $localobject->societe = 'New company';
+        $localobject->note = 'New note after update';
         //$localobject->note_public='New note public after update';
-        $localobject->lastname='New name';
-        $localobject->firstname='New firstname';
-        $localobject->gender='man';
-        $localobject->address='New address';
-        $localobject->zip='New zip';
-        $localobject->town='New town';
-        $localobject->country_id=2;
-        $localobject->statut=0;
-        $localobject->morphy=0;
-        $localobject->phone='New tel pro';
-        $localobject->phone_perso='New tel perso';
-        $localobject->phone_mobile='New tel mobile';
-        $localobject->email='newemail@newemail.com';
-        $localobject->birth=$timestamp;
-        $result=$localobject->update($user);
+        $localobject->lastname = 'New name';
+        $localobject->firstname = 'New firstname';
+        $localobject->gender = 'man';
+        $localobject->address = 'New address';
+        $localobject->zip = 'New zip';
+        $localobject->town = 'New town';
+        $localobject->country_id = 2;
+        $localobject->statut = 0;
+        $localobject->morphy = 0;
+        $localobject->phone = 'New tel pro';
+        $localobject->phone_perso = 'New tel perso';
+        $localobject->phone_mobile = 'New tel mobile';
+        $localobject->email = 'newemail@newemail.com';
+        $localobject->birth = $timestamp;
+        $result = $localobject->update($user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
-        $result=$localobject->update_note($localobject->note,'_private');
+        $result = $localobject->update_note($localobject->note, '_private');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
-		$result=$localobject->update_note($localobject->note,'_public');
+		$result = $localobject->update_note($localobject->note, '_public');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-        $newobject=new Adherent($this->savdb);
-        $result=$newobject->fetch($localobject->id);
+        $newobject = new Adherent($this->savdb);
+        $result = $newobject->fetch($localobject->id);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -315,20 +315,20 @@ 
      */
     public function testAdherentMakeSubstitution(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $conf->global->MAIN_FIRSTNAME_NAME_POSITION = 0;	// Force setup for firstname+lastname
+        $conf->global->MAIN_FIRSTNAME_NAME_POSITION = 0; // Force setup for firstname+lastname
 
         $template = '__CIVILITY__,__FIRSTNAME__,__LASTNAME__,__FULLNAME__,__COMPANY__,'.
                     '__ADDRESS__,__ZIP__,__TOWN__,__COUNTRY__,__EMAIL__,__BIRTH__,__PHOTO__,__LOGIN__';
 
         // If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
         $expected = ',New firstname,New name,New firstname New name,'.
-                    'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
+                    'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth, 'day').',,'.
                     'newlogin';
 
         $result = $localobject->makeSubstitution($template);
@@ -349,11 +349,11 @@ 
      */
     public function testAdherentSetUserId(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         //We associate member with user
         $result = $localobject->setUserId($user->id);
@@ -391,11 +391,11 @@ 
      */
     public function testAdherentSetThirdPartyId(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         //Create a Third Party
         $thirdparty = new Societe($db);
@@ -423,7 +423,7 @@ 
         $this->assertNull($localobject->fk_soc);
 
         //Now we remove the third party
-        $result = $thirdparty->delete($thirdparty->id,$user);
+        $result = $thirdparty->delete($thirdparty->id, $user);
         $this->assertEquals($result, 1);
 
         return $localobject;
@@ -440,13 +440,13 @@ 
      */
     public function testAdherentValidate(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->validate($user);
+        $result = $localobject->validate($user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -464,11 +464,11 @@ 
      */
     public function testAdherentOther(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -493,11 +493,11 @@ 
      */
     public function testAdherentResiliate(Adherent $localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         //Let's resilie un adherent
         $result = $localobject->resiliate($user);
@@ -530,13 +530,13 @@ 
      */
     public function testAdherentDelete($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->delete($localobject->id, $user);
+        $result = $localobject->delete($localobject->id, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -555,15 +555,15 @@ 
      */
     public function testAdherentTypeDelete($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobjectat=new AdherentType($this->savdb);
-        $result=$localobjectat->fetch($localobject->typeid);
-        $result=$localobjectat->delete();
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobjectat = new AdherentType($this->savdb);
+        $result = $localobjectat->fetch($localobject->typeid);
+        $result = $localobjectat->delete();
         print __METHOD__." result=".$result."\n";
         $this->assertLessThan($result, 0);
 

dolibarr/test/phpunit/CommandeTest.php

Indentation +14 added lines, -14 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;
@@ -178,18 +178,18 @@ 
      */
     public function testCommandeUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->note_private='New note private after update';
+        $result=$localobject->update($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**

Spacing +61 added lines, -61 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->commande->enabled)) { print __METHOD__." module customer order 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,15 +127,15 @@ 
      */
     public function testCommandeCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new Commande($this->savdb);
+        $localobject = new Commande($this->savdb);
         $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -153,14 +153,14 @@ 
      */
     public function testCommandeFetch($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 Commande($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Commande($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -178,14 +178,14 @@ 
      */
     public function testCommandeUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
+    	$localobject->note_private = 'New note private after update';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -203,13 +203,13 @@ 
      */
     public function testCommandeValid($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->valid($user);
+        $result = $localobject->valid($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -227,13 +227,13 @@ 
      */
     public function testCommandeCancel($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->cancel();
+        $result = $localobject->cancel();
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -251,11 +251,11 @@ 
      */
     public function testCommandeOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -280,15 +280,15 @@ 
      */
     public function testCommandeDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Commande($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 Commande($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/FactureTest.php

Indentation +15 added lines, -15 removed lines

@@ -60,9 +60,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -225,22 +225,22 @@ 
         unset($localobject->array_options['options_reseller']);
 
         $arraywithdiff = $this->objCompare(
-			$localobject,
-			$newlocalobject,
-			true,
-			array(
-				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
-				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
-				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
-				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'
-			)
-		);
+            $localobject,
+            $newlocalobject,
+            true,
+            array(
+                'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
+                'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
+                'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
+                'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'
+            )
+        );
         $this->assertEquals($arraywithdiff, array());    // Actual, Expected
 
         return $localobject;
     }
 
-   /**
+    /**
      * testFactureOther
      *
      * @param   Object $localobject Invoice
@@ -268,7 +268,7 @@ 
 
         $result=$localobject->demande_prelevement($user);
         print __METHOD__." result=".$result."\n";
-       	$this->assertLessThan($result, 0);
+            $this->assertLessThan($result, 0);
 
         return $localobject->id;
     }
@@ -302,7 +302,7 @@ 
         $result=$localobject2->initAsSpecimen();
         $result=$localobject2->create($user);
         $result=$localobject2->validate($user);
-		print 'Invoice $localobject ref = '.$localobject->ref."\n";
+        print 'Invoice $localobject ref = '.$localobject->ref."\n";
         print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
 
         $conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;

Spacing +80 added lines, -80 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -35,7 +35,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -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,10 +77,10 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
         if (empty($conf->facture->enabled)) { print __METHOD__." module customer invoice must be enabled.\n"; die(); }
-        if (! empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); }
+        if (!empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); }
 
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
@@ -90,7 +90,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -103,11 +103,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";
     }
@@ -129,15 +129,15 @@ 
      */
     public function testFactureCreate()
     {
-        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->initAsSpecimen();
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
         return $result;
@@ -154,14 +154,14 @@ 
      */
     public function testFactureFetch($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 Facture($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Facture($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -179,14 +179,14 @@ 
      */
     public function testFactureUpdate($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;
 
         $this->changeProperties($localobject);
-        $result=$localobject->update($user);
+        $result = $localobject->update($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -204,19 +204,19 @@ 
      */
     public function testFactureValid($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->validate($user);
+        $result = $localobject->validate($user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         $this->assertLessThan($result, 0);
 
         // Test everything are still same than specimen
-        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
 
@@ -229,13 +229,13 @@ 
 			$newlocalobject,
 			true,
 			array(
-				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
-				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
-				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
-				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'
+				'newref', 'oldref', 'id', 'lines', 'client', 'thirdparty', 'brouillon', 'user_author', 'date_creation', 'date_validation', 'datem', 'date_modification',
+				'ref', 'statut', 'paye', 'specimen', 'ref', 'actiontypecode', 'actionmsg2', 'actionmsg', 'mode_reglement', 'cond_reglement',
+				'cond_reglement_doc', 'situation_cycle_ref', 'situation_counter', 'situation_final', 'multicurrency_total_ht', 'multicurrency_total_tva',
+				'multicurrency_total_ttc', 'fk_multicurrency', 'multicurrency_code', 'multicurrency_tx'
 			)
 		);
-        $this->assertEquals($arraywithdiff, array());    // Actual, Expected
+        $this->assertEquals($arraywithdiff, array()); // Actual, Expected
 
         return $localobject;
     }
@@ -251,11 +251,11 @@ 
      */
     public function testFactureOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -266,7 +266,7 @@ 
         print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
         $this->assertNotEquals($localobject->date_creation, '');
 
-        $result=$localobject->demande_prelevement($user);
+        $result = $localobject->demande_prelevement($user);
         print __METHOD__." result=".$result."\n";
        	$this->assertLessThan($result, 0);
 
@@ -284,44 +284,44 @@ 
      */
     public function testFactureDelete($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;
 
         // Force default setup
         unset($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED);
         unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-        $localobject=new Facture($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Facture($this->savdb);
+        $result = $localobject->fetch($id);
 
         // Create another invoice and validate it after $localobject
-        $localobject2=new Facture($this->savdb);
-        $result=$localobject2->initAsSpecimen();
-        $result=$localobject2->create($user);
-        $result=$localobject2->validate($user);
+        $localobject2 = new Facture($this->savdb);
+        $result = $localobject2->initAsSpecimen();
+        $result = $localobject2->create($user);
+        $result = $localobject2->validate($user);
 		print 'Invoice $localobject ref = '.$localobject->ref."\n";
         print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
 
         $conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;
 
-        $result=$localobject2->delete($user);					// Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
+        $result = $localobject2->delete($user); // Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
         print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
         $this->assertEquals(0, $result, 'Deletion should fail, option INVOICE_CAN_NEVER_BE_REMOVED is on');
 
         unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+        $result = $localobject->delete($user); // Deletion is KO, it is not last invoice
         print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
         $this->assertEquals(0, $result, 'Deletion should fail, it is not last invoice');
 
-        $result=$localobject2->delete($user);					// Deletion is OK, it is last invoice
+        $result = $localobject2->delete($user); // Deletion is OK, it is last invoice
         print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
         $this->assertGreaterThan(0, $result, 'Deletion should work, it is last invoice');
 
-        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+        $result = $localobject->delete($user); // Deletion is KO, it is not last invoice
         print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
         $this->assertGreaterThan(0, $result, 'Deletion should work, it is again last invoice');
 
@@ -336,7 +336,7 @@ 
      */
     public function changeProperties(&$localobject)
     {
-        $localobject->note_private='New note';
+        $localobject->note_private = 'New note';
         //$localobject->note='New note after update';
     }
 
@@ -349,29 +349,29 @@ 
      * @param   array $fieldstoignorearray      Array of fields to ignore in diff
      * @return  array                           Array with differences
      */
-    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
+    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
     {
-        $retAr=array();
+        $retAr = array();
 
         if (get_class($oA) !== get_class($oB))
         {
-            $retAr[]="Supplied objects are not of same class.";
+            $retAr[] = "Supplied objects are not of same class.";
         }
         else
         {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            $oVarsA = get_object_vars($oA);
+            $oVarsB = get_object_vars($oB);
+            $aKeys = array_keys($oVarsA);
+            foreach ($aKeys as $sKey)
             {
-                if (in_array($sKey,$fieldstoignorearray)) continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
+                if (in_array($sKey, $fieldstoignorearray)) continue;
+                if (!$ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
                 {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
                 if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
                 {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
             }
         }

Braces +4 added lines, -3 removed lines

@@ -356,15 +356,16 @@
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
+        } else
         {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
             foreach($aKeys as $sKey)
             {
-                if (in_array($sKey,$fieldstoignorearray)) continue;
+                if (in_array($sKey,$fieldstoignorearray)) {
+                    continue;
+                }
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
                 {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);