alxarafe / alixar

dolibarr/test/phpunit/SupplierProposalTest.php

Indentation +123 added lines, -123 removed lines

@@ -31,12 +31,12 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for user nb 1 (that should be admin)\n";
-	$user->fetch(1);
+    print "Load permissions for user nb 1 (that should be admin)\n";
+    $user->fetch(1);
 
-	//$user->addrights(0, 'supplier_proposal');
+    //$user->addrights(0, 'supplier_proposal');
 
-	$user->getrights();
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -50,82 +50,82 @@ 
  */
 class SupplierProposalTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return PropalTest
-	 */
-	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 PropalTest
+     */
+    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();
 
-		if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) { print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(); }
+        //$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";
+        if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) { print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(); }
+
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		print __METHOD__."\n";
-		//print $db->getVersion()."\n";
-
-		// Set permission not set by default sql sample
-		$user->addrights(0, 'supplier_proposal');
-		$user->getrights('supplier_proposal', 1);
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+        //print $db->getVersion()."\n";
+
+        // Set permission not set by default sql sample
+        $user->addrights(0, 'supplier_proposal');
+        $user->getrights('supplier_proposal', 1);
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -135,19 +135,19 @@ 
      */
     public function testSupplierProposalCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new SupplierProposal($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new SupplierProposal($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
@@ -161,18 +161,18 @@ 
      */
     public function testSupplierProposalFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new SupplierProposal($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new SupplierProposal($this->savdb);
+        $result=$localobject->fetch($id);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
@@ -186,18 +186,18 @@ 
      */
     public function testSupplierProposalAddLine($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject->fetch_thirdparty();
-    	$result=$localobject->addline('Added line', 10, 2, 19.6);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->fetch_thirdparty();
+        $result=$localobject->addline('Added line', 10, 2, 19.6);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
@@ -211,20 +211,20 @@ 
      */
     public function testSupplierProposalValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$result=$localobject->valid($user);
+        $result=$localobject->valid($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
-   /**
+    /**
      * testSupplierProposalOther
      *
      * @param	Proposal	$localobject	Proposal
@@ -264,18 +264,18 @@ 
      */
     public function testSupplierProposalDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new SupplierProposal($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 SupplierProposal($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +55 added lines, -55 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -38,7 +38,7 @@ 
 
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -66,11 +66,11 @@ 
     	parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -80,8 +80,8 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+    	global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) { print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(); }
 
@@ -91,7 +91,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -104,11 +104,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";
@@ -135,15 +135,15 @@ 
      */
     public function testSupplierProposalCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new SupplierProposal($this->savdb);
+		$localobject = new SupplierProposal($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
@@ -161,14 +161,14 @@ 
      */
     public function testSupplierProposalFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new SupplierProposal($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new SupplierProposal($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -186,14 +186,14 @@ 
      */
     public function testSupplierProposalAddLine($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
     	$localobject->fetch_thirdparty();
-    	$result=$localobject->addline('Added line', 10, 2, 19.6);
+    	$result = $localobject->addline('Added line', 10, 2, 19.6);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -211,13 +211,13 @@ 
      */
     public function testSupplierProposalValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->valid($user);
+		$result = $localobject->valid($user);
 
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -235,11 +235,11 @@ 
      */
     public function testSupplierProposalOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -264,15 +264,15 @@ 
      */
     public function testSupplierProposalDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new SupplierProposal($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 SupplierProposal($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/AllTests.php

Indentation +14 added lines, -14 removed lines

@@ -40,8 +40,8 @@ 
 }
 if (empty($conf->adherent->enabled))
 {
-	print "Error: Module member must be enabled to have significant results.\n";
-	exit(1);
+    print "Error: Module member must be enabled to have significant results.\n";
+    exit(1);
 }
 if (! empty($conf->ldap->enabled))
 {
@@ -215,18 +215,18 @@ 
         // Test only with php7.2 or less
         //if ((float) phpversion() < 7.3)
         //{
-        	require_once dirname(__FILE__).'/WebservicesProductsTest.php';
-	        $suite->addTestSuite('WebservicesProductsTest');
-	        require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
-	        $suite->addTestSuite('WebservicesInvoicesTest');
-	        require_once dirname(__FILE__).'/WebservicesOrdersTest.php';
-	        $suite->addTestSuite('WebservicesOrdersTest');
-	        require_once dirname(__FILE__).'/WebservicesOtherTest.php';
-	        $suite->addTestSuite('WebservicesOtherTest');
-	        require_once dirname(__FILE__).'/WebservicesThirdpartyTest.php';
-	        $suite->addTestSuite('WebservicesThirdpartyTest');
-	        require_once dirname(__FILE__).'/WebservicesUserTest.php';
-	        $suite->addTestSuite('WebservicesUserTest');
+            require_once dirname(__FILE__).'/WebservicesProductsTest.php';
+            $suite->addTestSuite('WebservicesProductsTest');
+            require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
+            $suite->addTestSuite('WebservicesInvoicesTest');
+            require_once dirname(__FILE__).'/WebservicesOrdersTest.php';
+            $suite->addTestSuite('WebservicesOrdersTest');
+            require_once dirname(__FILE__).'/WebservicesOtherTest.php';
+            $suite->addTestSuite('WebservicesOtherTest');
+            require_once dirname(__FILE__).'/WebservicesThirdpartyTest.php';
+            $suite->addTestSuite('WebservicesThirdpartyTest');
+            require_once dirname(__FILE__).'/WebservicesUserTest.php';
+            $suite->addTestSuite('WebservicesUserTest');
         //}
 
         require_once dirname(__FILE__).'/ExportTest.php';

Spacing +7 added lines, -7 removed lines

@@ -24,13 +24,13 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 print "PHP Version: ".phpversion()."\n";
-print "Memory: ". ini_get('memory_limit')."\n";
+print "Memory: ".ini_get('memory_limit')."\n";
 
-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';
-print 'DOL_MAIN_URL_ROOT='.DOL_MAIN_URL_ROOT."\n";  // constant will be used by other tests
+print 'DOL_MAIN_URL_ROOT='.DOL_MAIN_URL_ROOT."\n"; // constant will be used by other tests
 
 
 if ($langs->defaultlang != 'en_US')
@@ -43,12 +43,12 @@ 
 	print "Error: Module member must be enabled to have significant results.\n";
 	exit(1);
 }
-if (! empty($conf->ldap->enabled))
+if (!empty($conf->ldap->enabled))
 {
     print "Error: LDAP module should not be enabled.\n";
     exit(1);
 }
-if (! empty($conf->google->enabled))
+if (!empty($conf->google->enabled))
 {
     print "Warning: Google module should not be enabled.\n";
 }
@@ -58,7 +58,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 
@@ -240,7 +240,7 @@ 
         require_once dirname(__FILE__).'/FormAdminTest.php';
         $suite->addTestSuite('FormAdminTest');
 
-        require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
+        require_once dirname(__FILE__).'/ModulesTest.php'; // At end because it's the longer
         $suite->addTestSuite('ModulesTest');
 
 

dolibarr/test/phpunit/BankAccountTest.php

Indentation +3 added lines, -3 removed lines

@@ -61,9 +61,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -168,7 +168,7 @@ 
         return $localobject;
     }
 
-   /**
+    /**
      * testBankAccountOther
      *
      * @param   Object  $localobject    Object contract

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';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 $langs->load("main");
 
@@ -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";
     }
@@ -125,16 +125,16 @@ 
      */
     public function testBankAccountCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new Account($this->savdb);
+        $localobject = new Account($this->savdb);
         $localobject->initAsSpecimen();
-        $localobject->date_solde=dol_now();
-        $result=$localobject->create($user);
+        $localobject->date_solde = dol_now();
+        $result = $localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -153,14 +153,14 @@ 
      */
     public function testBankAccountFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new Account($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Account($this->savdb);
+        $result = $localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -179,11 +179,11 @@ 
      */
     public function testBankAccountOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -208,15 +208,15 @@ 
      */
     public function testBankAccountDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Account($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 Account($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/FunctionsLibTest.php

Indentation +368 added lines, -368 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;
@@ -97,11 +97,11 @@ 
         print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
         global $conf,$user,$langs,$db;
@@ -114,10 +114,10 @@ 
     }
 
     /**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
         print __METHOD__."\n";
@@ -131,22 +131,22 @@ 
      */
     public function testIsValidMXRecord()
     {
-    	// Nb of line is same than entry text
-
-    	$input="yahoo.com";
-    	$result=isValidMXRecord($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals(1, $result);
-
-    	$input="yhaoo.com";
-    	$result=isValidMXRecord($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals(0, $result);
-
-    	$input="dolibarr.fr";
-    	$result=isValidMXRecord($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals(0, $result);
+        // Nb of line is same than entry text
+
+        $input="yahoo.com";
+        $result=isValidMXRecord($input);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(1, $result);
+
+        $input="yhaoo.com";
+        $result=isValidMXRecord($input);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(0, $result);
+
+        $input="dolibarr.fr";
+        $result=isValidMXRecord($input);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(0, $result);
     }
 
     /**
@@ -156,172 +156,172 @@ 
      */
     public function testDolGetFirstLineOfText()
     {
-    	// Nb of line is same than entry text
-
-    	$input="aaaa";
-    	$result=dolGetFirstLineOfText($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa", $result);
-
-    	$input="aaaa\nbbbbbbbbbbbb\n";
-    	$result=dolGetFirstLineOfText($input, 2);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa\nbbbbbbbbbbbb", $result);
-
-    	$input="aaaa<br>bbbbbbbbbbbb<br>";
-    	$result=dolGetFirstLineOfText($input, 2);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb", $result);
-
-    	// Nb of line is lower
-
-    	$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-    	$result=dolGetFirstLineOfText($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa...", $result);
-
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-    	$result=dolGetFirstLineOfText($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa...", $result);
-
-    	$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-    	$result=dolGetFirstLineOfText($input, 2);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa\nbbbbbbbbbbbb...", $result);
-
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-    	$result=dolGetFirstLineOfText($input, 2);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb...", $result);
-
-    	// Nb of line is higher
-
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc";
-    	$result=dolGetFirstLineOfText($input, 100);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 a');
-
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-    	$result=dolGetFirstLineOfText($input, 100);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 b');
-
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
-    	$result=dolGetFirstLineOfText($input, 100);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 c');
+        // Nb of line is same than entry text
+
+        $input="aaaa";
+        $result=dolGetFirstLineOfText($input);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa", $result);
+
+        $input="aaaa\nbbbbbbbbbbbb\n";
+        $result=dolGetFirstLineOfText($input, 2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa\nbbbbbbbbbbbb", $result);
+
+        $input="aaaa<br>bbbbbbbbbbbb<br>";
+        $result=dolGetFirstLineOfText($input, 2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb", $result);
+
+        // Nb of line is lower
+
+        $input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
+        $result=dolGetFirstLineOfText($input);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa...", $result);
+
+        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+        $result=dolGetFirstLineOfText($input);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa...", $result);
+
+        $input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
+        $result=dolGetFirstLineOfText($input, 2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa\nbbbbbbbbbbbb...", $result);
+
+        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+        $result=dolGetFirstLineOfText($input, 2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb...", $result);
+
+        // Nb of line is higher
+
+        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc";
+        $result=dolGetFirstLineOfText($input, 100);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 a');
+
+        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+        $result=dolGetFirstLineOfText($input, 100);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 b');
+
+        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
+        $result=dolGetFirstLineOfText($input, 100);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 c');
     }
 
 
-	/**
-	 * testDolBuildPath
-	 *
-	 * @return void
-	 */
-	public function testDolBuildPath()
-	{
-	    /*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
+    /**
+     * testDolBuildPath
+     *
+     * @return void
+     */
+    public function testDolBuildPath()
+    {
+        /*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
 	    var_dump($tmp);
 	    */
 
-	    /*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
+        /*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
 	    var_dump($tmp);
 	    */
 
-	    $result=dol_buildpath('/google/oauth2callback.php', 2);
-	    print __METHOD__." result=".$result."\n";
-	    $this->assertStringStartsWith('http', $result);
+        $result=dol_buildpath('/google/oauth2callback.php', 2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertStringStartsWith('http', $result);
 
-	    $result=dol_buildpath('/google/oauth2callback.php', 3);
+        $result=dol_buildpath('/google/oauth2callback.php', 3);
         print __METHOD__." result=".$result."\n";
         $this->assertStringStartsWith('http', $result);
-	}
+    }
 
 
     /**
-    * testGetBrowserInfo
-    *
-    * @return void
-    */
+     * testGetBrowserInfo
+     *
+     * @return void
+     */
     public function testGetBrowserInfo()
     {
-		// MSIE 5.0
+        // MSIE 5.0
         $user_agent ='Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
         $tmp=getBrowserInfo($user_agent);
         $this->assertEquals('ie',$tmp['browsername']);
         $this->assertEquals('5.0',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
 
-		// Firefox 0.9.1
+        // Firefox 0.9.1
         $user_agent ='Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
         $tmp=getBrowserInfo($user_agent);
         $this->assertEquals('firefox',$tmp['browsername']);
         $this->assertEquals('0.9.1',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
 
         $user_agent ='Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
         $tmp=getBrowserInfo($user_agent);
         $this->assertEquals('opera',$tmp['browsername']);
         $this->assertEquals('6.03',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
 
         $user_agent ='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
         $tmp=getBrowserInfo($user_agent);
         $this->assertEquals('chrome',$tmp['browsername']);
         $this->assertEquals('19.0.1042.0',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
 
         $user_agent ='chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
         $tmp=getBrowserInfo($user_agent);
         $this->assertEquals('chrome',$tmp['browsername']);
         $this->assertEquals('17.0.963.56',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
 
         $user_agent ='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
         $tmp=getBrowserInfo($user_agent);
         $this->assertEquals('safari',$tmp['browsername']);
         $this->assertEquals('533.21.1',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
-
-	    //Internet Explorer 11
-	    $user_agent = 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';
-	    $tmp=getBrowserInfo($user_agent);
-	    $this->assertEquals('ie',$tmp['browsername']);
-	    $this->assertEquals('11.0',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
-
-	    //Internet Explorer 11 bis
-	    $user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; NP06; rv:11.0) like Gecko';
-	    $tmp=getBrowserInfo($user_agent);
-	    $this->assertEquals('ie',$tmp['browsername']);
-	    $this->assertEquals('11.0',$tmp['browserversion']);
-	    $this->assertEmpty($tmp['phone']);
-	    $this->assertFalse($tmp['tablet']);
-	    $this->assertEquals('classic', $tmp['layout']);
-
-	    //iPad
-	    $user_agent = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25';
-	    $tmp=getBrowserInfo($user_agent);
-	    $this->assertEquals('safari',$tmp['browsername']);
-	    $this->assertEquals('8536.25',$tmp['browserversion']);
-	    $this->assertEquals('ios',$tmp['browseros']);
-	    $this->assertEquals('tablet',$tmp['layout']);
-	    $this->assertEquals('iphone',$tmp['phone']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
+
+        //Internet Explorer 11
+        $user_agent = 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';
+        $tmp=getBrowserInfo($user_agent);
+        $this->assertEquals('ie',$tmp['browsername']);
+        $this->assertEquals('11.0',$tmp['browserversion']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
+
+        //Internet Explorer 11 bis
+        $user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; NP06; rv:11.0) like Gecko';
+        $tmp=getBrowserInfo($user_agent);
+        $this->assertEquals('ie',$tmp['browsername']);
+        $this->assertEquals('11.0',$tmp['browserversion']);
+        $this->assertEmpty($tmp['phone']);
+        $this->assertFalse($tmp['tablet']);
+        $this->assertEquals('classic', $tmp['layout']);
+
+        //iPad
+        $user_agent = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25';
+        $tmp=getBrowserInfo($user_agent);
+        $this->assertEquals('safari',$tmp['browsername']);
+        $this->assertEquals('8536.25',$tmp['browserversion']);
+        $this->assertEquals('ios',$tmp['browseros']);
+        $this->assertEquals('tablet',$tmp['layout']);
+        $this->assertEquals('iphone',$tmp['phone']);
     }
 
 
@@ -332,48 +332,48 @@ 
      */
     public function testGetLanguageCodeFromCountryCode()
     {
-    	global $mysoc;
+        global $mysoc;
 
-    	$language = getLanguageCodeFromCountryCode('US');
-    	$this->assertEquals('en_US', $language, 'US');
+        $language = getLanguageCodeFromCountryCode('US');
+        $this->assertEquals('en_US', $language, 'US');
 
-    	$language = getLanguageCodeFromCountryCode('ES');
-    	$this->assertEquals('es_ES', $language, 'ES');
+        $language = getLanguageCodeFromCountryCode('ES');
+        $this->assertEquals('es_ES', $language, 'ES');
 
-    	$language = getLanguageCodeFromCountryCode('CL');
-    	$this->assertEquals('es_CL', $language, 'CL');
+        $language = getLanguageCodeFromCountryCode('CL');
+        $this->assertEquals('es_CL', $language, 'CL');
 
-    	$language = getLanguageCodeFromCountryCode('CA');
-    	$this->assertEquals('en_CA', $language, 'CA');
+        $language = getLanguageCodeFromCountryCode('CA');
+        $this->assertEquals('en_CA', $language, 'CA');
 
-    	$language = getLanguageCodeFromCountryCode('MQ');
-    	$this->assertEquals('fr_CA', $language);
+        $language = getLanguageCodeFromCountryCode('MQ');
+        $this->assertEquals('fr_CA', $language);
 
-    	$language = getLanguageCodeFromCountryCode('FR');
-    	$this->assertEquals('fr_FR', $language);
+        $language = getLanguageCodeFromCountryCode('FR');
+        $this->assertEquals('fr_FR', $language);
 
-    	$language = getLanguageCodeFromCountryCode('BE');
-    	$this->assertEquals('fr_BE', $language);
+        $language = getLanguageCodeFromCountryCode('BE');
+        $this->assertEquals('fr_BE', $language);
 
-    	$mysoc->country_code = 'FR';
-    	$language = getLanguageCodeFromCountryCode('CH');
-    	$this->assertEquals('fr_CH', $language);
+        $mysoc->country_code = 'FR';
+        $language = getLanguageCodeFromCountryCode('CH');
+        $this->assertEquals('fr_CH', $language);
 
-    	$mysoc->country_code = 'DE';
-    	$language = getLanguageCodeFromCountryCode('CH');
-    	$this->assertEquals('de_CH', $language);
+        $mysoc->country_code = 'DE';
+        $language = getLanguageCodeFromCountryCode('CH');
+        $this->assertEquals('de_CH', $language);
 
-    	$language = getLanguageCodeFromCountryCode('DE');
-    	$this->assertEquals('de_DE', $language);
+        $language = getLanguageCodeFromCountryCode('DE');
+        $this->assertEquals('de_DE', $language);
 
-    	$language = getLanguageCodeFromCountryCode('SA');
-    	$this->assertEquals('ar_SA', $language);
+        $language = getLanguageCodeFromCountryCode('SA');
+        $this->assertEquals('ar_SA', $language);
 
-    	$language = getLanguageCodeFromCountryCode('SE');
-    	$this->assertEquals('sv_SE', $language);
+        $language = getLanguageCodeFromCountryCode('SE');
+        $this->assertEquals('sv_SE', $language);
 
-    	$language = getLanguageCodeFromCountryCode('DK');
-    	$this->assertEquals('da_DK', $language);
+        $language = getLanguageCodeFromCountryCode('DK');
+        $this->assertEquals('da_DK', $language);
     }
 
     /**
@@ -570,9 +570,9 @@ 
      */
     public function testDolHtmlEntitiesBr()
     {
-    	// Text not already HTML
+        // Text not already HTML
 
-    	$input="A string\nwith a é, &, < and >.";
+        $input="A string\nwith a é, &, < and >.";
         $after=dol_htmlentitiesbr($input,0);    // Add <br> before \n
         $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.",$after);
 
@@ -645,9 +645,9 @@ 
      */
     public function testDolUnaccent()
     {
-    	// Text not already HTML
+        // Text not already HTML
 
-    	$input="A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
+        $input="A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
         $after=dol_string_unaccent($input);
         $this->assertEquals("A string\nwith a a a e e e i u o y, &, < and >.",$after);
     }
@@ -738,14 +738,14 @@ 
      */
     public function testDolMkTime()
     {
-    	global $conf;
+        global $conf;
 
-    	$savtz=date_default_timezone_get();
+        $savtz=date_default_timezone_get();
 
-		// Some test for UTC TZ
-    	date_default_timezone_set('UTC');
+        // Some test for UTC TZ
+        date_default_timezone_set('UTC');
 
-    	// Check bad hours
+        // Check bad hours
         $result=dol_mktime(25,0,0,1,1,1970,1,1);    // Error (25 hours)
         print __METHOD__." result=".$result."\n";
         $this->assertEquals('',$result);
@@ -808,10 +808,10 @@ 
 
 
     /**
-    * testDolEscapeHtmlTag
-    *
-    * @return	void
-    */
+     * testDolEscapeHtmlTag
+     *
+     * @return	void
+     */
     public function testDolEscapeHtmlTag()
     {
         $input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
@@ -831,30 +831,30 @@ 
      */
     public function testDolFormatAddress()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$object=new Societe($db);
-		$object->initAsSpecimen();
-
-		$object->country_code='FR';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\n99999 MyTown",$address);
-
-		$object->country_code='GB';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\nMyTown, MyState\n99999",$address);
-
-		$object->country_code='US';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
-
-		$object->country_code='AU';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $object=new Societe($db);
+        $object->initAsSpecimen();
+
+        $object->country_code='FR';
+        $address=dol_format_address($object);
+        $this->assertEquals("21 jump street\n99999 MyTown",$address);
+
+        $object->country_code='GB';
+        $address=dol_format_address($object);
+        $this->assertEquals("21 jump street\nMyTown, MyState\n99999",$address);
+
+        $object->country_code='US';
+        $address=dol_format_address($object);
+        $this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
+
+        $object->country_code='AU';
+        $address=dol_format_address($object);
+        $this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
     }
 
 
@@ -903,7 +903,7 @@ 
         print __METHOD__." s=".$s."\n";
         $this->assertContains('theme',$s,'testImgPicto1');
 
-    	$s=img_picto('title','img.png','style="float: right"',0);
+        $s=img_picto('title','img.png','style="float: right"',0);
         print __METHOD__." s=".$s."\n";
         $this->assertContains('theme',$s,'testImgPicto2');
         $this->assertContains('style="float: right"',$s,'testImgPicto2');
@@ -978,13 +978,13 @@ 
         $companyfr=new Societe($db);
         $companyfr->country_code='FR';
         $companyfr->tva_assuj=1;
-		$companyfr->tva_intra='FR9999';
+        $companyfr->tva_intra='FR9999';
 
         // Buyers
         $companymc=new Societe($db);
         $companymc->country_code='MC';
         $companymc->tva_assuj=1;
-		$companyfr->tva_intra='MC9999';
+        $companyfr->tva_intra='MC9999';
 
         $companyit=new Societe($db);
         $companyit->country_code='IT';
@@ -1068,84 +1068,84 @@ 
      */
     public function testGetDefaultLocalTax()
     {
-    	global $conf,$user,$langs,$db;
-    	$this->savconf=$conf;
-    	$this->savuser=$user;
-    	$this->savlangs=$langs;
-    	$this->savdb=$db;
-
-    	$companyfrnovat=new Societe($db);
-    	$companyfrnovat->country_code='FR';
-    	$companyfrnovat->tva_assuj=0;
-    	$companyfrnovat->localtax1_assuj=0;
-    	$companyfrnovat->localtax2_assuj=0;
-
-    	$companyes=new Societe($db);
-    	$companyes->country_code='ES';
-    	$companyes->tva_assuj=1;
-    	$companyes->localtax1_assuj=1;
-    	$companyes->localtax2_assuj=1;
-
-    	$companymc=new Societe($db);
-    	$companymc->country_code='MC';
-    	$companymc->tva_assuj=1;
-    	$companymc->localtax1_assuj=0;
-    	$companymc->localtax2_assuj=0;
-
-    	$companyit=new Societe($db);
-    	$companyit->country_code='IT';
-    	$companyit->tva_assuj=1;
-    	$companyit->tva_intra='IT99999';
-    	$companyit->localtax1_assuj=0;
-    	$companyit->localtax2_assuj=0;
-
-    	$notcompanyit=new Societe($db);
-    	$notcompanyit->country_code='IT';
-    	$notcompanyit->tva_assuj=1;
-    	$notcompanyit->tva_intra='';
-    	$notcompanyit->typent_code='TE_PRIVATE';
-    	$notcompanyit->localtax1_assuj=0;
-    	$notcompanyit->localtax2_assuj=0;
-
-    	$companyus=new Societe($db);
-    	$companyus->country_code='US';
-    	$companyus->tva_assuj=1;
-    	$companyus->tva_intra='';
-    	$companyus->localtax1_assuj=0;
-    	$companyus->localtax2_assuj=0;
-
-    	// Test RULE FR-MC
-    	$vat1=get_default_localtax($companyfrnovat,$companymc,1,0);
-    	$vat2=get_default_localtax($companyfrnovat,$companymc,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
-
-    	// Test RULE ES-ES
-    	$vat1=get_default_localtax($companyes,$companyes,1,0);
-    	$vat2=get_default_localtax($companyes,$companyes,2,0);
-    	$this->assertEquals($vat1, 5.2);
-    	$this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
-
-    	// Test RULE ES-IT
-    	$vat1=get_default_localtax($companyes,$companyit,1,0);
-    	$vat2=get_default_localtax($companyes,$companyit,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
-
-    	// Test RULE ES-IT
-    	$vat1=get_default_localtax($companyes,$notcompanyit,1,0);
-    	$vat2=get_default_localtax($companyes,$notcompanyit,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
-
-    	// Test RULE FR-IT
-    	// Not tested
-
-    	// Test RULE ES-US
-    	$vat1=get_default_localtax($companyes,$companyus,1,0);
-    	$vat2=get_default_localtax($companyes,$companyus,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        $companyfrnovat=new Societe($db);
+        $companyfrnovat->country_code='FR';
+        $companyfrnovat->tva_assuj=0;
+        $companyfrnovat->localtax1_assuj=0;
+        $companyfrnovat->localtax2_assuj=0;
+
+        $companyes=new Societe($db);
+        $companyes->country_code='ES';
+        $companyes->tva_assuj=1;
+        $companyes->localtax1_assuj=1;
+        $companyes->localtax2_assuj=1;
+
+        $companymc=new Societe($db);
+        $companymc->country_code='MC';
+        $companymc->tva_assuj=1;
+        $companymc->localtax1_assuj=0;
+        $companymc->localtax2_assuj=0;
+
+        $companyit=new Societe($db);
+        $companyit->country_code='IT';
+        $companyit->tva_assuj=1;
+        $companyit->tva_intra='IT99999';
+        $companyit->localtax1_assuj=0;
+        $companyit->localtax2_assuj=0;
+
+        $notcompanyit=new Societe($db);
+        $notcompanyit->country_code='IT';
+        $notcompanyit->tva_assuj=1;
+        $notcompanyit->tva_intra='';
+        $notcompanyit->typent_code='TE_PRIVATE';
+        $notcompanyit->localtax1_assuj=0;
+        $notcompanyit->localtax2_assuj=0;
+
+        $companyus=new Societe($db);
+        $companyus->country_code='US';
+        $companyus->tva_assuj=1;
+        $companyus->tva_intra='';
+        $companyus->localtax1_assuj=0;
+        $companyus->localtax2_assuj=0;
+
+        // Test RULE FR-MC
+        $vat1=get_default_localtax($companyfrnovat,$companymc,1,0);
+        $vat2=get_default_localtax($companyfrnovat,$companymc,2,0);
+        $this->assertEquals(0,$vat1);
+        $this->assertEquals(0,$vat2);
+
+        // Test RULE ES-ES
+        $vat1=get_default_localtax($companyes,$companyes,1,0);
+        $vat2=get_default_localtax($companyes,$companyes,2,0);
+        $this->assertEquals($vat1, 5.2);
+        $this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
+
+        // Test RULE ES-IT
+        $vat1=get_default_localtax($companyes,$companyit,1,0);
+        $vat2=get_default_localtax($companyes,$companyit,2,0);
+        $this->assertEquals(0,$vat1);
+        $this->assertEquals(0,$vat2);
+
+        // Test RULE ES-IT
+        $vat1=get_default_localtax($companyes,$notcompanyit,1,0);
+        $vat2=get_default_localtax($companyes,$notcompanyit,2,0);
+        $this->assertEquals(0,$vat1);
+        $this->assertEquals(0,$vat2);
+
+        // Test RULE FR-IT
+        // Not tested
+
+        // Test RULE ES-US
+        $vat1=get_default_localtax($companyes,$companyus,1,0);
+        $vat2=get_default_localtax($companyes,$companyus,2,0);
+        $this->assertEquals(0,$vat1);
+        $this->assertEquals(0,$vat2);
     }
 
 
@@ -1156,108 +1156,108 @@ 
      */
     public function testDolExplodeIntoArray()
     {
-    	$stringtoexplode='AA=B/B.CC=.EE=FF.HH=GG;.';
-    	$tmp=dolExplodeIntoArray($stringtoexplode,'.','=');
+        $stringtoexplode='AA=B/B.CC=.EE=FF.HH=GG;.';
+        $tmp=dolExplodeIntoArray($stringtoexplode,'.','=');
 
         print __METHOD__." tmp=".json_encode($tmp)."\n";
         $this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}',json_encode($tmp));
     }
 
-	/**
-	 * dol_nl2br
-	 *
-	 * @return void
-	 */
+    /**
+     * dol_nl2br
+     *
+     * @return void
+     */
     public function testDolNl2Br()
     {
 
-		//String to encode
-		$string = "a\na";
+        //String to encode
+        $string = "a\na";
 
-		$this->assertEquals(dol_nl2br($string), "a<br>\na");
+        $this->assertEquals(dol_nl2br($string), "a<br>\na");
 
-		//With $forxml parameter
-		$this->assertEquals(dol_nl2br($string, 0, 1), "a<br />\na");
+        //With $forxml parameter
+        $this->assertEquals(dol_nl2br($string, 0, 1), "a<br />\na");
 
-		//Replacing \n by br
-		$this->assertEquals(dol_nl2br($string, 1), "a<br>a");
+        //Replacing \n by br
+        $this->assertEquals(dol_nl2br($string, 1), "a<br>a");
 
-		//With $forxml parameter
-		$this->assertEquals(dol_nl2br($string, 1, 1), "a<br />a");
-	}
+        //With $forxml parameter
+        $this->assertEquals(dol_nl2br($string, 1, 1), "a<br />a");
+    }
 
-	/**
-	 * testDolPrice2Num
-	 *
-	 * @return boolean
-	 */
-	public function testDolPrice2Num()
-	{
-		$this->assertEquals(1000, price2num('1 000.0'));
-		$this->assertEquals(1000, price2num('1 000','MT'));
-		$this->assertEquals(1000, price2num('1 000','MU'));
+    /**
+     * testDolPrice2Num
+     *
+     * @return boolean
+     */
+    public function testDolPrice2Num()
+    {
+        $this->assertEquals(1000, price2num('1 000.0'));
+        $this->assertEquals(1000, price2num('1 000','MT'));
+        $this->assertEquals(1000, price2num('1 000','MU'));
 
-		$this->assertEquals(1000.123456, price2num('1 000.123456'));
+        $this->assertEquals(1000.123456, price2num('1 000.123456'));
 
-		// Round down
-		$this->assertEquals(1000.12, price2num('1 000.123452','MT'));
-		$this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU");
+        // Round down
+        $this->assertEquals(1000.12, price2num('1 000.123452','MT'));
+        $this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU");
 
-		// Round up
-		$this->assertEquals(1000.13, price2num('1 000.125456','MT'));
-		$this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU");
+        // Round up
+        $this->assertEquals(1000.13, price2num('1 000.125456','MT'));
+        $this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU");
 
-		// Text can't be converted
-		$this->assertEquals('12.4$',price2num('12.4$'));
-		$this->assertEquals('12r.4$',price2num('12r.4$'));
+        // Text can't be converted
+        $this->assertEquals('12.4$',price2num('12.4$'));
+        $this->assertEquals('12r.4$',price2num('12r.4$'));
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * testDolGetDate
-	 *
-	 * @return boolean
-	 */
-	public function testDolGetDate()
-	{
-		global $conf;
+    /**
+     * testDolGetDate
+     *
+     * @return boolean
+     */
+    public function testDolGetDate()
+    {
+        global $conf;
 
-		$conf->global->MAIN_START_WEEK = 0;
+        $conf->global->MAIN_START_WEEK = 0;
 
-		$tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
-		$this->assertEquals(4, $tmp['wday']);
+        $tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
+        $this->assertEquals(4, $tmp['wday']);
 
-		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
-		$this->assertEquals(5, $tmp['wday']);
+        $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
+        $this->assertEquals(5, $tmp['wday']);
 
-		$conf->global->MAIN_START_WEEK = 1;
+        $conf->global->MAIN_START_WEEK = 1;
 
-		$tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
-		$this->assertEquals(4, $tmp['wday']);
+        $tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
+        $this->assertEquals(4, $tmp['wday']);
 
-		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
-		$this->assertEquals(5, $tmp['wday']);
+        $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
+        $this->assertEquals(5, $tmp['wday']);
 
-		return true;
-	}
+        return true;
+    }
 
 
-	/**
-	 * testDolGetDate
-	 *
-	 * @return boolean
-	 */
-	public function testMakeSubstitutions()
-	{
-		global $conf, $langs;
-		$langs->load("main");
+    /**
+     * testDolGetDate
+     *
+     * @return boolean
+     */
+    public function testMakeSubstitutions()
+    {
+        global $conf, $langs;
+        $langs->load("main");
 
-		$substit=array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
-		$chaine='This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
-		$newstring = make_substitutions($chaine, $substit);
-		$this->assertEquals($newstring, 'This is a string with eldy and ltr and __C replaced__');
+        $substit=array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
+        $chaine='This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
+        $newstring = make_substitutions($chaine, $substit);
+        $this->assertEquals($newstring, 'This is a string with eldy and ltr and __C replaced__');
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +500 added lines, -500 removed lines

@@ -24,22 +24,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/date.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)
 
 /**
  * Class for PHPUnit tests
@@ -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,10 +80,10 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        if (! function_exists('mb_substr')) { print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(); }
+        if (!function_exists('mb_substr')) { print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(); }
 
         print __METHOD__."\n";
     }
@@ -91,7 +91,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         //$db->rollback();
 
         print __METHOD__."\n";
@@ -104,11 +104,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";
     }
@@ -133,18 +133,18 @@ 
     {
     	// Nb of line is same than entry text
 
-    	$input="yahoo.com";
-    	$result=isValidMXRecord($input);
+    	$input = "yahoo.com";
+    	$result = isValidMXRecord($input);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals(1, $result);
 
-    	$input="yhaoo.com";
-    	$result=isValidMXRecord($input);
+    	$input = "yhaoo.com";
+    	$result = isValidMXRecord($input);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals(0, $result);
 
-    	$input="dolibarr.fr";
-    	$result=isValidMXRecord($input);
+    	$input = "dolibarr.fr";
+    	$result = isValidMXRecord($input);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals(0, $result);
     }
@@ -158,57 +158,57 @@ 
     {
     	// Nb of line is same than entry text
 
-    	$input="aaaa";
-    	$result=dolGetFirstLineOfText($input);
+    	$input = "aaaa";
+    	$result = dolGetFirstLineOfText($input);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa", $result);
 
-    	$input="aaaa\nbbbbbbbbbbbb\n";
-    	$result=dolGetFirstLineOfText($input, 2);
+    	$input = "aaaa\nbbbbbbbbbbbb\n";
+    	$result = dolGetFirstLineOfText($input, 2);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa\nbbbbbbbbbbbb", $result);
 
-    	$input="aaaa<br>bbbbbbbbbbbb<br>";
-    	$result=dolGetFirstLineOfText($input, 2);
+    	$input = "aaaa<br>bbbbbbbbbbbb<br>";
+    	$result = dolGetFirstLineOfText($input, 2);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb", $result);
 
     	// Nb of line is lower
 
-    	$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-    	$result=dolGetFirstLineOfText($input);
+    	$input = "aaaa\nbbbbbbbbbbbb\ncccccc\n";
+    	$result = dolGetFirstLineOfText($input);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa...", $result);
 
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-    	$result=dolGetFirstLineOfText($input);
+    	$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+    	$result = dolGetFirstLineOfText($input);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa...", $result);
 
-    	$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-    	$result=dolGetFirstLineOfText($input, 2);
+    	$input = "aaaa\nbbbbbbbbbbbb\ncccccc\n";
+    	$result = dolGetFirstLineOfText($input, 2);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa\nbbbbbbbbbbbb...", $result);
 
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-    	$result=dolGetFirstLineOfText($input, 2);
+    	$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+    	$result = dolGetFirstLineOfText($input, 2);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb...", $result);
 
     	// Nb of line is higher
 
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc";
-    	$result=dolGetFirstLineOfText($input, 100);
+    	$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc";
+    	$result = dolGetFirstLineOfText($input, 100);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 a');
 
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-    	$result=dolGetFirstLineOfText($input, 100);
+    	$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+    	$result = dolGetFirstLineOfText($input, 100);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 b');
 
-    	$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
-    	$result=dolGetFirstLineOfText($input, 100);
+    	$input = "aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
+    	$result = dolGetFirstLineOfText($input, 100);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 c');
     }
@@ -229,11 +229,11 @@ 
 	    var_dump($tmp);
 	    */
 
-	    $result=dol_buildpath('/google/oauth2callback.php', 2);
+	    $result = dol_buildpath('/google/oauth2callback.php', 2);
 	    print __METHOD__." result=".$result."\n";
 	    $this->assertStringStartsWith('http', $result);
 
-	    $result=dol_buildpath('/google/oauth2callback.php', 3);
+	    $result = dol_buildpath('/google/oauth2callback.php', 3);
         print __METHOD__." result=".$result."\n";
         $this->assertStringStartsWith('http', $result);
 	}
@@ -247,81 +247,81 @@ 
     public function testGetBrowserInfo()
     {
 		// MSIE 5.0
-        $user_agent ='Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('ie',$tmp['browsername']);
-        $this->assertEquals('5.0',$tmp['browserversion']);
+        $user_agent = 'Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
+        $tmp = getBrowserInfo($user_agent);
+        $this->assertEquals('ie', $tmp['browsername']);
+        $this->assertEquals('5.0', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
 		// Firefox 0.9.1
-        $user_agent ='Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('firefox',$tmp['browsername']);
-        $this->assertEquals('0.9.1',$tmp['browserversion']);
+        $user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
+        $tmp = getBrowserInfo($user_agent);
+        $this->assertEquals('firefox', $tmp['browsername']);
+        $this->assertEquals('0.9.1', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
-        $user_agent ='Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('opera',$tmp['browsername']);
-        $this->assertEquals('6.03',$tmp['browserversion']);
+        $user_agent = 'Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
+        $tmp = getBrowserInfo($user_agent);
+        $this->assertEquals('opera', $tmp['browsername']);
+        $this->assertEquals('6.03', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
-        $user_agent ='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('chrome',$tmp['browsername']);
-        $this->assertEquals('19.0.1042.0',$tmp['browserversion']);
+        $user_agent = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
+        $tmp = getBrowserInfo($user_agent);
+        $this->assertEquals('chrome', $tmp['browsername']);
+        $this->assertEquals('19.0.1042.0', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
-        $user_agent ='chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('chrome',$tmp['browsername']);
-        $this->assertEquals('17.0.963.56',$tmp['browserversion']);
+        $user_agent = 'chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
+        $tmp = getBrowserInfo($user_agent);
+        $this->assertEquals('chrome', $tmp['browsername']);
+        $this->assertEquals('17.0.963.56', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
-        $user_agent ='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('safari',$tmp['browsername']);
-        $this->assertEquals('533.21.1',$tmp['browserversion']);
+        $user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
+        $tmp = getBrowserInfo($user_agent);
+        $this->assertEquals('safari', $tmp['browsername']);
+        $this->assertEquals('533.21.1', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
 	    //Internet Explorer 11
 	    $user_agent = 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';
-	    $tmp=getBrowserInfo($user_agent);
-	    $this->assertEquals('ie',$tmp['browsername']);
-	    $this->assertEquals('11.0',$tmp['browserversion']);
+	    $tmp = getBrowserInfo($user_agent);
+	    $this->assertEquals('ie', $tmp['browsername']);
+	    $this->assertEquals('11.0', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
 	    //Internet Explorer 11 bis
 	    $user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; NP06; rv:11.0) like Gecko';
-	    $tmp=getBrowserInfo($user_agent);
-	    $this->assertEquals('ie',$tmp['browsername']);
-	    $this->assertEquals('11.0',$tmp['browserversion']);
+	    $tmp = getBrowserInfo($user_agent);
+	    $this->assertEquals('ie', $tmp['browsername']);
+	    $this->assertEquals('11.0', $tmp['browserversion']);
 	    $this->assertEmpty($tmp['phone']);
 	    $this->assertFalse($tmp['tablet']);
 	    $this->assertEquals('classic', $tmp['layout']);
 
 	    //iPad
 	    $user_agent = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25';
-	    $tmp=getBrowserInfo($user_agent);
-	    $this->assertEquals('safari',$tmp['browsername']);
-	    $this->assertEquals('8536.25',$tmp['browserversion']);
-	    $this->assertEquals('ios',$tmp['browseros']);
-	    $this->assertEquals('tablet',$tmp['layout']);
-	    $this->assertEquals('iphone',$tmp['phone']);
+	    $tmp = getBrowserInfo($user_agent);
+	    $this->assertEquals('safari', $tmp['browsername']);
+	    $this->assertEquals('8536.25', $tmp['browserversion']);
+	    $this->assertEquals('ios', $tmp['browseros']);
+	    $this->assertEquals('tablet', $tmp['layout']);
+	    $this->assertEquals('iphone', $tmp['phone']);
     }
 
 
@@ -384,64 +384,64 @@ 
     public function testDolTextIsHtml()
     {
         // True
-        $input='<html>xxx</html>';
-        $after=dol_textishtml($input);
+        $input = '<html>xxx</html>';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with html tag');
-        $input='<body>xxx</body>';
-        $after=dol_textishtml($input);
+        $input = '<body>xxx</body>';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with body tag');
-        $input='xxx <b>yyy</b> zzz';
-        $after=dol_textishtml($input);
+        $input = 'xxx <b>yyy</b> zzz';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with b tag');
-        $input='xxx <u>yyy</u> zzz';
-        $after=dol_textishtml($input);
+        $input = 'xxx <u>yyy</u> zzz';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with u tag');
-        $input='text with <div>some div</div>';
-        $after=dol_textishtml($input);
+        $input = 'text with <div>some div</div>';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with div tag');
-        $input='text with HTML &nbsp; entities';
-        $after=dol_textishtml($input);
+        $input = 'text with HTML &nbsp; entities';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with entities tag');
-        $input='xxx<br>';
-        $after=dol_textishtml($input);
+        $input = 'xxx<br>';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with entities br');
-        $input='xxx<br >';
-        $after=dol_textishtml($input);
+        $input = 'xxx<br >';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with entities br');
-        $input='xxx<br style="eee">';
-        $after=dol_textishtml($input);
+        $input = 'xxx<br style="eee">';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with entities br and attributes');
-        $input='xxx<br style="eee" >';
-        $after=dol_textishtml($input);
+        $input = 'xxx<br style="eee" >';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with entities br and attributes bis');
-        $input='<h2>abc</h2>';
-        $after=dol_textishtml($input);
+        $input = '<h2>abc</h2>';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with entities h2');
-        $input='<img id="abc" src="https://xxx.com/aaa/image.png" />';
-        $after=dol_textishtml($input);
+        $input = '<img id="abc" src="https://xxx.com/aaa/image.png" />';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with img tag');
-        $input='<a class="azerty" href="https://xxx.com/aaa/image.png" />';
-        $after=dol_textishtml($input);
+        $input = '<a class="azerty" href="https://xxx.com/aaa/image.png" />';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with a tag');
-        $input='This is a text with&nbsp;html spaces';
-        $after=dol_textishtml($input);
+        $input = 'This is a text with&nbsp;html spaces';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with a &nbsp;');
-        $input='This is a text with accent &eacute;';
-        $after=dol_textishtml($input);
+        $input = 'This is a text with accent &eacute;';
+        $after = dol_textishtml($input);
         $this->assertTrue($after, 'Test with a &eacute;');
 
         // False
-        $input='xxx < br>';
-        $after=dol_textishtml($input);
+        $input = 'xxx < br>';
+        $after = dol_textishtml($input);
         $this->assertFalse($after);
-        $input='xxx <email@email.com>';	// <em> is html, <em... is not
-        $after=dol_textishtml($input);
+        $input = 'xxx <email@email.com>'; // <em> is html, <em... is not
+        $after = dol_textishtml($input);
         $this->assertFalse($after);
-        $input='xxx <brstyle="ee">';
-        $after=dol_textishtml($input);
+        $input = 'xxx <brstyle="ee">';
+        $after = dol_textishtml($input);
         $this->assertFalse($after);
-        $input='This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
-        $after=dol_textishtml($input);
+        $input = 'This is a text with html comments <!-- comment -->'; // we suppose this is not enough to be html content
+        $after = dol_textishtml($input);
         $this->assertFalse($after);
     }
 
@@ -453,33 +453,33 @@ 
      */
     public function testDolHtmlCleanLastBr()
     {
-        $input="A string\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string",$after);
+        $input = "A string\n";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string", $after);
 
-        $input="A string first\nA string second\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string first\nA string second",$after);
+        $input = "A string first\nA string second\n";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string first\nA string second", $after);
 
-        $input="A string\n\n\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string",$after);
+        $input = "A string\n\n\n";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string", $after);
 
-        $input="A string<br>";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string",$after);
+        $input = "A string<br>";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string", $after);
 
-        $input="A string first<br>\nA string second<br>";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string first<br>\nA string second",$after);
+        $input = "A string first<br>\nA string second<br>";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string first<br>\nA string second", $after);
 
-        $input="A string\n<br type=\"_moz\" />\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string",$after);
+        $input = "A string\n<br type=\"_moz\" />\n";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string", $after);
 
-        $input="A string\n<br><br />\n\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string",$after);
+        $input = "A string\n<br><br />\n\n";
+        $after = dol_htmlcleanlastbr($input);
+        $this->assertEquals("A string", $after);
 
         return true;
     }
@@ -491,17 +491,17 @@ 
      */
     public function testDolConcat()
     {
-        $text1="A string 1"; $text2="A string 2";	// text 1 and 2 are text, concat need only \n
-        $after=dol_concatdesc($text1, $text2);
-        $this->assertEquals("A string 1\nA string 2",$after);
+        $text1 = "A string 1"; $text2 = "A string 2"; // text 1 and 2 are text, concat need only \n
+        $after = dol_concatdesc($text1, $text2);
+        $this->assertEquals("A string 1\nA string 2", $after);
 
-        $text1="A<br>string 1"; $text2="A string 2";	// text 1 is html, concat need <br>\n
-        $after=dol_concatdesc($text1, $text2);
-        $this->assertEquals("A<br>string 1<br>\nA string 2",$after);
+        $text1 = "A<br>string 1"; $text2 = "A string 2"; // text 1 is html, concat need <br>\n
+        $after = dol_concatdesc($text1, $text2);
+        $this->assertEquals("A<br>string 1<br>\nA string 2", $after);
 
-        $text1="A string 1"; $text2="A <b>string</b> 2";	// text 2 is html, concat need <br>\n
-        $after=dol_concatdesc($text1, $text2);
-        $this->assertEquals("A string 1<br>\nA <b>string</b> 2",$after);
+        $text1 = "A string 1"; $text2 = "A <b>string</b> 2"; // text 2 is html, concat need <br>\n
+        $after = dol_concatdesc($text1, $text2);
+        $this->assertEquals("A string 1<br>\nA <b>string</b> 2", $after);
 
         return true;
     }
@@ -514,49 +514,49 @@ 
      */
     public function testDolStringNohtmltag()
     {
-        $text="A\nstring\n\nand more\n";
-        $after=dol_string_nohtmltag($text,0);
-        $this->assertEquals("A\nstring\n\nand more",$after,"test1a");
+        $text = "A\nstring\n\nand more\n";
+        $after = dol_string_nohtmltag($text, 0);
+        $this->assertEquals("A\nstring\n\nand more", $after, "test1a");
 
-        $text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("A string\n\n\n\n\nwith html tag",$after,"test2a 2 br and 3 \n give 5 \n");
+        $text = "A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+        $after = dol_string_nohtmltag($text, 0);
+        $this->assertEquals("A string\n\n\n\n\nwith html tag", $after, "test2a 2 br and 3 \n give 5 \n");
 
-        $text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("A string with html tag",$after,"test2b 2 br and 3 \n give 1 space");
+        $text = "A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+        $after = dol_string_nohtmltag($text, 1);
+        $this->assertEquals("A string with html tag", $after, "test2b 2 br and 3 \n give 1 space");
 
-        $text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 2);
-        $this->assertEquals("A string\n\nwith html tag",$after,"test2c 2 br and 3 \n give 2 \n");
+        $text = "A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+        $after = dol_string_nohtmltag($text, 2);
+        $this->assertEquals("A string\n\nwith html tag", $after, "test2c 2 br and 3 \n give 2 \n");
 
-        $text="A string<br>Another string";
-        $after=dol_string_nohtmltag($text,0);
-        $this->assertEquals("A string\nAnother string",$after,"test4");
+        $text = "A string<br>Another string";
+        $after = dol_string_nohtmltag($text, 0);
+        $this->assertEquals("A string\nAnother string", $after, "test4");
 
-        $text="A string<br>Another string";
-        $after=dol_string_nohtmltag($text,1);
-        $this->assertEquals("A string Another string",$after,"test5");
+        $text = "A string<br>Another string";
+        $after = dol_string_nohtmltag($text, 1);
+        $this->assertEquals("A string Another string", $after, "test5");
 
-        $text='<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
-        $after=dol_string_nohtmltag($text,1);
-        $this->assertEquals("ABC",$after,"test6");
+        $text = '<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
+        $after = dol_string_nohtmltag($text, 1);
+        $this->assertEquals("ABC", $after, "test6");
 
-        $text='<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
-        $after=dol_string_nohtmltag($text,1);
-        $this->assertEquals("DEF",$after,"test7");
+        $text = '<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
+        $after = dol_string_nohtmltag($text, 1);
+        $this->assertEquals("DEF", $after, "test7");
 
-        $text='<a href="/myurl" title="<u>A title</u>">HIJ</a>';
-        $after=dol_string_nohtmltag($text,0);
-        $this->assertEquals("HIJ",$after,"test8");
+        $text = '<a href="/myurl" title="<u>A title</u>">HIJ</a>';
+        $after = dol_string_nohtmltag($text, 0);
+        $this->assertEquals("HIJ", $after, "test8");
 
-        $text="A <b>string<b>\n\nwith html tag and '<' chars<br>\n";
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("A string\n\nwith html tag and '<' chars",$after,"test9");
+        $text = "A <b>string<b>\n\nwith html tag and '<' chars<br>\n";
+        $after = dol_string_nohtmltag($text, 0);
+        $this->assertEquals("A string\n\nwith html tag and '<' chars", $after, "test9");
 
-        $text="A <b>string<b>\n\nwith tag with < chars<br>\n";
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("A string with tag with < chars",$after,"test10");
+        $text = "A <b>string<b>\n\nwith tag with < chars<br>\n";
+        $after = dol_string_nohtmltag($text, 1);
+        $this->assertEquals("A string with tag with < chars", $after, "test10");
 
         return true;
     }
@@ -572,39 +572,39 @@ 
     {
     	// Text not already HTML
 
-    	$input="A string\nwith a é, &, < and >.";
-        $after=dol_htmlentitiesbr($input,0);    // Add <br> before \n
-        $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.",$after);
+    	$input = "A string\nwith a é, &, < and >.";
+        $after = dol_htmlentitiesbr($input, 0); // Add <br> before \n
+        $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-        $input="A string\nwith a é, &, < and >.";
-        $after=dol_htmlentitiesbr($input,1);    // Replace \n with <br>
-        $this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.",$after);
+        $input = "A string\nwith a é, &, < and >.";
+        $after = dol_htmlentitiesbr($input, 1); // Replace \n with <br>
+        $this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-        $input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-        $after=dol_htmlentitiesbr($input,0);    // Add <br> before \n
-        $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.",$after);
+        $input = "A string\nwith a é, &, < and >.\n\n"; // With some \n at end that should be cleaned
+        $after = dol_htmlentitiesbr($input, 0); // Add <br> before \n
+        $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-        $input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-        $after=dol_htmlentitiesbr($input,1);    // Replace \n with <br>
-        $this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.",$after);
+        $input = "A string\nwith a é, &, < and >.\n\n"; // With some \n at end that should be cleaned
+        $after = dol_htmlentitiesbr($input, 1); // Replace \n with <br>
+        $this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
 
         // Text already HTML, so &,<,> should not be converted
 
-        $input="A string<br>\nwith a é, &, < and >.";
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.",$after);
+        $input = "A string<br>\nwith a é, &, < and >.";
+        $after = dol_htmlentitiesbr($input);
+        $this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
 
-        $input="<li>\nA string with a é, &, < and >.</li>\nAnother string";
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string",$after);
+        $input = "<li>\nA string with a é, &, < and >.</li>\nAnother string";
+        $after = dol_htmlentitiesbr($input);
+        $this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
 
-        $input="A string<br>\nwith a é, &, < and >.<br>";	// With some <br> at end that should be cleaned
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.",$after);
+        $input = "A string<br>\nwith a é, &, < and >.<br>"; // With some <br> at end that should be cleaned
+        $after = dol_htmlentitiesbr($input);
+        $this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
 
-        $input="<li>\nA string with a é, &, < and >.</li>\nAnother string<br>";	// With some <br> at end that should be cleaned
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string",$after);
+        $input = "<li>\nA string with a é, &, < and >.</li>\nAnother string<br>"; // With some <br> at end that should be cleaned
+        $after = dol_htmlentitiesbr($input);
+        $this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
 
         // TODO Add test with param $removelasteolbr = 0
 
@@ -620,19 +620,19 @@ 
     public function testDolNbOfLinesBis()
     {
         // This is not a html string so nb of lines depends on \n
-        $input="A string\nwith a é, &, < and > and bold tag.\nThird line";
-        $after=dol_nboflines_bis($input,0);
-        $this->assertEquals($after,3);
+        $input = "A string\nwith a é, &, < and > and bold tag.\nThird line";
+        $after = dol_nboflines_bis($input, 0);
+        $this->assertEquals($after, 3);
 
         // This is a html string so nb of lines depends on <br>
-        $input="A string\nwith a é, &, < and > and <b>bold</b> tag.\nThird line";
-        $after=dol_nboflines_bis($input,0);
-        $this->assertEquals($after,1);
+        $input = "A string\nwith a é, &, < and > and <b>bold</b> tag.\nThird line";
+        $after = dol_nboflines_bis($input, 0);
+        $this->assertEquals($after, 1);
 
         // This is a html string so nb of lines depends on <br>
-        $input="A string<br>with a é, &, < and > and <b>bold</b> tag.<br>Third line";
-        $after=dol_nboflines_bis($input,0);
-        $this->assertEquals($after,3);
+        $input = "A string<br>with a é, &, < and > and <b>bold</b> tag.<br>Third line";
+        $after = dol_nboflines_bis($input, 0);
+        $this->assertEquals($after, 3);
 
         return true;
     }
@@ -647,9 +647,9 @@ 
     {
     	// Text not already HTML
 
-    	$input="A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
-        $after=dol_string_unaccent($input);
-        $this->assertEquals("A string\nwith a a a e e e i u o y, &, < and >.",$after);
+    	$input = "A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
+        $after = dol_string_unaccent($input);
+        $this->assertEquals("A string\nwith a a a e e e i u o y, &, < and >.", $after);
     }
 
 
@@ -661,17 +661,17 @@ 
     public function testDolUtf8Check()
     {
         // True
-        $result=utf8_check('azerty');
+        $result = utf8_check('azerty');
         $this->assertTrue($result);
 
-        $file=dirname(__FILE__).'/textutf8.txt';
-        $filecontent=file_get_contents($file);
-        $result=utf8_check($filecontent);
+        $file = dirname(__FILE__).'/textutf8.txt';
+        $filecontent = file_get_contents($file);
+        $result = utf8_check($filecontent);
         $this->assertTrue($result);
 
-        $file=dirname(__FILE__).'/textiso.txt';
-        $filecontent=file_get_contents($file);
-        $result=utf8_check($filecontent);
+        $file = dirname(__FILE__).'/textiso.txt';
+        $filecontent = file_get_contents($file);
+        $result = utf8_check($filecontent);
         $this->assertFalse($result);
     }
 
@@ -683,50 +683,50 @@ 
     public function testDolTrunc()
     {
         // Default trunc (will add ... if truncation truncation or keep last char if only one char)
-        $input="éeéeéeàa";
-        $after=dol_trunc($input,3);
-        $this->assertEquals("éeé...",$after,'Test A1');
-        $after=dol_trunc($input,2);
-        $this->assertEquals("ée...",$after,'Test A2');
-        $after=dol_trunc($input,1);
-        $this->assertEquals("é...",$after,'Test A3');
-        $input="éeéeé";
-        $after=dol_trunc($input,3);
-        $this->assertEquals("éeéeé",$after,'Test B1');
-        $after=dol_trunc($input,2);
-        $this->assertEquals("éeéeé",$after,'Test B2');
-        $after=dol_trunc($input,1);
-        $this->assertEquals("é...",$after,'Test B3');
-        $input="éeée";
-        $after=dol_trunc($input,3);
-        $this->assertEquals("éeée",$after,'Test C1');
-        $after=dol_trunc($input,2);
-        $this->assertEquals("éeée",$after,'Test C2');
-        $after=dol_trunc($input,1);
-        $this->assertEquals("éeée",$after,'Test C3');
-        $input="éeé";
-        $after=dol_trunc($input,3);
-        $this->assertEquals("éeé",$after,'Test C');
-        $after=dol_trunc($input,2);
-        $this->assertEquals("éeé",$after,'Test D');
-        $after=dol_trunc($input,1);
-        $this->assertEquals("éeé",$after,'Test E');
+        $input = "éeéeéeàa";
+        $after = dol_trunc($input, 3);
+        $this->assertEquals("éeé...", $after, 'Test A1');
+        $after = dol_trunc($input, 2);
+        $this->assertEquals("ée...", $after, 'Test A2');
+        $after = dol_trunc($input, 1);
+        $this->assertEquals("é...", $after, 'Test A3');
+        $input = "éeéeé";
+        $after = dol_trunc($input, 3);
+        $this->assertEquals("éeéeé", $after, 'Test B1');
+        $after = dol_trunc($input, 2);
+        $this->assertEquals("éeéeé", $after, 'Test B2');
+        $after = dol_trunc($input, 1);
+        $this->assertEquals("é...", $after, 'Test B3');
+        $input = "éeée";
+        $after = dol_trunc($input, 3);
+        $this->assertEquals("éeée", $after, 'Test C1');
+        $after = dol_trunc($input, 2);
+        $this->assertEquals("éeée", $after, 'Test C2');
+        $after = dol_trunc($input, 1);
+        $this->assertEquals("éeée", $after, 'Test C3');
+        $input = "éeé";
+        $after = dol_trunc($input, 3);
+        $this->assertEquals("éeé", $after, 'Test C');
+        $after = dol_trunc($input, 2);
+        $this->assertEquals("éeé", $after, 'Test D');
+        $after = dol_trunc($input, 1);
+        $this->assertEquals("éeé", $after, 'Test E');
         // Trunc with no ...
-        $input="éeéeéeàa";
-        $after=dol_trunc($input,3,'right','UTF-8',1);
-        $this->assertEquals("éeé",$after,'Test F');
-        $after=dol_trunc($input,2,'right','UTF-8',1);
-        $this->assertEquals("ée",$after,'Test G');
-        $input="éeé";
-        $after=dol_trunc($input,3,'right','UTF-8',1);
-        $this->assertEquals("éeé",$after,'Test H');
-        $after=dol_trunc($input,2,'right','UTF-8',1);
-        $this->assertEquals("ée",$after,'Test I');
-        $after=dol_trunc($input,1,'right','UTF-8',1);
-        $this->assertEquals("é",$after,'Test J');
-        $input="éeéeéeàa";
-        $after=dol_trunc($input,4,'middle');
-        $this->assertEquals("ée...àa",$after,'Test K');
+        $input = "éeéeéeàa";
+        $after = dol_trunc($input, 3, 'right', 'UTF-8', 1);
+        $this->assertEquals("éeé", $after, 'Test F');
+        $after = dol_trunc($input, 2, 'right', 'UTF-8', 1);
+        $this->assertEquals("ée", $after, 'Test G');
+        $input = "éeé";
+        $after = dol_trunc($input, 3, 'right', 'UTF-8', 1);
+        $this->assertEquals("éeé", $after, 'Test H');
+        $after = dol_trunc($input, 2, 'right', 'UTF-8', 1);
+        $this->assertEquals("ée", $after, 'Test I');
+        $after = dol_trunc($input, 1, 'right', 'UTF-8', 1);
+        $this->assertEquals("é", $after, 'Test J');
+        $input = "éeéeéeàa";
+        $after = dol_trunc($input, 4, 'middle');
+        $this->assertEquals("ée...àa", $after, 'Test K');
 
         return true;
     }
@@ -740,49 +740,49 @@ 
     {
     	global $conf;
 
-    	$savtz=date_default_timezone_get();
+    	$savtz = date_default_timezone_get();
 
 		// Some test for UTC TZ
     	date_default_timezone_set('UTC');
 
     	// Check bad hours
-        $result=dol_mktime(25,0,0,1,1,1970,1,1);    // Error (25 hours)
+        $result = dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1); // Error (25 hours)
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('',$result);
-        $result=dol_mktime(2,61,0,1,1,1970,1,1);    // Error (61 minutes)
+        $this->assertEquals('', $result);
+        $result = dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1); // Error (61 minutes)
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('',$result);
-        $result=dol_mktime(2,1,61,1,1,1970,1,1);    // Error (61 seconds)
+        $this->assertEquals('', $result);
+        $result = dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1); // Error (61 seconds)
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('',$result);
-        $result=dol_mktime(2,1,1,1,32,1970,1,1);    // Error (day 32)
+        $this->assertEquals('', $result);
+        $result = dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1); // Error (day 32)
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('',$result);
-        $result=dol_mktime(2,1,1,13,1,1970,1,1);    // Error (month 13)
+        $this->assertEquals('', $result);
+        $result = dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1); // Error (month 13)
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('',$result);
+        $this->assertEquals('', $result);
 
-        $result=dol_mktime(2,1,1,1,1,1970,1);    // 1970-01-01 02:01:01 in GMT area -> 7261
+        $result = dol_mktime(2, 1, 1, 1, 1, 1970, 1); // 1970-01-01 02:01:01 in GMT area -> 7261
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(7261,$result);
+        $this->assertEquals(7261, $result);
 
-        $result=dol_mktime(2,0,0,1,1,1970,0);                // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+        $result = dol_mktime(2, 0, 0, 1, 1, 1970, 0); // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
         print __METHOD__." result=".$result."\n";
-        $tz=getServerTimeZoneInt('winter');                  // +1 in Europe/Paris at this time (this time is winter)
-        $this->assertEquals(7200-($tz*3600),$result);        // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
+        $tz = getServerTimeZoneInt('winter'); // +1 in Europe/Paris at this time (this time is winter)
+        $this->assertEquals(7200 - ($tz * 3600), $result); // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
 
         // Some test for local TZ Europe/Paris
         date_default_timezone_set('Europe/Paris');
 
         // Check that tz for paris in winter is used
-        $result=dol_mktime(2,0,0,1,1,1970,'server');         // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+        $result = dol_mktime(2, 0, 0, 1, 1, 1970, 'server'); // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(3600,$result);        			 // 7200 if we are at greenwich winter, 3600 at Europe/Paris
+        $this->assertEquals(3600, $result); // 7200 if we are at greenwich winter, 3600 at Europe/Paris
 
         // Check that daylight saving time is used
-        $result=dol_mktime(2,0,0,6,1,2014,0);         		// 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
+        $result = dol_mktime(2, 0, 0, 6, 1, 2014, 0); // 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1401588000-3600-3600,$result);  // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
+        $this->assertEquals(1401588000 - 3600 - 3600, $result); // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
 
         date_default_timezone_set($savtz);
     }
@@ -795,15 +795,15 @@ 
      */
     public function testDolEscapeJs()
     {
-        $input="x&<b>#</b>,\"'";    // " will be converted into '
-        $result=dol_escape_js($input);
-        $this->assertEquals("x&<b>#</b>,\'\'",$result,"Test mode=0");
+        $input = "x&<b>#</b>,\"'"; // " will be converted into '
+        $result = dol_escape_js($input);
+        $this->assertEquals("x&<b>#</b>,\'\'", $result, "Test mode=0");
 
-        $result=dol_escape_js($input,1);
-        $this->assertEquals("x&<b>#</b>,\"\'",$result,"Test mode=1");
+        $result = dol_escape_js($input, 1);
+        $this->assertEquals("x&<b>#</b>,\"\'", $result, "Test mode=1");
 
-        $result=dol_escape_js($input,2);
-        $this->assertEquals("x&<b>#</b>,\\\"'",$result,"Test mode=2");
+        $result = dol_escape_js($input, 2);
+        $this->assertEquals("x&<b>#</b>,\\\"'", $result, "Test mode=2");
     }
 
 
@@ -814,13 +814,13 @@ 
     */
     public function testDolEscapeHtmlTag()
     {
-        $input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
-        $result=dol_escape_htmltag($input);
-        $this->assertEquals('x&amp;#,&quot;',$result);
+        $input = 'x&<b>#</b>,"'; // & and " are converted into html entities, <b> are removed
+        $result = dol_escape_htmltag($input);
+        $this->assertEquals('x&amp;#,&quot;', $result);
 
-        $input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are not removed
-        $result=dol_escape_htmltag($input,1);
-        $this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;',$result);
+        $input = 'x&<b>#</b>,"'; // & and " are converted into html entities, <b> are not removed
+        $result = dol_escape_htmltag($input, 1);
+        $this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
     }
 
 
@@ -831,30 +831,30 @@ 
      */
     public function testDolFormatAddress()
     {
-    	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;
 
-		$object=new Societe($db);
+		$object = new Societe($db);
 		$object->initAsSpecimen();
 
-		$object->country_code='FR';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\n99999 MyTown",$address);
+		$object->country_code = 'FR';
+    	$address = dol_format_address($object);
+    	$this->assertEquals("21 jump street\n99999 MyTown", $address);
 
-		$object->country_code='GB';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\nMyTown, MyState\n99999",$address);
+		$object->country_code = 'GB';
+    	$address = dol_format_address($object);
+    	$this->assertEquals("21 jump street\nMyTown, MyState\n99999", $address);
 
-		$object->country_code='US';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
+		$object->country_code = 'US';
+    	$address = dol_format_address($object);
+    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
 
-		$object->country_code='AU';
-    	$address=dol_format_address($object);
-    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999",$address);
+		$object->country_code = 'AU';
+    	$address = dol_format_address($object);
+    	$this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
     }
 
 
@@ -865,29 +865,29 @@ 
      */
     public function testDolPrintPhone()
     {
-        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;
 
-        $object=new Societe($db);
+        $object = new Societe($db);
         $object->initAsSpecimen();
 
-        $object->country_code='FR';
-        $phone=dol_print_phone('1234567890', $object->country_code);
+        $object->country_code = 'FR';
+        $phone = dol_print_phone('1234567890', $object->country_code);
         $this->assertEquals('<span style="margin-right: 10px;">12&nbsp;34&nbsp;56&nbsp;78&nbsp;90</span>', $phone, 'Phone for FR 1');
 
-        $object->country_code='FR';
-        $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, '');
+        $object->country_code = 'FR';
+        $phone = dol_print_phone('1234567890', $object->country_code, 0, 0, 0, '');
         $this->assertEquals('<span style="margin-right: 10px;">1234567890</span>', $phone, 'Phone for FR 2');
 
-        $object->country_code='FR';
-        $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
+        $object->country_code = 'FR';
+        $phone = dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
         $this->assertEquals('<span style="margin-right: 10px;">12 34 56 78 90</span>', $phone, 'Phone for FR 3');
 
-        $object->country_code='CA';
-        $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
+        $object->country_code = 'CA';
+        $phone = dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
         $this->assertEquals('<span style="margin-right: 10px;">(123) 456-7890</span>', $phone, 'Phone for CA 1');
     }
 
@@ -899,26 +899,26 @@ 
      */
     public function testImgPicto()
     {
-        $s=img_picto('title','user');
+        $s = img_picto('title', 'user');
         print __METHOD__." s=".$s."\n";
-        $this->assertContains('theme',$s,'testImgPicto1');
+        $this->assertContains('theme', $s, 'testImgPicto1');
 
-    	$s=img_picto('title','img.png','style="float: right"',0);
+    	$s = img_picto('title', 'img.png', 'style="float: right"', 0);
         print __METHOD__." s=".$s."\n";
-        $this->assertContains('theme',$s,'testImgPicto2');
-        $this->assertContains('style="float: right"',$s,'testImgPicto2');
+        $this->assertContains('theme', $s, 'testImgPicto2');
+        $this->assertContains('style="float: right"', $s, 'testImgPicto2');
 
-        $s=img_picto('title', '/fullpath/img.png', '', 1);
+        $s = img_picto('title', '/fullpath/img.png', '', 1);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">',$s,'testImgPicto3');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto3');
 
-        $s=img_picto('title', '/fullpath/img.png', '', true);
+        $s = img_picto('title', '/fullpath/img.png', '', true);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">',$s,'testImgPicto4');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto4');
 
-        $s=img_picto('title', 'delete', '', 0, 1);
+        $s = img_picto('title', 'delete', '', 0, 1);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals(DOL_URL_ROOT.'/theme/eldy/img/delete.png',$s,'testImgPicto5');
+        $this->assertEquals(DOL_URL_ROOT.'/theme/eldy/img/delete.png', $s, 'testImgPicto5');
     }
 
     /**
@@ -928,10 +928,10 @@ 
      */
     public function testDolNow()
     {
-        $now=dol_now('gmt');
-        $nowtzserver=dol_now('tzserver');
-        print __METHOD__." getServerTimeZoneInt=".(getServerTimeZoneInt('now')*3600)."\n";
-        $this->assertEquals(getServerTimeZoneInt('now')*3600,($nowtzserver-$now));
+        $now = dol_now('gmt');
+        $nowtzserver = dol_now('tzserver');
+        print __METHOD__." getServerTimeZoneInt=".(getServerTimeZoneInt('now') * 3600)."\n";
+        $this->assertEquals(getServerTimeZoneInt('now') * 3600, ($nowtzserver - $now));
     }
 
     /**
@@ -941,19 +941,19 @@ 
      */
     public function testVerifCond()
     {
-        $verifcond=verifCond('1==1');
-        $this->assertTrue($verifcond,'Test a true comparison');
+        $verifcond = verifCond('1==1');
+        $this->assertTrue($verifcond, 'Test a true comparison');
 
-        $verifcond=verifCond('1==2');
-        $this->assertFalse($verifcond,'Test a false comparison');
+        $verifcond = verifCond('1==2');
+        $this->assertFalse($verifcond, 'Test a false comparison');
 
-        $verifcond=verifCond('$conf->facture->enabled');
-        $this->assertTrue($verifcond,'Test that conf property of a module report true when enabled');
+        $verifcond = verifCond('$conf->facture->enabled');
+        $this->assertTrue($verifcond, 'Test that conf property of a module report true when enabled');
 
-        $verifcond=verifCond('$conf->moduledummy->enabled');
-        $this->assertFalse($verifcond,'Test that conf property of a module report false when disabled');
+        $verifcond = verifCond('$conf->moduledummy->enabled');
+        $this->assertFalse($verifcond, 'Test that conf property of a module report false when disabled');
 
-        $verifcond=verifCond('');
+        $verifcond = verifCond('');
         $this->assertTrue($verifcond);
     }
 
@@ -964,76 +964,76 @@ 
      */
     public function testGetDefaultTva()
     {
-        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;
 
         // Sellers
-        $companyfrnovat=new Societe($db);
-        $companyfrnovat->country_code='FR';
-        $companyfrnovat->tva_assuj=0;
+        $companyfrnovat = new Societe($db);
+        $companyfrnovat->country_code = 'FR';
+        $companyfrnovat->tva_assuj = 0;
 
-        $companyfr=new Societe($db);
-        $companyfr->country_code='FR';
-        $companyfr->tva_assuj=1;
-		$companyfr->tva_intra='FR9999';
+        $companyfr = new Societe($db);
+        $companyfr->country_code = 'FR';
+        $companyfr->tva_assuj = 1;
+		$companyfr->tva_intra = 'FR9999';
 
         // Buyers
-        $companymc=new Societe($db);
-        $companymc->country_code='MC';
-        $companymc->tva_assuj=1;
-		$companyfr->tva_intra='MC9999';
+        $companymc = new Societe($db);
+        $companymc->country_code = 'MC';
+        $companymc->tva_assuj = 1;
+		$companyfr->tva_intra = 'MC9999';
 
-        $companyit=new Societe($db);
-        $companyit->country_code='IT';
-        $companyit->tva_assuj=1;
-        $companyit->tva_intra='IT99999';
+        $companyit = new Societe($db);
+        $companyit->country_code = 'IT';
+        $companyit->tva_assuj = 1;
+        $companyit->tva_intra = 'IT99999';
 
-        $companyde=new Societe($db);
-        $companyde->country_code='DE';
-        $companyde->tva_assuj=1;
-        $companyde->tva_intra='DE99999';
+        $companyde = new Societe($db);
+        $companyde->country_code = 'DE';
+        $companyde->tva_assuj = 1;
+        $companyde->tva_intra = 'DE99999';
 
-        $notcompanyde=new Societe($db);
-        $notcompanyde->country_code='DE';
-        $notcompanyde->tva_assuj=0;
-        $notcompanyde->tva_intra='';
-        $notcompanyde->typent_code='TE_PRIVATE';
+        $notcompanyde = new Societe($db);
+        $notcompanyde->country_code = 'DE';
+        $notcompanyde->tva_assuj = 0;
+        $notcompanyde->tva_intra = '';
+        $notcompanyde->typent_code = 'TE_PRIVATE';
 
-        $companyus=new Societe($db);
-        $companyus->country_code='US';
-        $companyus->tva_assuj=1;
-        $companyus->tva_intra='';
+        $companyus = new Societe($db);
+        $companyus->country_code = 'US';
+        $companyus->tva_assuj = 1;
+        $companyus->tva_intra = '';
 
 
         // Test RULE 0 (FR-DE)
         // Not tested
 
         // Test RULE 1
-        $vat=get_default_tva($companyfrnovat,$companymc,0);
-        $this->assertEquals(0,$vat,'RULE 1');
+        $vat = get_default_tva($companyfrnovat, $companymc, 0);
+        $this->assertEquals(0, $vat, 'RULE 1');
 
         // Test RULE 2 (FR-FR)
-        $vat=get_default_tva($companyfr,$companyfr,0);
-        $this->assertEquals(20,$vat,'RULE 2');
+        $vat = get_default_tva($companyfr, $companyfr, 0);
+        $this->assertEquals(20, $vat, 'RULE 2');
 
         // Test RULE 2 (FR-MC)
-        $vat=get_default_tva($companyfr,$companymc,0);
-        $this->assertEquals(20,$vat,'RULE 2');
+        $vat = get_default_tva($companyfr, $companymc, 0);
+        $this->assertEquals(20, $vat, 'RULE 2');
 
         // Test RULE 3 (FR-DE company)
-        $vat=get_default_tva($companyfr,$companyit,0);
-        $this->assertEquals(0,$vat,'RULE 3');
+        $vat = get_default_tva($companyfr, $companyit, 0);
+        $this->assertEquals(0, $vat, 'RULE 3');
 
         // Test RULE 4 (FR-DE not a company)
-        $vat=get_default_tva($companyfr,$notcompanyde,0);
-        $this->assertEquals(20,$vat,'RULE 4');
+        $vat = get_default_tva($companyfr, $notcompanyde, 0);
+        $this->assertEquals(20, $vat, 'RULE 4');
 
         // Test RULE 5 (FR-US)
-        $vat=get_default_tva($companyfr,$companyus,0);
-        $this->assertEquals(0,$vat,'RULE 5');
+        $vat = get_default_tva($companyfr, $companyus, 0);
+        $this->assertEquals(0, $vat, 'RULE 5');
 
 
         // We do same tests but with option SERVICE_ARE_ECOMMERCE_200238EC on.
@@ -1041,24 +1041,24 @@ 
 
 
         // Test RULE 1 (FR-US)
-        $vat=get_default_tva($companyfr,$companyus,0);
-        $this->assertEquals(0,$vat,'RULE 1 ECOMMERCE_200238EC');
+        $vat = get_default_tva($companyfr, $companyus, 0);
+        $this->assertEquals(0, $vat, 'RULE 1 ECOMMERCE_200238EC');
 
         // Test RULE 2 (FR-FR)
-        $vat=get_default_tva($companyfr,$companyfr,0);
-        $this->assertEquals(20,$vat,'RULE 2 ECOMMERCE_200238EC');
+        $vat = get_default_tva($companyfr, $companyfr, 0);
+        $this->assertEquals(20, $vat, 'RULE 2 ECOMMERCE_200238EC');
 
         // Test RULE 3 (FR-DE company)
-        $vat=get_default_tva($companyfr,$companyde,0);
-        $this->assertEquals(0,$vat,'RULE 3 ECOMMERCE_200238EC');
+        $vat = get_default_tva($companyfr, $companyde, 0);
+        $this->assertEquals(0, $vat, 'RULE 3 ECOMMERCE_200238EC');
 
         // Test RULE 4 (FR-DE not a company)
-        $vat=get_default_tva($companyfr,$notcompanyde,0);
-        $this->assertEquals(19,$vat,'RULE 4 ECOMMERCE_200238EC');
+        $vat = get_default_tva($companyfr, $notcompanyde, 0);
+        $this->assertEquals(19, $vat, 'RULE 4 ECOMMERCE_200238EC');
 
         // Test RULE 5 (FR-US)
-        $vat=get_default_tva($companyfr,$companyus,0);
-        $this->assertEquals(0,$vat,'RULE 5 ECOMMERCE_200238EC');
+        $vat = get_default_tva($companyfr, $companyus, 0);
+        $this->assertEquals(0, $vat, 'RULE 5 ECOMMERCE_200238EC');
     }
 
     /**
@@ -1068,84 +1068,84 @@ 
      */
     public function testGetDefaultLocalTax()
     {
-    	global $conf,$user,$langs,$db;
-    	$this->savconf=$conf;
-    	$this->savuser=$user;
-    	$this->savlangs=$langs;
-    	$this->savdb=$db;
-
-    	$companyfrnovat=new Societe($db);
-    	$companyfrnovat->country_code='FR';
-    	$companyfrnovat->tva_assuj=0;
-    	$companyfrnovat->localtax1_assuj=0;
-    	$companyfrnovat->localtax2_assuj=0;
-
-    	$companyes=new Societe($db);
-    	$companyes->country_code='ES';
-    	$companyes->tva_assuj=1;
-    	$companyes->localtax1_assuj=1;
-    	$companyes->localtax2_assuj=1;
-
-    	$companymc=new Societe($db);
-    	$companymc->country_code='MC';
-    	$companymc->tva_assuj=1;
-    	$companymc->localtax1_assuj=0;
-    	$companymc->localtax2_assuj=0;
-
-    	$companyit=new Societe($db);
-    	$companyit->country_code='IT';
-    	$companyit->tva_assuj=1;
-    	$companyit->tva_intra='IT99999';
-    	$companyit->localtax1_assuj=0;
-    	$companyit->localtax2_assuj=0;
-
-    	$notcompanyit=new Societe($db);
-    	$notcompanyit->country_code='IT';
-    	$notcompanyit->tva_assuj=1;
-    	$notcompanyit->tva_intra='';
-    	$notcompanyit->typent_code='TE_PRIVATE';
-    	$notcompanyit->localtax1_assuj=0;
-    	$notcompanyit->localtax2_assuj=0;
-
-    	$companyus=new Societe($db);
-    	$companyus->country_code='US';
-    	$companyus->tva_assuj=1;
-    	$companyus->tva_intra='';
-    	$companyus->localtax1_assuj=0;
-    	$companyus->localtax2_assuj=0;
+    	global $conf, $user, $langs, $db;
+    	$this->savconf = $conf;
+    	$this->savuser = $user;
+    	$this->savlangs = $langs;
+    	$this->savdb = $db;
+
+    	$companyfrnovat = new Societe($db);
+    	$companyfrnovat->country_code = 'FR';
+    	$companyfrnovat->tva_assuj = 0;
+    	$companyfrnovat->localtax1_assuj = 0;
+    	$companyfrnovat->localtax2_assuj = 0;
+
+    	$companyes = new Societe($db);
+    	$companyes->country_code = 'ES';
+    	$companyes->tva_assuj = 1;
+    	$companyes->localtax1_assuj = 1;
+    	$companyes->localtax2_assuj = 1;
+
+    	$companymc = new Societe($db);
+    	$companymc->country_code = 'MC';
+    	$companymc->tva_assuj = 1;
+    	$companymc->localtax1_assuj = 0;
+    	$companymc->localtax2_assuj = 0;
+
+    	$companyit = new Societe($db);
+    	$companyit->country_code = 'IT';
+    	$companyit->tva_assuj = 1;
+    	$companyit->tva_intra = 'IT99999';
+    	$companyit->localtax1_assuj = 0;
+    	$companyit->localtax2_assuj = 0;
+
+    	$notcompanyit = new Societe($db);
+    	$notcompanyit->country_code = 'IT';
+    	$notcompanyit->tva_assuj = 1;
+    	$notcompanyit->tva_intra = '';
+    	$notcompanyit->typent_code = 'TE_PRIVATE';
+    	$notcompanyit->localtax1_assuj = 0;
+    	$notcompanyit->localtax2_assuj = 0;
+
+    	$companyus = new Societe($db);
+    	$companyus->country_code = 'US';
+    	$companyus->tva_assuj = 1;
+    	$companyus->tva_intra = '';
+    	$companyus->localtax1_assuj = 0;
+    	$companyus->localtax2_assuj = 0;
 
     	// Test RULE FR-MC
-    	$vat1=get_default_localtax($companyfrnovat,$companymc,1,0);
-    	$vat2=get_default_localtax($companyfrnovat,$companymc,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
+    	$vat1 = get_default_localtax($companyfrnovat, $companymc, 1, 0);
+    	$vat2 = get_default_localtax($companyfrnovat, $companymc, 2, 0);
+    	$this->assertEquals(0, $vat1);
+    	$this->assertEquals(0, $vat2);
 
     	// Test RULE ES-ES
-    	$vat1=get_default_localtax($companyes,$companyes,1,0);
-    	$vat2=get_default_localtax($companyes,$companyes,2,0);
+    	$vat1 = get_default_localtax($companyes, $companyes, 1, 0);
+    	$vat2 = get_default_localtax($companyes, $companyes, 2, 0);
     	$this->assertEquals($vat1, 5.2);
-    	$this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
+    	$this->assertStringStartsWith((string) $vat2, '-19:-15:-9'); // Can be -19 (old version) or '-19:-15:-9' (new setup)
 
     	// Test RULE ES-IT
-    	$vat1=get_default_localtax($companyes,$companyit,1,0);
-    	$vat2=get_default_localtax($companyes,$companyit,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
+    	$vat1 = get_default_localtax($companyes, $companyit, 1, 0);
+    	$vat2 = get_default_localtax($companyes, $companyit, 2, 0);
+    	$this->assertEquals(0, $vat1);
+    	$this->assertEquals(0, $vat2);
 
     	// Test RULE ES-IT
-    	$vat1=get_default_localtax($companyes,$notcompanyit,1,0);
-    	$vat2=get_default_localtax($companyes,$notcompanyit,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
+    	$vat1 = get_default_localtax($companyes, $notcompanyit, 1, 0);
+    	$vat2 = get_default_localtax($companyes, $notcompanyit, 2, 0);
+    	$this->assertEquals(0, $vat1);
+    	$this->assertEquals(0, $vat2);
 
     	// Test RULE FR-IT
     	// Not tested
 
     	// Test RULE ES-US
-    	$vat1=get_default_localtax($companyes,$companyus,1,0);
-    	$vat2=get_default_localtax($companyes,$companyus,2,0);
-    	$this->assertEquals(0,$vat1);
-    	$this->assertEquals(0,$vat2);
+    	$vat1 = get_default_localtax($companyes, $companyus, 1, 0);
+    	$vat2 = get_default_localtax($companyes, $companyus, 2, 0);
+    	$this->assertEquals(0, $vat1);
+    	$this->assertEquals(0, $vat2);
     }
 
 
@@ -1156,11 +1156,11 @@ 
      */
     public function testDolExplodeIntoArray()
     {
-    	$stringtoexplode='AA=B/B.CC=.EE=FF.HH=GG;.';
-    	$tmp=dolExplodeIntoArray($stringtoexplode,'.','=');
+    	$stringtoexplode = 'AA=B/B.CC=.EE=FF.HH=GG;.';
+    	$tmp = dolExplodeIntoArray($stringtoexplode, '.', '=');
 
         print __METHOD__." tmp=".json_encode($tmp)."\n";
-        $this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}',json_encode($tmp));
+        $this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}', json_encode($tmp));
     }
 
 	/**
@@ -1194,22 +1194,22 @@ 
 	public function testDolPrice2Num()
 	{
 		$this->assertEquals(1000, price2num('1 000.0'));
-		$this->assertEquals(1000, price2num('1 000','MT'));
-		$this->assertEquals(1000, price2num('1 000','MU'));
+		$this->assertEquals(1000, price2num('1 000', 'MT'));
+		$this->assertEquals(1000, price2num('1 000', 'MU'));
 
 		$this->assertEquals(1000.123456, price2num('1 000.123456'));
 
 		// Round down
-		$this->assertEquals(1000.12, price2num('1 000.123452','MT'));
-		$this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU");
+		$this->assertEquals(1000.12, price2num('1 000.123452', 'MT'));
+		$this->assertEquals(1000.12345, price2num('1 000.123452', 'MU'), "Test MU");
 
 		// Round up
-		$this->assertEquals(1000.13, price2num('1 000.125456','MT'));
-		$this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU");
+		$this->assertEquals(1000.13, price2num('1 000.125456', 'MT'));
+		$this->assertEquals(1000.12546, price2num('1 000.125456', 'MU'), "Test MU");
 
 		// Text can't be converted
-		$this->assertEquals('12.4$',price2num('12.4$'));
-		$this->assertEquals('12r.4$',price2num('12r.4$'));
+		$this->assertEquals('12.4$', price2num('12.4$'));
+		$this->assertEquals('12r.4$', price2num('12r.4$'));
 
 		return true;
 	}
@@ -1225,18 +1225,18 @@ 
 
 		$conf->global->MAIN_START_WEEK = 0;
 
-		$tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(4, $tmp['wday']);
 
-		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
+		$tmp = dol_getdate(24 * 60 * 60 + 1); // 2/1/1970 and 1 second = friday
 		$this->assertEquals(5, $tmp['wday']);
 
 		$conf->global->MAIN_START_WEEK = 1;
 
-		$tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(4, $tmp['wday']);
 
-		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
+		$tmp = dol_getdate(24 * 60 * 60 + 1); // 2/1/1970 and 1 second = friday
 		$this->assertEquals(5, $tmp['wday']);
 
 		return true;
@@ -1253,8 +1253,8 @@ 
 		global $conf, $langs;
 		$langs->load("main");
 
-		$substit=array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
-		$chaine='This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
+		$substit = array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
+		$chaine = 'This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
 		$newstring = make_substitutions($chaine, $substit);
 		$this->assertEquals($newstring, 'This is a string with eldy and ltr and __C replaced__');
 

Braces +33 added lines, -10 removed lines

@@ -30,16 +30,39 @@
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.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)
 
 /**
  * Class for PHPUnit tests

dolibarr/test/phpunit/GetUrlLibTest.php

Indentation +98 added lines, -98 removed lines

@@ -32,9 +32,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;
 
@@ -48,123 +48,123 @@ 
  */
 class GetUrlLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FilesLibTest
-	 */
-	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 FilesLibTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
-	/**
+    /**
      * testGetRootURLFromURL
      *
      * @return	int
      */
     public function testGetRootURLFromURL()
     {
-    	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=getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result,'Test 1');
+        $result=getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('http://www.dolimed.com',$result,'Test 1');
 
-		$result=getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result,'Test 2');
+        $result=getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('https://www.dolimed.com',$result,'Test 2');
 
-		$result=getRootURLFromURL('http://www.dolimed.com/screenshots');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result);
+        $result=getRootURLFromURL('http://www.dolimed.com/screenshots');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('http://www.dolimed.com',$result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com/screenshots');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result);
+        $result=getRootURLFromURL('https://www.dolimed.com/screenshots');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('https://www.dolimed.com',$result);
 
-		$result=getRootURLFromURL('http://www.dolimed.com/');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result);
+        $result=getRootURLFromURL('http://www.dolimed.com/');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('http://www.dolimed.com',$result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com/');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result);
+        $result=getRootURLFromURL('https://www.dolimed.com/');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('https://www.dolimed.com',$result);
 
-		$result=getRootURLFromURL('http://www.dolimed.com');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result);
+        $result=getRootURLFromURL('http://www.dolimed.com');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('http://www.dolimed.com',$result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result);
+        $result=getRootURLFromURL('https://www.dolimed.com');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('https://www.dolimed.com',$result);
 
-		return 1;
+        return 1;
     }
 
 
@@ -175,20 +175,20 @@ 
      */
     public function testRemoveHtmlComment()
     {
-    	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=removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('abcdef',$result,'Test 1');
+        $result=removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('abcdef',$result,'Test 1');
 
-    	$result=removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('abcbbdef',$result,'Test 1');
+        $result=removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('abcbbdef',$result,'Test 1');
 
-    	return 1;
+        return 1;
     }
 }

Spacing +45 added lines, -45 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -64,11 +64,11 @@ 
     	parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -78,8 +78,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";
     }
@@ -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";
     }
@@ -126,43 +126,43 @@ 
      */
     public function testGetRootURLFromURL()
     {
-    	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=getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
+		$result = getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result,'Test 1');
+		$this->assertEquals('http://www.dolimed.com', $result, 'Test 1');
 
-		$result=getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
+		$result = getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result,'Test 2');
+		$this->assertEquals('https://www.dolimed.com', $result, 'Test 2');
 
-		$result=getRootURLFromURL('http://www.dolimed.com/screenshots');
+		$result = getRootURLFromURL('http://www.dolimed.com/screenshots');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result);
+		$this->assertEquals('http://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com/screenshots');
+		$result = getRootURLFromURL('https://www.dolimed.com/screenshots');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result);
+		$this->assertEquals('https://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('http://www.dolimed.com/');
+		$result = getRootURLFromURL('http://www.dolimed.com/');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result);
+		$this->assertEquals('http://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com/');
+		$result = getRootURLFromURL('https://www.dolimed.com/');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result);
+		$this->assertEquals('https://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('http://www.dolimed.com');
+		$result = getRootURLFromURL('http://www.dolimed.com');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('http://www.dolimed.com',$result);
+		$this->assertEquals('http://www.dolimed.com', $result);
 
-		$result=getRootURLFromURL('https://www.dolimed.com');
+		$result = getRootURLFromURL('https://www.dolimed.com');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('https://www.dolimed.com',$result);
+		$this->assertEquals('https://www.dolimed.com', $result);
 
 		return 1;
     }
@@ -175,19 +175,19 @@ 
      */
     public function testRemoveHtmlComment()
     {
-    	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=removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
+    	$result = removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('abcdef',$result,'Test 1');
+    	$this->assertEquals('abcdef', $result, 'Test 1');
 
-    	$result=removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
+    	$result = removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('abcbbdef',$result,'Test 1');
+    	$this->assertEquals('abcbbdef', $result, 'Test 1');
 
     	return 1;
     }

dolibarr/test/phpunit/WebservicesUserTest.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 testWSUserGetUser()
     {
-        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_user.php';
         $WS_METHOD  = 'getUser';
-        $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='';
-        $parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'admin');
+        $result = '';
+        $parameters = array('authentication'=>$authentication, 'id'=>0, 'ref'=>'admin');
         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";
@@ -184,16 +184,16 @@ 
         $this->assertEquals('OK', $result['result']['result_code'], 'Test on ref admin');
 
         // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'refthatdoesnotexists');
+        $result = '';
+        $parameters = array('authentication'=>$authentication, 'id'=>0, 'ref'=>'refthatdoesnotexists');
         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/WebservicesProductsTest.php

Indentation +4 added lines, -4 removed lines

@@ -44,8 +44,8 @@ 
 
 if (empty($conf->service->enabled))
 {
-	print "Error: Module service must be enabled.\n";
-	exit(1);
+    print "Error: Module service must be enabled.\n";
+    exit(1);
 }
 
 /**
@@ -70,9 +70,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

Spacing +62 added lines, -62 removed lines

@@ -25,12 +25,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)) {
@@ -38,9 +38,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';
 
 if (empty($conf->service->enabled))
 {
@@ -73,11 +73,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;
@@ -87,7 +87,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";
@@ -95,7 +95,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -108,11 +108,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";
     }
@@ -135,28 +135,28 @@ 
      */
     public function testWSProductsCreateProductOrService()
     {
-        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;
 
-        $datestring=dol_print_date(dol_now(),'dayhourlog');
+        $datestring = dol_print_date(dol_now(), 'dayhourlog');
 
         $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
         $WS_METHOD  = 'createProductOrService';
-        $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',
@@ -165,9 +165,9 @@ 
         );
 
         // Test URL
-        $result='';
+        $result = '';
         $parameters = array(
-            'authentication'=>$authentication,'product'=>array(
+            'authentication'=>$authentication, 'product'=>array(
                 'ref'=>'NewProductFromWS'.$datestring,
                 'label'=>'New Product From WS '.$datestring,
                 'type'=>1,
@@ -178,12 +178,12 @@ 
         );
         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']) || $result['result']['result_code'] != 'OK') {
+        if (!$result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
             //var_dump($soapclient);
             print $soapclient->error_str;
             print "\n<br>\n";
@@ -194,7 +194,7 @@ 
         }
 
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('OK', $result['result']['result_code']);
 
         return $result['id'];
     }
@@ -209,26 +209,26 @@ 
      */
     public function testWSProductsGetProductOrService($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;
 
         $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
         $WS_METHOD  = 'getProductOrService';
-        $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',
@@ -237,16 +237,16 @@ 
         );
 
         // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>'');
+        $result = '';
+        $parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'');
         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";
@@ -257,7 +257,7 @@ 
         }
 
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('OK', $result['result']['result_code']);
 
         return $id;
     }
@@ -272,26 +272,26 @@ 
      */
     public function testWSProductsDeleteProductOrService($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;
 
         $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
         $WS_METHOD  = 'deleteProductOrService';
-        $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',
@@ -300,16 +300,16 @@ 
         );
 
         // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'listofid'=>$id);
+        $result = '';
+        $parameters = array('authentication'=>$authentication, 'listofid'=>$id);
         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']) || $result['result']['result_code'] != 'OK') {
+        if (!$result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
             //var_dump($soapclient);
             print $soapclient->error_str;
             print "\n<br>\n";
@@ -320,7 +320,7 @@ 
         }
 
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('OK', $result['result']['result_code']);
 
         return 0;
     }

dolibarr/test/phpunit/ChargeSocialesTest.php

Indentation +103 added lines, -103 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 ChargeSocialesTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ChargeSocialesTest
-	 */
-	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 ChargeSocialesTest
+     */
+    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,19 +124,19 @@ 
      */
     public function testChargeSocialesCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user,$langs,$conf);
-    	print __METHOD__." 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 ChargeSociales($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user,$langs,$conf);
+        print __METHOD__." result=".$result."\n";
+
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
     /**
@@ -150,18 +150,18 @@ 
      */
     public function testChargeSocialesFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($this->savdb);
-    	$result=$localobject->fetch($id);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new ChargeSociales($this->savdb);
+        $result=$localobject->fetch($id);
+        print __METHOD__." id=".$id." result=".$result."\n";
+
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
@@ -175,17 +175,17 @@ 
      */
     public function testChargeSocialesValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->set_paid($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->set_paid($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
@@ -213,7 +213,7 @@ 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThanOrEqual($result, 0);
 
-    	return $localobject->id;
+        return $localobject->id;
     }
 
     /**
@@ -227,18 +227,18 @@ 
      */
     public function testChargeSocialesDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
-
-		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 ChargeSociales($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($id);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +52 added lines, -52 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 testChargeSocialesCreate()
     {
-    	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 ChargeSociales($this->savdb);
+		$localobject = new ChargeSociales($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user,$langs,$conf);
+    	$result = $localobject->create($user, $langs, $conf);
     	print __METHOD__." result=".$result."\n";
 
     	$this->assertLessThan($result, 0);
@@ -150,14 +150,14 @@ 
      */
     public function testChargeSocialesFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($this->savdb);
-    	$result=$localobject->fetch($id);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new ChargeSociales($this->savdb);
+    	$result = $localobject->fetch($id);
     	print __METHOD__." id=".$id." result=".$result."\n";
 
     	$this->assertLessThan($result, 0);
@@ -175,13 +175,13 @@ 
      */
     public function testChargeSocialesValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-    	$result=$localobject->set_paid($user);
+    	$result = $localobject->set_paid($user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
     	$this->assertLessThan($result, 0);
@@ -199,17 +199,17 @@ 
      */
     public function testChargeSocialesOther($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->getNomUrl(1);
+        $result = $localobject->getNomUrl(1);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertNotEquals($result, '');
 
-        $result=$localobject->getSommePaiement();
+        $result = $localobject->getSommePaiement();
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThanOrEqual($result, 0);
 
@@ -227,15 +227,15 @@ 
      */
     public function testChargeSocialesDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new ChargeSociales($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new ChargeSociales($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/ScriptsTest.php

Indentation +126 added lines, -126 removed lines

@@ -59,75 +59,75 @@ 
  */
 class ScriptsTest 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()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -137,20 +137,20 @@ 
      */
     public function testBank()
     {
-    	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;
 
-		$script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
-		$result=exec($script, $output, $returnvar);
+        $script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
+        $result=exec($script, $output, $returnvar);
 
-		print __METHOD__." result=".$result."\n";
-		print __METHOD__." output=".join("\n",$output)."\n";
-		print __METHOD__." returnvar=".$returnvar."\n";
-		$this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
-		$this->assertEquals($returnvar,255);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
+        $this->assertEquals($returnvar,255);
 
         return $result;
     }
@@ -163,13 +163,13 @@ 
      */
     public function testCompany()
     {
-    	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;
 
-		/*
+        /*
 		$script=dirname(__FILE__).'/../../scripts/company/sync_contacts_dolibarr_2ldap now';
 		$result=exec($script, $output, $returnvar);
 
@@ -190,34 +190,34 @@ 
      */
     public function testContracts()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_expire_services_to_customers.php thirdparties');
-
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_expire_services_to_customers.php contacts');
-
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_expire_services_to_representatives.php');
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
+        $result=exec($script, $output, $returnvar);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($returnvar,0,'email_expire_services_to_customers.php thirdparties');
+
+        $script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
+        $result=exec($script, $output, $returnvar);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($returnvar,0,'email_expire_services_to_customers.php contacts');
+
+        $script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
+        $result=exec($script, $output, $returnvar);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($returnvar,0,'email_expire_services_to_representatives.php');
+
+        return $result;
     }
 
     /**
@@ -228,33 +228,33 @@ 
      */
     public function testInvoices()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php thirdparties');
-
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php contacts');
-
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php thirdparties');
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
+        $result=exec($script, $output, $returnvar);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php thirdparties');
+
+        $script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
+        $result=exec($script, $output, $returnvar);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php contacts');
+
+        $script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
+        $result=exec($script, $output, $returnvar);
+        print __METHOD__." result=".$result."\n";
+        print __METHOD__." output=".join("\n",$output)."\n";
+        print __METHOD__." returnvar=".$returnvar."\n";
+        $this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php thirdparties');
+
+        return $result;
     }
 }

Spacing +76 added lines, -76 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,20 +137,20 @@ 
      */
     public function testBank()
     {
-    	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;
 
-		$script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
-		$result=exec($script, $output, $returnvar);
+		$script = dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
+		$result = exec($script, $output, $returnvar);
 
 		print __METHOD__." result=".$result."\n";
-		print __METHOD__." output=".join("\n",$output)."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
-		$this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
-		$this->assertEquals($returnvar,255);
+		$this->assertEquals($result, 'Failed to find bank account with ref BANKDUMMY.');
+		$this->assertEquals($returnvar, 255);
 
         return $result;
     }
@@ -163,11 +163,11 @@ 
      */
     public function testCompany()
     {
-    	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;
 
 		/*
 		$script=dirname(__FILE__).'/../../scripts/company/sync_contacts_dolibarr_2ldap now';
@@ -190,32 +190,32 @@ 
      */
     public function testContracts()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
+
+    	$script = dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
+    	$result = exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." output=".join("\n", $output)."\n";
     	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_expire_services_to_customers.php thirdparties');
+    	$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php thirdparties');
 
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
-    	$result=exec($script, $output, $returnvar);
+    	$script = dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
+    	$result = exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." output=".join("\n", $output)."\n";
     	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_expire_services_to_customers.php contacts');
+    	$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php contacts');
 
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
-    	$result=exec($script, $output, $returnvar);
+    	$script = dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
+    	$result = exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." output=".join("\n", $output)."\n";
     	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_expire_services_to_representatives.php');
+    	$this->assertEquals($returnvar, 0, 'email_expire_services_to_representatives.php');
 
     	return $result;
     }
@@ -228,32 +228,32 @@ 
      */
     public function testInvoices()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
+
+    	$script = dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
+    	$result = exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." output=".join("\n", $output)."\n";
     	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php thirdparties');
+    	$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
 
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
-    	$result=exec($script, $output, $returnvar);
+    	$script = dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
+    	$result = exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." output=".join("\n", $output)."\n";
     	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php contacts');
+    	$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php contacts');
 
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
+    	$script = dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
+    	$result = exec($script, $output, $returnvar);
     	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." output=".join("\n", $output)."\n";
     	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar,0,'email_unpaid_invoices_to_customers.php thirdparties');
+    	$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
 
     	return $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))
 {