alxarafe / alixar

dolibarr/test/phpunit/Functions2LibTest.php

Indentation +71 added lines, -71 removed lines

@@ -63,9 +63,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -95,11 +95,11 @@ 
         print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
         global $conf,$user,$langs,$db;
@@ -110,11 +110,11 @@ 
 
         print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
         print __METHOD__."\n";
@@ -149,62 +149,62 @@ 
      */
     public function testIsValidUrl()
     {
-	    //Simple check
-	    $result = isValidUrl('http://google.com');
-	    $this->assertEquals(1, $result);
+        //Simple check
+        $result = isValidUrl('http://google.com');
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
-	    $this->assertEquals(1, $result);
+        $result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
+        $this->assertEquals(1, $result);
 
-	    //With scheme check
-    	$result = isValidUrl('http://www.google.com', 1);
-	    $this->assertEquals(1, $result);
+        //With scheme check
+        $result = isValidUrl('http://www.google.com', 1);
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('ftp://www.google.com', 1);
-	    $this->assertEquals(0, $result);
+        $result = isValidUrl('ftp://www.google.com', 1);
+        $this->assertEquals(0, $result);
 
-	    //With password check invalid. This test should be ko but currently it is not
-	    //$result = isValidUrl('http://user:password@http://www.google.com', 1, 1);
-	    //$this->assertEquals(0, $result);
+        //With password check invalid. This test should be ko but currently it is not
+        //$result = isValidUrl('http://user:password@http://www.google.com', 1, 1);
+        //$this->assertEquals(0, $result);
 
-	    //With password check valid
-	    $result = isValidUrl('http://user:password@www.google.com', 1, 1);
-	    $this->assertEquals(1, $result);
+        //With password check valid
+        $result = isValidUrl('http://user:password@www.google.com', 1, 1);
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://www.google.com', 1, 1);
-	    $this->assertEquals(0, $result);
+        $result = isValidUrl('http://www.google.com', 1, 1);
+        $this->assertEquals(0, $result);
 
-	    //With port check
-	    $result = isValidUrl('http://google.com:8080', 0, 0, 1);
-	    $this->assertEquals(1, $result);
+        //With port check
+        $result = isValidUrl('http://google.com:8080', 0, 0, 1);
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com', 0, 0, 1);
-	    $this->assertEquals(0, $result);
+        $result = isValidUrl('http://google.com', 0, 0, 1);
+        $this->assertEquals(0, $result);
 
-	    //With path check
-	    $result = isValidUrl('http://google.com/search', 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+        //With path check
+        $result = isValidUrl('http://google.com/search', 0, 0, 0, 1);
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com', 0, 0, 0, 0);
-	    $this->assertEquals(1, $result);
+        $result = isValidUrl('http://google.com', 0, 0, 0, 0);
+        $this->assertEquals(1, $result);
 
-	    //With query check
-	    $result = isValidUrl('http://google.com/search?test=test', 0, 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+        //With query check
+        $result = isValidUrl('http://google.com/search?test=test', 0, 0, 0, 0, 1);
+        $this->assertEquals(1, $result);
 
-	    //With query check
-	    $result = isValidUrl('http://google.com?test=test', 0, 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+        //With query check
+        $result = isValidUrl('http://google.com?test=test', 0, 0, 0, 0, 1);
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com', 0, 0, 0, 0, 1);
-	    $this->assertEquals(0, $result);
+        $result = isValidUrl('http://google.com', 0, 0, 0, 0, 1);
+        $this->assertEquals(0, $result);
 
-	    //With anchor check
-	    $result = isValidUrl('http://google.com/search#done', 0, 0, 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+        //With anchor check
+        $result = isValidUrl('http://google.com/search#done', 0, 0, 0, 0, 0, 1);
+        $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com/search', 0, 0, 0, 0, 0, 1);
-	    $this->assertEquals(0, $result);
+        $result = isValidUrl('http://google.com/search', 0, 0, 0, 0, 0, 1);
+        $this->assertEquals(0, $result);
     }
 
     /**
@@ -214,33 +214,33 @@ 
      */
     public function testIsIP()
     {
-    	// Not valid
-    	$ip='a299.299.299.299';
-    	$result=is_ip($ip);
+        // Not valid
+        $ip='a299.299.299.299';
+        $result=is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(0,$result,$ip);
+        $this->assertEquals(0,$result,$ip);
 
-    	// Reserved IP range (not checked by is_ip function)
-    	$ip='169.254.0.0';
-    	$result=is_ip($ip);
+        // Reserved IP range (not checked by is_ip function)
+        $ip='169.254.0.0';
+        $result=is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	//$this->assertEquals(2,$result,$ip);      // Assertion disabled because returned value differs between PHP patch version
+        //$this->assertEquals(2,$result,$ip);      // Assertion disabled because returned value differs between PHP patch version
 
-    	$ip='1.2.3.4';
-    	$result=is_ip($ip);
+        $ip='1.2.3.4';
+        $result=is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(1,$result,$ip);
+        $this->assertEquals(1,$result,$ip);
 
-    	// Private IP ranges
-    	$ip='10.0.0.0';
-    	$result=is_ip($ip);
+        // Private IP ranges
+        $ip='10.0.0.0';
+        $result=is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2,$result,$ip);
+        $this->assertEquals(2,$result,$ip);
 
-    	$ip='172.16.0.0';
-    	$result=is_ip($ip);
+        $ip='172.16.0.0';
+        $result=is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2,$result,$ip);
+        $this->assertEquals(2,$result,$ip);
 
         $ip='192.168.0.0';
         $result=is_ip($ip);

Spacing +43 added lines, -43 removed lines

@@ -23,22 +23,22 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/functions2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 /**
@@ -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,7 +80,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -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";
     }
@@ -128,9 +128,9 @@ 
      */
     public function testJsUnEscape()
     {
-        $result=jsUnEscape('%u03BD%u03B5%u03BF');
+        $result = jsUnEscape('%u03BD%u03B5%u03BF');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('νεο',$result);
+        $this->assertEquals('νεο', $result);
     }
 
     /**
@@ -153,7 +153,7 @@ 
 	    $result = isValidUrl('http://google.com');
 	    $this->assertEquals(1, $result);
 
-	    $result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
+	    $result = isValidUrl('goo=gle'); // This is good, it might be an alias of hostname
 	    $this->assertEquals(1, $result);
 
 	    //With scheme check
@@ -215,36 +215,36 @@ 
     public function testIsIP()
     {
     	// Not valid
-    	$ip='a299.299.299.299';
-    	$result=is_ip($ip);
+    	$ip = 'a299.299.299.299';
+    	$result = is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(0,$result,$ip);
+    	$this->assertEquals(0, $result, $ip);
 
     	// Reserved IP range (not checked by is_ip function)
-    	$ip='169.254.0.0';
-    	$result=is_ip($ip);
+    	$ip = '169.254.0.0';
+    	$result = is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
     	//$this->assertEquals(2,$result,$ip);      // Assertion disabled because returned value differs between PHP patch version
 
-    	$ip='1.2.3.4';
-    	$result=is_ip($ip);
+    	$ip = '1.2.3.4';
+    	$result = is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(1,$result,$ip);
+    	$this->assertEquals(1, $result, $ip);
 
     	// Private IP ranges
-    	$ip='10.0.0.0';
-    	$result=is_ip($ip);
+    	$ip = '10.0.0.0';
+    	$result = is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2,$result,$ip);
+    	$this->assertEquals(2, $result, $ip);
 
-    	$ip='172.16.0.0';
-    	$result=is_ip($ip);
+    	$ip = '172.16.0.0';
+    	$result = is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2,$result,$ip);
+    	$this->assertEquals(2, $result, $ip);
 
-        $ip='192.168.0.0';
-        $result=is_ip($ip);
+        $ip = '192.168.0.0';
+        $result = is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-        $this->assertEquals(2,$result,$ip);
+        $this->assertEquals(2, $result, $ip);
     }
 }

Braces +33 added lines, -10 removed lines

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

dolibarr/test/phpunit/CommandeFournisseurTest.php

Spacing +117 added lines, -117 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;
 
 
 
@@ -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,7 +78,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -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";
@@ -126,67 +126,67 @@ 
      */
     public function testCommandeFournisseurCreate()
     {
-        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;
 
         // Set supplier and product to use
-        $socid=1;
-        $societe=new Societe($db);
+        $socid = 1;
+        $societe = new Societe($db);
         $societe->fetch($socid);
-        $product=new ProductFournisseur($db);
-        $product->fetch(0,'PIDRESS');
+        $product = new ProductFournisseur($db);
+        $product->fetch(0, 'PIDRESS');
         if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
 
-        $quantity=10;
-        $ref_fourn='SUPPLIER_REF_PHPUNIT';
-        $tva_tx=19.6;
+        $quantity = 10;
+        $ref_fourn = 'SUPPLIER_REF_PHPUNIT';
+        $tva_tx = 19.6;
 
         // Delete existing supplier prices
         // TODO
 
         // Create 1 supplier price with min qty = 10;
-        $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
+        $result = $product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity); // This insert record with no value for price. Values are update later with update_buyprice
         $this->assertGreaterThanOrEqual(1, $result);
-        $result=$product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
+        $result = $product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
         $this->assertGreaterThanOrEqual(0, $result);
 
         // Create supplier order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
         $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 1;
 
-        $localobject=new CommandeFournisseur($db);
+        $localobject = new CommandeFournisseur($db);
         $localobject->initAsSpecimen();
-        $localobject->lines=array();    // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line with qty too low";
-        $line->qty=1;                   // So lower than $quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject->lines[]=$line;
-
-        $result=$localobject->create($user);
+        $localobject->lines = array(); // Overwrite lines of order
+        $line = new CommandeFournisseurLigne($db);
+        $line->desc = $langs->trans("Description")." specimen line with qty too low";
+        $line->qty = 1; // So lower than $quantity
+        $line->subprice = 100;
+        $line->fk_product = $product->id;
+        $line->ref_fourn = $ref_fourn;
+        $localobject->lines[] = $line;
+
+        $result = $localobject->create($user);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-1, $result, 'Creation of too low quantity');   // must be -1 because quantity is lower than minimum of supplier price
+        $this->assertEquals(-1, $result, 'Creation of too low quantity'); // must be -1 because quantity is lower than minimum of supplier price
 
-        $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
         $db->query($sql);
 
         // Create supplier order
-        $localobject2=new CommandeFournisseur($db);
-        $localobject2->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-        $localobject2->lines=array();       // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line ok";
-        $line->qty=10;                      // So enough quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject2->lines[]=$line;
-
-        $result=$localobject2->create($user);
+        $localobject2 = new CommandeFournisseur($db);
+        $localobject2->initAsSpecimen(); // This create 5 lines of first product found for socid 1
+        $localobject2->lines = array(); // Overwrite lines of order
+        $line = new CommandeFournisseurLigne($db);
+        $line->desc = $langs->trans("Description")." specimen line ok";
+        $line->qty = 10; // So enough quantity
+        $line->subprice = 100;
+        $line->fk_product = $product->id;
+        $line->ref_fourn = $ref_fourn;
+        $localobject2->lines[] = $line;
+
+        $result = $localobject2->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertGreaterThan(0, $result);
 
@@ -194,37 +194,37 @@ 
         // Create supplier order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
         $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 0;
 
-        $localobject3=new CommandeFournisseur($db);
+        $localobject3 = new CommandeFournisseur($db);
         $localobject3->initAsSpecimen();
-        $localobject3->lines=array();    // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line with qty too low";
-        $line->qty=1;                   // So lower than $quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject3->lines[]=$line;
-
-        $result=$localobject3->create($user);
+        $localobject3->lines = array(); // Overwrite lines of order
+        $line = new CommandeFournisseurLigne($db);
+        $line->desc = $langs->trans("Description")." specimen line with qty too low";
+        $line->qty = 1; // So lower than $quantity
+        $line->subprice = 100;
+        $line->fk_product = $product->id;
+        $line->ref_fourn = $ref_fourn;
+        $localobject3->lines[] = $line;
+
+        $result = $localobject3->create($user);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok');   // must be id of line because there is no test on minimum quantity
+        $this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok'); // must be id of line because there is no test on minimum quantity
 
-        $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
         $db->query($sql);
 
         // Create supplier order
-        $localobject4=new CommandeFournisseur($db);
-        $localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-        $localobject4->lines=array();       // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line ok";
-        $line->qty=10;                      // So enough quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject4->lines[]=$line;
-
-        $result=$localobject4->create($user);
+        $localobject4 = new CommandeFournisseur($db);
+        $localobject4->initAsSpecimen(); // This create 5 lines of first product found for socid 1
+        $localobject4->lines = array(); // Overwrite lines of order
+        $line = new CommandeFournisseurLigne($db);
+        $line->desc = $langs->trans("Description")." specimen line ok";
+        $line->qty = 10; // So enough quantity
+        $line->subprice = 100;
+        $line->fk_product = $product->id;
+        $line->ref_fourn = $ref_fourn;
+        $localobject4->lines[] = $line;
+
+        $result = $localobject4->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertGreaterThan(0, $result);
 
@@ -244,14 +244,14 @@ 
      */
     public function testCommandeFournisseurFetch($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 CommandeFournisseur($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new CommandeFournisseur($this->savdb);
+        $result = $localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0, 'Failed to fetch supplier order with id '.$id);
@@ -269,13 +269,13 @@ 
      */
     public function testCommandeFournisseurValid($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);
@@ -293,13 +293,13 @@ 
      */
     public function testCommandeFournisseurApprove($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->approve($user);
+        $result = $localobject->approve($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -317,13 +317,13 @@ 
      */
     public function testCommandeFournisseurCancel($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($user);
+        $result = $localobject->cancel($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -341,11 +341,11 @@ 
      */
     public function testCommandeFournisseurOther($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";
@@ -371,15 +371,15 @@ 
      */
     public function testCommandeFournisseurDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new CommandeFournisseur($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 CommandeFournisseur($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

Indentation +2 added lines, -2 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;

dolibarr/test/phpunit/SecurityTest.php

Indentation +68 added lines, -68 removed lines

@@ -59,75 +59,75 @@ 
  */
 class SecurityTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return SecurityTest
-	 */
-	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 SecurityTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -137,16 +137,16 @@ 
      */
     public function testGETPOST()
     {
-    	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;
 
         $_COOKIE["id"]=111;
-		$_GET["param1"]="222";
+        $_GET["param1"]="222";
         $_POST["param1"]="333";
-		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
+        $_GET["param2"]='a/b#e(pr)qq-rr\cc';
         $_GET["param3"]='"a/b#e(pr)qq-rr\cc';    // Same than param2 + "
         $_GET["param4"]='../dir';
         $_GET["param5"]="a_1-b";
@@ -288,16 +288,16 @@ 
      */
     public function testRestrictedArea()
     {
-    	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;
 
-		//$dummyuser=new User($db);
-		//$result=restrictedArea($dummyuser,'societe');
+        //$dummyuser=new User($db);
+        //$result=restrictedArea($dummyuser,'societe');
 
-		$result=restrictedArea($user,'societe');
-		$this->assertEquals(1,$result);
+        $result=restrictedArea($user,'societe');
+        $this->assertEquals(1,$result);
     }
 }

Spacing +90 added lines, -90 removed lines

@@ -23,23 +23,23 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 if (empty($user->id))
 {
@@ -47,7 +47,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -75,11 +75,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;
@@ -89,8 +89,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";
     }
@@ -98,7 +98,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -111,11 +111,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";
     }
@@ -137,66 +137,66 @@ 
      */
     public function testGETPOST()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-        $_COOKIE["id"]=111;
-		$_GET["param1"]="222";
-        $_POST["param1"]="333";
-		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
-        $_GET["param3"]='"a/b#e(pr)qq-rr\cc';    // Same than param2 + "
-        $_GET["param4"]='../dir';
-        $_GET["param5"]="a_1-b";
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+        $_COOKIE["id"] = 111;
+		$_GET["param1"] = "222";
+        $_POST["param1"] = "333";
+		$_GET["param2"] = 'a/b#e(pr)qq-rr\cc';
+        $_GET["param3"] = '"a/b#e(pr)qq-rr\cc'; // Same than param2 + "
+        $_GET["param4"] = '../dir';
+        $_GET["param5"] = "a_1-b";
 
         // Test int
-        $result=GETPOST('id','int');              // Must return nothing
+        $result = GETPOST('id', 'int'); // Must return nothing
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'');
+        $this->assertEquals($result, '');
 
-        $result=GETPOST("param1",'int');
+        $result = GETPOST("param1", 'int');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,222);
+        $this->assertEquals($result, 222);
 
-        $result=GETPOST("param1",'int',2);
+        $result = GETPOST("param1", 'int', 2);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,333);
+        $this->assertEquals($result, 333);
 
         // Test alpha
-        $result=GETPOST("param2",'alpha');
+        $result = GETPOST("param2", 'alpha');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,$_GET["param2"]);
+        $this->assertEquals($result, $_GET["param2"]);
 
-        $result=GETPOST("param3",'alpha');  // Must return '' as there is a forbidden char "
+        $result = GETPOST("param3", 'alpha'); // Must return '' as there is a forbidden char "
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'');
+        $this->assertEquals($result, '');
 
-        $result=GETPOST("param4",'alpha');  // Must return '' as there is a forbidden char ../
+        $result = GETPOST("param4", 'alpha'); // Must return '' as there is a forbidden char ../
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'');
+        $this->assertEquals($result, '');
 
         // Test aZ09
-        $result=GETPOST("param1",'aZ09');  // Must return '' as there is a forbidden char ../
+        $result = GETPOST("param1", 'aZ09'); // Must return '' as there is a forbidden char ../
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,$_GET["param1"]);
+        $this->assertEquals($result, $_GET["param1"]);
 
-        $result=GETPOST("param2",'aZ09');  // Must return '' as there is a forbidden char ../
+        $result = GETPOST("param2", 'aZ09'); // Must return '' as there is a forbidden char ../
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'');
+        $this->assertEquals($result, '');
 
-        $result=GETPOST("param3",'aZ09');  // Must return '' as there is a forbidden char ../
+        $result = GETPOST("param3", 'aZ09'); // Must return '' as there is a forbidden char ../
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'');
+        $this->assertEquals($result, '');
 
-        $result=GETPOST("param4",'aZ09');  // Must return '' as there is a forbidden char ../
+        $result = GETPOST("param4", 'aZ09'); // Must return '' as there is a forbidden char ../
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'');
+        $this->assertEquals($result, '');
 
-        $result=GETPOST("param5",'aZ09');
+        $result = GETPOST("param5", 'aZ09');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,$_GET["param5"]);
+        $this->assertEquals($result, $_GET["param5"]);
 
         return $result;
     }
@@ -208,25 +208,25 @@ 
      */
     public function testCheckLoginPassEntity()
     {
-        $login=checkLoginPassEntity('loginbidon','passwordbidon',1,array('dolibarr'));
+        $login = checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login,'');
+        $this->assertEquals($login, '');
 
-        $login=checkLoginPassEntity('admin','passwordbidon',1,array('dolibarr'));
+        $login = checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login,'');
+        $this->assertEquals($login, '');
 
-        $login=checkLoginPassEntity('admin','admin',1,array('dolibarr'));            // Should works because admin/admin exists
+        $login = checkLoginPassEntity('admin', 'admin', 1, array('dolibarr')); // Should works because admin/admin exists
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login,'admin');
+        $this->assertEquals($login, 'admin');
 
-        $login=checkLoginPassEntity('admin','admin',1,array('http','dolibarr'));    // Should work because of second authetntication method
+        $login = checkLoginPassEntity('admin', 'admin', 1, array('http', 'dolibarr')); // Should work because of second authetntication method
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login,'admin');
+        $this->assertEquals($login, 'admin');
 
-        $login=checkLoginPassEntity('admin','admin',1,array('forceuser'));
+        $login = checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
         print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login,'');    // Expected '' because should failed because login 'auto' does not exists
+        $this->assertEquals($login, ''); // Expected '' because should failed because login 'auto' does not exists
     }
 
     /**
@@ -236,17 +236,17 @@ 
      */
     public function testEncodeDecode()
     {
-        $stringtotest="This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
+        $stringtotest = "This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
 
-        $encodedstring=dol_encode($stringtotest);
-        $decodedstring=dol_decode($encodedstring);
+        $encodedstring = dol_encode($stringtotest);
+        $decodedstring = dol_decode($encodedstring);
         print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
-        $this->assertEquals($stringtotest,$decodedstring, 'Use dol_encode/decode with no parameter');
+        $this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with no parameter');
 
-        $encodedstring=dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-        $decodedstring=dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+        $encodedstring = dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+        $decodedstring = dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
         print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
-        $this->assertEquals($stringtotest,$decodedstring, 'Use dol_encode/decode with a key parameter');
+        $this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with a key parameter');
 
         return 0;
     }
@@ -260,21 +260,21 @@ 
     {
         global $conf;
 
-        $genpass1=getRandomPassword(true);				// Should be a string return by dol_hash (if no option set, will be md5)
+        $genpass1 = getRandomPassword(true); // Should be a string return by dol_hash (if no option set, will be md5)
         print __METHOD__." genpass1=".$genpass1."\n";
         $this->assertEquals(strlen($genpass1), 32);
 
-        $genpass1=getRandomPassword(true, array('I'));	// Should be a string return by dol_hash (if no option set, will be md5)
+        $genpass1 = getRandomPassword(true, array('I')); // Should be a string return by dol_hash (if no option set, will be md5)
         print __METHOD__." genpass1=".$genpass1."\n";
         $this->assertEquals(strlen($genpass1), 32);
 
-        $conf->global->USER_PASSWORD_GENERATED='None';
-        $genpass2=getRandomPassword(false);				// Should return an empty string
+        $conf->global->USER_PASSWORD_GENERATED = 'None';
+        $genpass2 = getRandomPassword(false); // Should return an empty string
         print __METHOD__." genpass2=".$genpass2."\n";
         $this->assertEquals($genpass2, '');
 
-        $conf->global->USER_PASSWORD_GENERATED='Standard';
-        $genpass3=getRandomPassword(false);				// Should return a password of 8 chars
+        $conf->global->USER_PASSWORD_GENERATED = 'Standard';
+        $genpass3 = getRandomPassword(false); // Should return a password of 8 chars
         print __METHOD__." genpass3=".$genpass3."\n";
         $this->assertEquals(strlen($genpass3), 8);
 
@@ -288,16 +288,16 @@ 
      */
     public function testRestrictedArea()
     {
-    	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;
 
 		//$dummyuser=new User($db);
 		//$result=restrictedArea($dummyuser,'societe');
 
-		$result=restrictedArea($user,'societe');
-		$this->assertEquals(1,$result);
+		$result = restrictedArea($user, 'societe');
+		$this->assertEquals(1, $result);
     }
 }

Braces +33 added lines, -10 removed lines

@@ -30,16 +30,39 @@
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER','1');
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 if (empty($user->id))
 {

dolibarr/test/phpunit/WebservicesOrdersTest.php

Spacing +31 added lines, -31 removed lines

@@ -23,12 +23,12 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 
 
 if (empty($user->id)) {
@@ -36,9 +36,9 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -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";
     }
@@ -129,26 +129,26 @@ 
      */
     public function testWSOrderGetOrder()
     {
-        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;
 
         $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
         $WS_METHOD  = 'getOrder';
-        $ns='http://www.dolibarr.org/ns/';
+        $ns = 'http://www.dolibarr.org/ns/';
 
         // Set the WebService URL
         print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
         $soapclient = new nusoap_client($WS_DOL_URL);
         if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->soap_defencoding = 'UTF-8';
             $soapclient->decodeUTF8(false);
         }
 
         // Call the WebService method and store its result in $result.
-        $authentication=array(
+        $authentication = array(
             'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
             'sourceapplication'=>'DEMO',
             'login'=>'admin',
@@ -157,15 +157,15 @@ 
         );
 
         // Test URL
-        $parameters = array('authentication'=>$authentication,'id'=>1);
+        $parameters = array('authentication'=>$authentication, 'id'=>1);
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
-            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-        } catch(SoapFault $exception) {
+            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+        } catch (SoapFault $exception) {
             echo $exception;
-            $result=0;
+            $result = 0;
         }
-        if (! $result || ! empty($result['faultstring'])) {
+        if (!$result || !empty($result['faultstring'])) {
             //var_dump($soapclient);
             print $soapclient->error_str;
             print "\n<br>\n";
@@ -176,7 +176,7 @@ 
         }
 
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result;
     }

Indentation +2 added lines, -2 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;

dolibarr/test/phpunit/ContratTest.php

Indentation +90 added lines, -90 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 ContratTest 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 testContratCreate()
     {
-    	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 Contrat($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Contrat($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,22 +151,22 @@ 
      */
     public function testContratFetch($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 Contrat($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Contrat($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;
     }
 
-   /**
+    /**
      * testContratOther
      *
      * @param	Object	$localobject	Object contract
@@ -206,18 +206,18 @@ 
      */
     public function testContratDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Contrat($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 Contrat($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +43 added lines, -43 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 testContratCreate()
     {
-    	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 Contrat($this->savdb);
+		$localobject = new Contrat($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 testContratFetch($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 Contrat($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Contrat($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -177,11 +177,11 @@ 
      */
     public function testContratOther($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";
@@ -206,15 +206,15 @@ 
      */
     public function testContratDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Contrat($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 Contrat($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/WebservicesOtherTest.php

Spacing +38 added lines, -38 removed lines

@@ -23,12 +23,12 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 
 
 if (empty($user->id)) {
@@ -36,9 +36,9 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -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,7 +80,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -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";
     }
@@ -129,26 +129,26 @@ 
      */
     public function testWSOtherGetVersions()
     {
-        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;
 
         $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
         $WS_METHOD  = 'getVersions';
-        $ns='http://www.dolibarr.org/ns/';
+        $ns = 'http://www.dolibarr.org/ns/';
 
         // Set the WebService URL
         print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
         $soapclient = new nusoap_client($WS_DOL_URL);
         if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->soap_defencoding = 'UTF-8';
             $soapclient->decodeUTF8(false);
         }
 
         // Call the WebService method and store its result in $result.
-        $authentication=array(
+        $authentication = array(
             'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
             'sourceapplication'=>'DEMO',
             'login'=>'admin',
@@ -157,20 +157,20 @@ 
         );
 
         // Test URL
-        $result='';
+        $result = '';
         $parameters = array('authentication'=>$authentication);
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
-            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-        } catch(SoapFault $exception) {
+            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+        } catch (SoapFault $exception) {
             echo $exception;
-            $result=0;
+            $result = 0;
         }
-        if (! empty($result['faultstring'])) {
+        if (!empty($result['faultstring'])) {
             print $result['faultstring']."\n";
-            $result=0;
+            $result = 0;
         }
-        if (! $result) {
+        if (!$result) {
             //var_dump($soapclient);
             print $soapclient->error_str;
             print "\n<br>\n";
@@ -181,20 +181,20 @@ 
         }
 
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('OK', $result['result']['result_code']);
 
         // Test method that does not exists
-        $WS_METHOD='methodthatdoesnotexists';
-        $result='';
+        $WS_METHOD = 'methodthatdoesnotexists';
+        $result = '';
         $parameters = array('authentication'=>$authentication);
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
-            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-        } catch(SoapFault $exception) {
+            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+        } catch (SoapFault $exception) {
             echo $exception;
-            $result=0;
+            $result = 0;
         }
-        if (! $result || ! empty($result['faultstring'])) {
+        if (!$result || !empty($result['faultstring'])) {
             //var_dump($soapclient);
             print $soapclient->error_str;
             print "\n<br>\n";

Indentation +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -95,7 +95,7 @@ 
      * Init phpunit tests
      *
      * @return  void
-    */
+     */
     protected function setUp()
     {
         global $conf,$user,$langs,$db;

dolibarr/test/phpunit/CoreTest.php

Indentation +70 added lines, -70 removed lines

@@ -62,9 +62,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -98,7 +98,7 @@ 
      * Init phpunit tests
      *
      * @return  void
-    */
+     */
     protected function setUp()
     {
         global $conf,$user,$langs,$db;
@@ -221,9 +221,9 @@ 
 
         if ($testtodo != 0)
         {
-        	print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n";
-        	print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
-        	$this->assertEquals($expectedresult, DOL_URL_ROOT);
+            print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n";
+            print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
+            $this->assertEquals($expectedresult, DOL_URL_ROOT);
         }
 
         return true;
@@ -263,44 +263,44 @@ 
         function testSqlAndScriptInject($val, $type)
         {
             // phpcs:enable
-		    $inj = 0;
-		    // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
-		    if ($type != 2)
-		    {
-		        $inj += preg_match('/delete\s+from/i', $val);
-		        $inj += preg_match('/create\s+table/i', $val);
-		        $inj += preg_match('/update.+set.+=/i', $val);
-		        $inj += preg_match('/insert\s+into/i', $val);
-		        $inj += preg_match('/select.+from/i', $val);
-		        $inj += preg_match('/union.+select/i', $val);
-		        $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-		        $inj += preg_match('/(\.\.%2f)+/i', $val);
-		    }
-		    // For XSS Injection done by adding javascript with script
-		    // This is all cases a browser consider text is javascript:
-		    // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
-		    // All examples on page: http://ha.ckers.org/xss.html#XSScalc
-		    // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-		    $inj += preg_match('/<script/i', $val);
-		    $inj += preg_match('/<iframe/i', $val);
-			$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-		    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
-		    $inj += preg_match('/base[\s]+href/si', $val);
-		    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-		    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-		    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-		    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-		    //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-			$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-			//if ($type == 1)
-		    //{
-				$inj += preg_match('/javascript:/i', $val);
-		        $inj += preg_match('/vbscript:/i', $val);
-		    //}
-		    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-		    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-		    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
-		    return $inj;
+            $inj = 0;
+            // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
+            if ($type != 2)
+            {
+                $inj += preg_match('/delete\s+from/i', $val);
+                $inj += preg_match('/create\s+table/i', $val);
+                $inj += preg_match('/update.+set.+=/i', $val);
+                $inj += preg_match('/insert\s+into/i', $val);
+                $inj += preg_match('/select.+from/i', $val);
+                $inj += preg_match('/union.+select/i', $val);
+                $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
+                $inj += preg_match('/(\.\.%2f)+/i', $val);
+            }
+            // For XSS Injection done by adding javascript with script
+            // This is all cases a browser consider text is javascript:
+            // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
+            // All examples on page: http://ha.ckers.org/xss.html#XSScalc
+            // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
+            $inj += preg_match('/<script/i', $val);
+            $inj += preg_match('/<iframe/i', $val);
+            $inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
+            if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+            $inj += preg_match('/base[\s]+href/si', $val);
+            $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+            $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+            $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+            $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+            //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
+            $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+            //if ($type == 1)
+            //{
+                $inj += preg_match('/javascript:/i', $val);
+                $inj += preg_match('/vbscript:/i', $val);
+            //}
+            // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
+            if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
+            if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+            return $inj;
         }
 
         // Run tests
@@ -340,12 +340,12 @@ 
         $test='<IMG SRC=/ onerror="alert(1)">';
         $result=testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
-		$test='<IMG SRC=" &#14;  javascript:alert(1);">';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
+        $test='<IMG SRC=" &#14;  javascript:alert(1);">';
+        $result=testSqlAndScriptInject($test, 0);
+        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
 
-		$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
-		$result=testSqlAndScriptInject($test, 0);
+        $test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
+        $result=testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
 
         $test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
@@ -375,26 +375,26 @@ 
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
 
         $test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some brwoser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
-		$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
-
-		$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
-		$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
-
-		// This case seems to be filtered by browsers now.
-		$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
-		//$result=testSqlAndScriptInject($test, 0);
-		//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
-
-		$test='<iframe src=http://xss.rocks/scriptlet.html <';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
-
-		$test='Set.constructor`alert\x281\x29```';
-		$result=testSqlAndScriptInject($test, 0);
-		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
+        $test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
+
+        $test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
+        $result=testSqlAndScriptInject($test, 0);
+        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
+        $test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
+        $result=testSqlAndScriptInject($test, 0);
+        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
+
+        // This case seems to be filtered by browsers now.
+        $test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
+        //$result=testSqlAndScriptInject($test, 0);
+        //$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
+
+        $test='<iframe src=http://xss.rocks/scriptlet.html <';
+        $result=testSqlAndScriptInject($test, 0);
+        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
+
+        $test='Set.constructor`alert\x281\x29```';
+        $result=testSqlAndScriptInject($test, 0);
+        $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
     }
 }

Spacing +104 added lines, -104 removed lines

@@ -23,21 +23,21 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 //require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 /**
@@ -65,11 +65,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         //print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -79,7 +79,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -88,7 +88,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->rollback();
 
         print __METHOD__."\n";
@@ -101,11 +101,11 @@ 
     */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -139,7 +139,7 @@ 
         global $dolibarr_main_db_type;
         global $dolibarr_main_db_prefix;
 
-        $testtodo=0;
+        $testtodo = 0;
 
         // Case 1:
         // Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www
@@ -148,12 +148,12 @@ 
         // - Create link from htdocs to /var/www/dolibarrnew
         // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew';
         if ($testtodo == 1) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhost';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www';
-            $_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
-            $expectedresult='/dolibarrnew';
+            $_SERVER["HTTPS"] = '';
+            $_SERVER["SERVER_NAME"] = 'localhost';
+            $_SERVER["SERVER_PORT"] = '80';
+            $_SERVER["DOCUMENT_ROOT"] = '/var/www';
+            $_SERVER["SCRIPT_NAME"] = '/dolibarrnew/admin/system/phpinfo.php';
+            $expectedresult = '/dolibarrnew';
         }
 
         // Case 2:
@@ -163,12 +163,12 @@ 
         // - Create link from dolibarr to /var/www/aaa
         // - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs';
         if ($testtodo == 2) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhost';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www';
-            $_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
-            $expectedresult='/aaa/htdocs';
+            $_SERVER["HTTPS"] = '';
+            $_SERVER["SERVER_NAME"] = 'localhost';
+            $_SERVER["SERVER_PORT"] = '80';
+            $_SERVER["DOCUMENT_ROOT"] = '/var/www';
+            $_SERVER["SCRIPT_NAME"] = '/aaa/htdocs/admin/system/phpinfo.php';
+            $expectedresult = '/aaa/htdocs';
         }
 
         // Case 3:
@@ -179,12 +179,12 @@ 
         // - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs
         // - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs';
         if ($testtodo == 3) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs';
-            $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-            $expectedresult='';
+            $_SERVER["HTTPS"] = '';
+            $_SERVER["SERVER_NAME"] = 'localhostdolibarrnew';
+            $_SERVER["SERVER_PORT"] = '80';
+            $_SERVER["DOCUMENT_ROOT"] = '/home/ldestailleur/git/dolibarr/htdocs';
+            $_SERVER["SCRIPT_NAME"] = '/admin/system/phpinfo.php';
+            $expectedresult = '';
         }
 
         // Case 4:
@@ -192,12 +192,12 @@ 
         // a symbolic link
         // URL: http://localhostdolibarrnew/admin/system/phpinfo.php
         if ($testtodo == 4) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr';	// This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
-            $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-            $expectedresult='';
+            $_SERVER["HTTPS"] = '';
+            $_SERVER["SERVER_NAME"] = 'localhostdolibarrnew';
+            $_SERVER["SERVER_PORT"] = '80';
+            $_SERVER["DOCUMENT_ROOT"] = '/var/www/dolibarr'; // This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
+            $_SERVER["SCRIPT_NAME"] = '/admin/system/phpinfo.php';
+            $expectedresult = '';
         }
 
         // Case 5:
@@ -208,12 +208,12 @@ 
         // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
         // - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias';  (because autodetect will fails in this case)
         if ($testtodo == 5) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhost';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www';
-            $_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php';
-            $expectedresult='/dolibarralias';
+            $_SERVER["HTTPS"] = '';
+            $_SERVER["SERVER_NAME"] = 'localhost';
+            $_SERVER["SERVER_PORT"] = '80';
+            $_SERVER["DOCUMENT_ROOT"] = '/var/www';
+            $_SERVER["SCRIPT_NAME"] = '/dolibarralias/admin/system/phpinfo.php';
+            $expectedresult = '/dolibarralias';
         }
 
         // Force to rerun filefunc.inc.php
@@ -283,23 +283,23 @@ 
 		    // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 		    $inj += preg_match('/<script/i', $val);
 		    $inj += preg_match('/<iframe/i', $val);
-			$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-		    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+			$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
+		    if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 		    $inj += preg_match('/base[\s]+href/si', $val);
-		    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-		    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-		    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-		    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+		    $inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+		    $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+		    $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+		    $inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
 		    //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-			$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+			$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 			//if ($type == 1)
 		    //{
 				$inj += preg_match('/javascript:/i', $val);
 		        $inj += preg_match('/vbscript:/i', $val);
 		    //}
 		    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-		    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-		    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+		    if ($type == 1) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
+		    if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
 		    return $inj;
         }
 
@@ -307,60 +307,60 @@ 
         // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 
         // Should be OK
-        $expectedresult=0;
+        $expectedresult = 0;
 
-        $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
-        $result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+        $_SERVER["PHP_SELF"] = '/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
+        $result = testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
         $this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject 1a');
 
         // Should detect XSS
-        $expectedresult=1;
+        $expectedresult = 1;
 
-        $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
-        $result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+        $_SERVER["PHP_SELF"] = '/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
+        $result = testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject 1b');
 
-        $test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-        $result=testSqlAndScriptInject($test, 0);
+        $test = "<img src='1.jpg' onerror =javascript:alert('XSS')>";
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa');
 
-        $test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-        $result=testSqlAndScriptInject($test, 2);
+        $test = "<img src='1.jpg' onerror =javascript:alert('XSS')>";
+        $result = testSqlAndScriptInject($test, 2);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa2');
 
-        $test='<IMG SRC=# onmouseover="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
+        $test = '<IMG SRC=# onmouseover="alert(1)">';
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa3');
-        $test='<IMG SRC onmouseover="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
+        $test = '<IMG SRC onmouseover="alert(1)">';
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa4');
-        $test='<IMG onmouseover="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
+        $test = '<IMG onmouseover="alert(1)">';
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa5');
-        $test='<IMG SRC=/ onerror="alert(1)">';
-        $result=testSqlAndScriptInject($test, 0);
+        $test = '<IMG SRC=/ onerror="alert(1)">';
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
-		$test='<IMG SRC=" &#14;  javascript:alert(1);">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC=" &#14;  javascript:alert(1);">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
 
-		$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
+		$result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
 
-        $test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
-        $result=testSqlAndScriptInject($test, 0);
+        $test = '<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ccc');
 
-        $test='<IMG SRC="javascript:alert(\'XSS\');">';
-        $result=testSqlAndScriptInject($test, 1);
+        $test = '<IMG SRC="javascript:alert(\'XSS\');">';
+        $result = testSqlAndScriptInject($test, 1);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ddd');
 
-        $test='<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
-        $result=testSqlAndScriptInject($test, 0);
+        $test = '<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
 
-        $test='<!-- Google analytics -->
+        $test = '<!-- Google analytics -->
 			<script>
 			  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
 			  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -371,30 +371,30 @@ 
 			  ga(\'send\', \'pageview\');
 
 			</script>';
-        $result=testSqlAndScriptInject($test, 0);
+        $result = testSqlAndScriptInject($test, 0);
         $this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
 
-        $test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some brwoser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
-		$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
+        $test = "<IMG SRC=\"jav\tascript:alert('XSS');\">"; // Is locked by some brwoser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
+		$test = "<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">"; // Same
 
-		$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
-		$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
 
 		// This case seems to be filtered by browsers now.
-		$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
+		$test = '<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
 		//$result=testSqlAndScriptInject($test, 0);
 		//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
 
-		$test='<iframe src=http://xss.rocks/scriptlet.html <';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<iframe src=http://xss.rocks/scriptlet.html <';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
 
-		$test='Set.constructor`alert\x281\x29```';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = 'Set.constructor`alert\x281\x29```';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
     }
 }

Braces +44 added lines, -13 removed lines

@@ -28,16 +28,39 @@ 
 //require_once 'PHPUnit/Autoload.php';
 //require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER','1');
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 
 /**
@@ -284,7 +307,9 @@ 
 		    $inj += preg_match('/<script/i', $val);
 		    $inj += preg_match('/<iframe/i', $val);
 			$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-		    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+		    if (! defined('NOSTYLECHECK')) {
+		        $inj += preg_match('/<style/i', $val);
+		    }
 		    $inj += preg_match('/base[\s]+href/si', $val);
 		    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 		    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
@@ -298,8 +323,14 @@ 
 		        $inj += preg_match('/vbscript:/i', $val);
 		    //}
 		    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-		    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-		    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+		    if ($type == 1) {
+		        $inj += preg_match('/"/i', $val);
+		    }
+		    // We refused " in GET parameters value
+		    if ($type == 2) {
+		        $inj += preg_match('/[;"]/', $val);
+		    }
+		    // PHP_SELF is a file system path. It can contains spaces.
 		    return $inj;
         }
 

dolibarr/test/phpunit/PricesTest.php

Indentation +105 added lines, -105 removed lines

@@ -67,9 +67,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -100,9 +100,9 @@ 
     }
 
     /**
-	 * Init phpunit tests
-	 *
-	 * @return	void
+     * Init phpunit tests
+     *
+     * @return	void
      */
     protected function setUp()
     {
@@ -116,9 +116,9 @@ 
     }
 
     /**
-	 * End phpunit tests
-	 *
-	 * @return	void
+     * End phpunit tests
+     *
+     * @return	void
      */
     protected function tearDown()
     {
@@ -134,44 +134,44 @@ 
      */
     public function testCalculPriceTotal()
     {
-		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;
 
-		global $mysoc;
-		$mysoc=new Societe($db);
+        global $mysoc;
+        $mysoc=new Societe($db);
 
-		// To force status that say module multicompany is on
-		//$conf->multicurrency=new stdClass();
-		//$conf->multicurrency->enabled = 0;
+        // To force status that say module multicompany is on
+        //$conf->multicurrency=new stdClass();
+        //$conf->multicurrency->enabled = 0;
 
 
-		/*
+        /*
 		 *  Country France
 		 */
 
-		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
+        // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
+        $mysoc->country_code='FR';
+        $mysoc->country_id=1;
+        $result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0),$result1,'Test1 FR');
 
-		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
+        // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
+        $mysoc->country_code='FR';
+        $mysoc->country_id=1;
+        $result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.57, 9.34795, 0.93479, 10.28274, 18.7, 1.87, 20.57, 0, 0),$result1,'Test1b FR');
 
-		// qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
+        // qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
+        $mysoc->country_code='FR';
+        $mysoc->country_id=1;
+        $result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(36.63, 3.66, 40.29, 18.31418, 1.83142, 20.1456, 36.63, 3.66, 40.29, 0, 0, 0, 0, 0, 0, 0, 40, 4, 44, 20, 2, 22, 40, 4, 44, 0, 0),$result1,'Test1c FR');
@@ -181,21 +181,21 @@ 
 		 */
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=0;
-		$result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=0;
+        $result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
         print __METHOD__." result2=".join(', ',$result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test1 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=0;
-		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=0;
+        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
         print __METHOD__." result2=".join(', ',$result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test2 ES');
@@ -203,76 +203,76 @@ 
         // --------------------------------------------------------
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
         $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0),$result2,'Test3 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0),$result2,'Test4 ES');
 
         // --------------------------------------------------------
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test5 ES for service');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test6 ES for product');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test6 ES for product');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test6 ES for service');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test6 ES for service');
 
-		// --------------------------------------------------------
+        // --------------------------------------------------------
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0),$result2,'Test7 ES for product');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0),$result2,'Test7 ES for product');
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19),$result2,'Test8 ES for service');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19),$result2,'Test8 ES for service');
 
 
         /*
@@ -280,23 +280,23 @@ 
          */
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value)
-		$mysoc->country_code='CI';
-		$mysoc->country_id=21;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+        $mysoc->country_code='CI';
+        $mysoc->country_id=21;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
         //$localtaxes=getLocalTaxesFromRate(18, 0, null, $mysoc);
         //var_dump($locataxes);
-		$result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+        $result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
         print __METHOD__." result3=".join(', ',$result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0),$result3,'Test9 CI');
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect)
-		$mysoc->country_code='CI';
-		$mysoc->country_id=21;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
-		$result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+        $mysoc->country_code='CI';
+        $mysoc->country_id=21;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
+        $result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
         print __METHOD__." result3=".join(', ',$result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0),$result3,'Test10 CI');
@@ -313,17 +313,17 @@ 
      */
     public function testUpdatePrice()
     {
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-		// Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
-		$localobject=new Facture($this->savdb);
+        // Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
+        $localobject=new Facture($this->savdb);
         $localobject->initAsSpecimen('nolines');
         $invoiceid=$localobject->create($user);
 

Spacing +132 added lines, -132 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,9 +37,9 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
+if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))
 {
     print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
     exit(1);
@@ -70,11 +70,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;
@@ -84,7 +84,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -93,7 +93,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->rollback();
 
         print __METHOD__."\n";
@@ -106,11 +106,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";
     }
@@ -134,14 +134,14 @@ 
      */
     public function testCalculPriceTotal()
     {
-		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;
 
 		global $mysoc;
-		$mysoc=new Societe($db);
+		$mysoc = new Societe($db);
 
 		// To force status that say module multicompany is on
 		//$conf->multicurrency=new stdClass();
@@ -153,126 +153,126 @@ 
 		 */
 
 		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
-        print __METHOD__." result1=".join(', ',$result1)."\n";
+		$mysoc->country_code = 'FR';
+		$mysoc->country_id = 1;
+		$result1 = calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
+        print __METHOD__." result1=".join(', ', $result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0),$result1,'Test1 FR');
+        $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0), $result1, 'Test1 FR');
 
 		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
-        print __METHOD__." result1=".join(', ',$result1)."\n";
+		$mysoc->country_code = 'FR';
+		$mysoc->country_id = 1;
+		$result1 = calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
+        print __METHOD__." result1=".join(', ', $result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.57, 9.34795, 0.93479, 10.28274, 18.7, 1.87, 20.57, 0, 0),$result1,'Test1b FR');
+        $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.57, 9.34795, 0.93479, 10.28274, 18.7, 1.87, 20.57, 0, 0), $result1, 'Test1b FR');
 
 		// qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
-        print __METHOD__." result1=".join(', ',$result1)."\n";
+		$mysoc->country_code = 'FR';
+		$mysoc->country_id = 1;
+		$result1 = calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
+        print __METHOD__." result1=".join(', ', $result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(36.63, 3.66, 40.29, 18.31418, 1.83142, 20.1456, 36.63, 3.66, 40.29, 0, 0, 0, 0, 0, 0, 0, 40, 4, 44, 20, 2, 22, 40, 4, 44, 0, 0),$result1,'Test1c FR');
+        $this->assertEquals(array(36.63, 3.66, 40.29, 18.31418, 1.83142, 20.1456, 36.63, 3.66, 40.29, 0, 0, 0, 0, 0, 0, 0, 40, 4, 44, 20, 2, 22, 40, 4, 44, 0, 0), $result1, 'Test1c FR');
 
         /*
 		 *  Country Spain
 		 */
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=0;
-		$result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
-        print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 0;
+		$result2 = calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+        print __METHOD__." result2=".join(', ', $result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test1 ES');
+        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test1 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=0;
-		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
-        print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 0;
+		$result2 = calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+        print __METHOD__." result2=".join(', ', $result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test2 ES');
+        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test2 ES');
 
         // --------------------------------------------------------
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
-        $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 1;
+		$mysoc->localtax2_assuj = 0;
+        $result2 = calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0),$result2,'Test3 ES');
+        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0), $result2, 'Test3 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 1;
+		$mysoc->localtax2_assuj = 0;
+        $result2 = calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0),$result2,'Test4 ES');
+        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0), $result2, 'Test4 ES');
 
         // --------------------------------------------------------
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 1;
+        $result2 = calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test5 ES for service');
+        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19), $result2, 'Test5 ES for service');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 1;
+        $result2 = calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test6 ES for product');
+		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test6 ES for product');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 1;
+        $result2 = calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test6 ES for service');
+		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19), $result2, 'Test6 ES for service');
 
 		// --------------------------------------------------------
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 1;
+        $result2 = calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0),$result2,'Test7 ES for product');
+		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0), $result2, 'Test7 ES for product');
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19),$result2,'Test8 ES for service');
+		$mysoc->country_code = 'ES';
+		$mysoc->country_id = 4;
+		$mysoc->localtax1_assuj = 0;
+		$mysoc->localtax2_assuj = 1;
+        $result2 = calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19), $result2, 'Test8 ES for service');
 
 
         /*
@@ -280,26 +280,26 @@ 
          */
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value)
-		$mysoc->country_code='CI';
-		$mysoc->country_id=21;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+		$mysoc->country_code = 'CI';
+		$mysoc->country_id = 21;
+		$mysoc->localtax1_assuj = 1;
+		$mysoc->localtax2_assuj = 0;
         //$localtaxes=getLocalTaxesFromRate(18, 0, null, $mysoc);
         //var_dump($locataxes);
-		$result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
-        print __METHOD__." result3=".join(', ',$result3)."\n";
+		$result3 = calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+        print __METHOD__." result3=".join(', ', $result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0),$result3,'Test9 CI');
+        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0), $result3, 'Test9 CI');
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect)
-		$mysoc->country_code='CI';
-		$mysoc->country_id=21;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
-		$result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
-        print __METHOD__." result3=".join(', ',$result3)."\n";
+		$mysoc->country_code = 'CI';
+		$mysoc->country_id = 21;
+		$mysoc->localtax1_assuj = 1;
+		$mysoc->localtax2_assuj = 0;
+		$result3 = calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+        print __METHOD__." result3=".join(', ', $result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0),$result3,'Test10 CI');
+        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0), $result3, 'Test10 CI');
 
         return true;
     }
@@ -314,42 +314,42 @@ 
     public function testUpdatePrice()
     {
 		//$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;
 
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
 		// Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
-		$localobject=new Facture($this->savdb);
+		$localobject = new Facture($this->savdb);
         $localobject->initAsSpecimen('nolines');
-        $invoiceid=$localobject->create($user);
+        $invoiceid = $localobject->create($user);
 
-        $localobject->addline('Desc',1.24,1,10,0,0,0,0,'','',0,0,0,'HT');
-        $localobject->addline('Desc',1.24,1,10,0,0,0,0,'','',0,0,0,'HT');
+        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
+        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
 
-        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->fetch($invoiceid);
 
-        $this->assertEquals(2.48,$newlocalobject->total_ht, "testUpdatePrice test1");
-        $this->assertEquals(0.24,$newlocalobject->total_tva, "testUpdatePrice test2");
-        $this->assertEquals(2.72,$newlocalobject->total_ttc, "testUpdatePrice test3");
+        $this->assertEquals(2.48, $newlocalobject->total_ht, "testUpdatePrice test1");
+        $this->assertEquals(0.24, $newlocalobject->total_tva, "testUpdatePrice test2");
+        $this->assertEquals(2.72, $newlocalobject->total_ttc, "testUpdatePrice test3");
 
 
         // Two lines of 1.24 give 2.48 HT and 2.73 TTC with global vat rounding mode
-        $localobject=new Facture($this->savdb);
+        $localobject = new Facture($this->savdb);
         $localobject->initAsSpecimen('nolines');
-        $invoiceid=$localobject->create($user);
+        $invoiceid = $localobject->create($user);
 
-        $localobject->addline('Desc',1.24,1,10,0,0,0,0,'','',0,0,0,'HT');
-        $localobject->addline('Desc',1.24,1,10,0,0,0,0,'','',0,0,0,'HT');
+        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
+        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
 
-        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->fetch($invoiceid);
 
-        $this->assertEquals(2.48,$newlocalobject->total_ht, "testUpdatePrice test4");
+        $this->assertEquals(2.48, $newlocalobject->total_ht, "testUpdatePrice test4");
         //$this->assertEquals(0.25,$newlocalobject->total_tva);
         //$this->assertEquals(2.73,$newlocalobject->total_ttc);
     }

dolibarr/test/phpunit/XCalLibTest.php

Indentation +3 added lines, -3 removed lines

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

Spacing +25 added lines, -25 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -124,19 +124,19 @@ 
      */
     public function testQuotedPrintEncodeDecode()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $stringtoencode='ABCD=1234;';
-        $result=quotedPrintEncode($stringtoencode);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $stringtoencode = 'ABCD=1234;';
+        $result = quotedPrintEncode($stringtoencode);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('ABCD=3D1234;',$result);
+        $this->assertEquals('ABCD=3D1234;', $result);
 
-        $resultback=quotedPrintDecode($result);
+        $resultback = quotedPrintDecode($result);
         print __METHOD__." result=".$resultback."\n";
-        $this->assertEquals($stringtoencode,$resultback);
+        $this->assertEquals($stringtoencode, $resultback);
     }
 }