alxarafe / alixar

dolibarr/test/phpunit/XCalLibTest.php

Indentation +3 added lines, -3 removed lines

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

Spacing +25 added lines, -25 removed lines

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

dolibarr/test/phpunit/DateLibTzFranceTest.php

Indentation +116 added lines, -116 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,79 +47,79 @@ 
  */
 class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        parent::__construct();
 
-    	if (getServerTimeZoneString() != 'Europe/Paris') {
-    		print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\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";
+    }
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+
+        if (getServerTimeZoneString() != 'Europe/Paris') {
+            print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
+        }
 
-    	print __METHOD__."\n";
+        $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";
     }
 
     /**
@@ -139,66 +139,66 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-    	// Check %Y-%m-%d %H:%M:%S format
+        // Check %Y-%m-%d %H:%M:%S format
         $result=dol_print_date(0,'%Y-%m-%d %H:%M:%S',false);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 01:00:00',$result);
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1970-01-01 01:00:00',$result);
 
-    	// Check %Y-%m-%d %H:%M:%S format
+        // Check %Y-%m-%d %H:%M:%S format
         $result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',false);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 01:00:00',$result);
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 01:00:00',$result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
-
-    	// Specific cas during war
-
-    	// 1940, no timezone
-    	$result=dol_print_date(-946771200,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1940-01-01 01:00:00',$result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
-
-    	// 1941, timezone is added by germany to +2 (same for 1942)
-    	$result=dol_print_date(-915148800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1941-01-01 01:00:00',$result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
-
-    	// 1943, timezone is +1
-    	$result=dol_print_date(-852076800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1943-01-01 01:00:00',$result);
-
-    	// test with negative timezone
-    	$result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:59:59',$result);
-
-    	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('fr_FR');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'dayhour',false,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 01:00',$result);
-
-    	// Check day format for en_US
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('en_US');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'day',false,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970',$result);
-
-    	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b',false,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan',$result);
-
-    	return $result;
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('2500-01-01 01:00:00',$result);
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1912-01-01 01:00:00',$result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
+
+        // Specific cas during war
+
+        // 1940, no timezone
+        $result=dol_print_date(-946771200,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1940-01-01 01:00:00',$result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
+
+        // 1941, timezone is added by germany to +2 (same for 1942)
+        $result=dol_print_date(-915148800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1941-01-01 01:00:00',$result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
+
+        // 1943, timezone is +1
+        $result=dol_print_date(-852076800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1943-01-01 01:00:00',$result);
+
+        // test with negative timezone
+        $result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1970-01-01 00:59:59',$result);
+
+        // Check dayhour format for fr_FR
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('fr_FR');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'dayhour',false,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('02/01/1970 01:00',$result);
+
+        // Check day format for en_US
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('en_US');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'day',false,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('01/02/1970',$result);
+
+        // Check %a and %b format for en_US
+        $result=dol_print_date(0,'%a %b',false,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('Thu Jan',$result);
+
+        return $result;
     }
 }

Spacing +42 added lines, -42 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,13 +77,13 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 
     	if (getServerTimeZoneString() != 'Europe/Paris') {
     		print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
     	}
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+    	$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -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,71 +133,71 @@ 
      */
     public function testDolPrintDateTzFrance()
     {
-        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;
 
     	// Check %Y-%m-%d %H:%M:%S format
-        $result=dol_print_date(0,'%Y-%m-%d %H:%M:%S',false);
+        $result = dol_print_date(0, '%Y-%m-%d %H:%M:%S', false);
        	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 01:00:00',$result);
+    	$this->assertEquals('1970-01-01 01:00:00', $result);
 
     	// Check %Y-%m-%d %H:%M:%S format
-        $result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',false);
+        $result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', false);
        	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 01:00:00',$result);
+    	$this->assertEquals('2500-01-01 01:00:00', $result);
 
     	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', false); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 01:00:00',$result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
+    	$this->assertEquals('1912-01-01 01:00:00', $result); // dol_print_date use a timezone, not epoch converter as it did not exists this year
 
     	// Specific cas during war
 
     	// 1940, no timezone
-    	$result=dol_print_date(-946771200,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-946771200, '%Y-%m-%d %H:%M:%S', false); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1940-01-01 01:00:00',$result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
+    	$this->assertEquals('1940-01-01 01:00:00', $result); //  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
 
     	// 1941, timezone is added by germany to +2 (same for 1942)
-    	$result=dol_print_date(-915148800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-915148800, '%Y-%m-%d %H:%M:%S', false); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1941-01-01 01:00:00',$result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
+    	$this->assertEquals('1941-01-01 01:00:00', $result); // dol_print_date use a modern timezone, epoch converter use historic timezone
 
     	// 1943, timezone is +1
-    	$result=dol_print_date(-852076800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-852076800, '%Y-%m-%d %H:%M:%S', false); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1943-01-01 01:00:00',$result);
+    	$this->assertEquals('1943-01-01 01:00:00', $result);
 
     	// test with negative timezone
-    	$result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', false); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:59:59',$result);
+    	$this->assertEquals('1970-01-01 00:59:59', $result);
 
     	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('',$conf);
+    	$outputlangs = new Translate('', $conf);
     	$outputlangs->setDefaultLang('fr_FR');
     	$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600,'dayhour',false,$outputlangs);
+    	$result = dol_print_date(0 + 24 * 3600, 'dayhour', false, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 01:00',$result);
+    	$this->assertEquals('02/01/1970 01:00', $result);
 
     	// Check day format for en_US
-    	$outputlangs=new Translate('',$conf);
+    	$outputlangs = new Translate('', $conf);
     	$outputlangs->setDefaultLang('en_US');
     	$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600,'day',false,$outputlangs);
+    	$result = dol_print_date(0 + 24 * 3600, 'day', false, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970',$result);
+    	$this->assertEquals('01/02/1970', $result);
 
     	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b',false,$outputlangs);
+    	$result = dol_print_date(0, '%a %b', false, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan',$result);
+    	$this->assertEquals('Thu Jan', $result);
 
     	return $result;
     }

dolibarr/test/phpunit/DateLibTest.php

Indentation +189 added lines, -189 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 DateLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
 
-    	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,49 +124,49 @@ 
      */
     public function testNumBetweenDay()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		// With same hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2012);
+        // With same hours
+        $date1=dol_mktime(0, 0, 0, 1, 1, 2012);
+        $date2=dol_mktime(0, 0, 0, 1, 2, 2012);
 
-		$result=num_between_day($date1,$date2,1);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2,$result);
+        $result=num_between_day($date1,$date2,1);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(2,$result);
 
-		$result=num_between_day($date1,$date2,0);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1,$result);
+        $result=num_between_day($date1,$date2,0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(1,$result);
 
-		// With different hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
-		$date2=dol_mktime(12, 0, 0, 1, 2, 2012);
+        // With different hours
+        $date1=dol_mktime(0, 0, 0, 1, 1, 2012);
+        $date2=dol_mktime(12, 0, 0, 1, 2, 2012);
 
-		$result=num_between_day($date1,$date2,1);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2,$result);
+        $result=num_between_day($date1,$date2,1);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(2,$result);
 
-		$result=num_between_day($date1,$date2,0);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1,$result);
+        $result=num_between_day($date1,$date2,0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(1,$result);
 
-		// With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
-		$date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
-		$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
+        // With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
+        $date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
+        $date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
 
-		$result=num_between_day($date1,$date2,1);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(4,$result);
+        $result=num_between_day($date1,$date2,1);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(4,$result);
 
-		$result=num_between_day($date1,$date2,0);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3,$result);
+        $result=num_between_day($date1,$date2,0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(3,$result);
 
-		return $result;
+        return $result;
     }
 
     /**
@@ -272,17 +272,17 @@ 
      */
     public function testConvertTime2Seconds()
     {
-    	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=convertTime2Seconds(1,1,2);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3662,$result);
+        $result=convertTime2Seconds(1,1,2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(3662,$result);
 
-		return $result;
+        return $result;
     }
 
     /**
@@ -292,22 +292,22 @@ 
      */
     public function testConvertSecondToTime()
     {
-    	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=convertSecondToTime(0,'all',86400);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0',$result);
+        $result=convertSecondToTime(0,'all',86400);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('0',$result);
 
-		$result=convertSecondToTime(86400,'all',86400);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertSame('1 '.$langs->trans("Day"),$result);
+        $result=convertSecondToTime(86400,'all',86400);
+        print __METHOD__." result=".$result."\n";
+        $this->assertSame('1 '.$langs->trans("Day"),$result);
 
 
-		return $result;
+        return $result;
     }
 
     /**
@@ -323,60 +323,60 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-    	// Check %Y-%m-%d %H:%M:%S format
+        // Check %Y-%m-%d %H:%M:%S format
         $result=dol_print_date(0,'%Y-%m-%d %H:%M:%S',true);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:00:00',$result);
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 00:00:00',$result);
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 00:00:00',$result);	// dol_print_date use TZ (good) but epoch converter does not use it.
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-11676096000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1600-01-01 00:00:00',$result);
-
-    	// test with negative timezone
-    	$result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1969-12-31 23:59:59',$result);
-
-    	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('fr_FR');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'dayhour',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 00:00',$result);
-
-    	// Check %a and %b format for fr_FR
-    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Jeu Jan. Janvier',$result);
-
-    	// Check day format for en_US
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('en_US');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'day',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970',$result);
-
-    	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan January',$result);
-
-    	return $result;
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1970-01-01 00:00:00',$result);
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('2500-01-01 00:00:00',$result);
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1912-01-01 00:00:00',$result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(-11676096000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1600-01-01 00:00:00',$result);
+
+        // test with negative timezone
+        $result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1969-12-31 23:59:59',$result);
+
+        // Check dayhour format for fr_FR
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('fr_FR');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'dayhour',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('02/01/1970 00:00',$result);
+
+        // Check %a and %b format for fr_FR
+        $result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('Jeu Jan. Janvier',$result);
+
+        // Check day format for en_US
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('en_US');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'day',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('01/02/1970',$result);
+
+        // Check %a and %b format for en_US
+        $result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('Thu Jan January',$result);
+
+        return $result;
     }
 
     /**
@@ -398,10 +398,10 @@ 
         $outputlangs->load("main");
 
         $result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0,1,'m'),1,'y'),1,'d'),'dayhour',true,$outputlangs);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/02/1971 00:00',$result);
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('02/02/1971 00:00',$result);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -417,30 +417,30 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-		$stime='19700102';
-		$result=dol_stringtotime($stime);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(86400,$result);
+        $stime='19700102';
+        $result=dol_stringtotime($stime);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(86400,$result);
 
-		$stime='1970-01-01T02:00:00Z';
+        $stime='1970-01-01T02:00:00Z';
         $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
         $stime='1970-01-01 02:00:00';
         $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
         $stime='19700101T020000Z';
         $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
-		$stime='19700101020000';
-		$result=dol_stringtotime($stime);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        $stime='19700101020000';
+        $result=dol_stringtotime($stime);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
         return $result;
     }
@@ -452,16 +452,16 @@ 
      */
     public function testDolGetFirstDayWeek()
     {
-    	global $conf;
+        global $conf;
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 1;	// start on monday
-   		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
+        $day=3; $month=2; $year=2015;
+        $conf->global->MAIN_START_WEEK = 1;	// start on monday
+            $prev = dol_get_first_day_week($day, $month, $year);
+        $this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 0;	// start on sunday
-   		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
+        $day=3; $month=2; $year=2015;
+        $conf->global->MAIN_START_WEEK = 0;	// start on sunday
+            $prev = dol_get_first_day_week($day, $month, $year);
+        $this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
     }
 }

Spacing +161 added lines, -161 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,47 +124,47 @@ 
      */
     public function testNumBetweenDay()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// With same hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2012);
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2012);
+		$date2 = dol_mktime(0, 0, 0, 1, 2, 2012);
 
-		$result=num_between_day($date1,$date2,1);
+		$result = num_between_day($date1, $date2, 1);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2,$result);
+		$this->assertEquals(2, $result);
 
-		$result=num_between_day($date1,$date2,0);
+		$result = num_between_day($date1, $date2, 0);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1,$result);
+		$this->assertEquals(1, $result);
 
 		// With different hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
-		$date2=dol_mktime(12, 0, 0, 1, 2, 2012);
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2012);
+		$date2 = dol_mktime(12, 0, 0, 1, 2, 2012);
 
-		$result=num_between_day($date1,$date2,1);
+		$result = num_between_day($date1, $date2, 1);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2,$result);
+		$this->assertEquals(2, $result);
 
-		$result=num_between_day($date1,$date2,0);
+		$result = num_between_day($date1, $date2, 0);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1,$result);
+		$this->assertEquals(1, $result);
 
 		// With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
-		$date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
-		$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
+		$date1 = dol_mktime(0, 0, 0, 3, 28, 2014, true);
+		$date2 = dol_mktime(0, 0, 0, 3, 31, 2014, true);
 
-		$result=num_between_day($date1,$date2,1);
+		$result = num_between_day($date1, $date2, 1);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(4,$result);
+		$this->assertEquals(4, $result);
 
-		$result=num_between_day($date1,$date2,0);
+		$result = num_between_day($date1, $date2, 0);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3,$result);
+		$this->assertEquals(3, $result);
 
 		return $result;
     }
@@ -176,55 +176,55 @@ 
      */
     public function testNumPublicHoliday()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         // With same hours - Tuesday/Wednesday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
+        $date1 = dol_mktime(0, 0, 0, 1, 1, 2013);
+        $date2 = dol_mktime(0, 0, 0, 1, 2, 2013);
 
-        $result=num_public_holiday($date1,$date2,'FR',1);
+        $result = num_public_holiday($date1, $date2, 'FR', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1,$result,'NumPublicHoliday for Tuesday/Wednesday jan 2013 for FR');   // 1 closed days
+        $this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday/Wednesday jan 2013 for FR'); // 1 closed days
 
-        $result=num_public_holiday($date1,$date2,'XX',1);
+        $result = num_public_holiday($date1, $date2, 'XX', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0,$result,'NumPublicHoliday for Tuesday/Wednesday jan 2013 for XX');   // no closed days (country unknown)
+        $this->assertEquals(0, $result, 'NumPublicHoliday for Tuesday/Wednesday jan 2013 for XX'); // no closed days (country unknown)
 
         // With same hours - Friday/Sunday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
+        $date1 = dol_mktime(0, 0, 0, 1, 4, 2013);
+        $date2 = dol_mktime(0, 0, 0, 1, 6, 2013);
 
-        $result=num_public_holiday($date1,$date2,'FR',1);
+        $result = num_public_holiday($date1, $date2, 'FR', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2,$result,'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+        $this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
-        $result=num_public_holiday($date1,$date2,'XX',1);
+        $result = num_public_holiday($date1, $date2, 'XX', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2,$result,'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
+        $this->assertEquals(2, $result, 'NumPublicHoliday for XX'); // 1 opened day, 2 closed days (even if country unknown)
 
-        $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS='12-13,2019-12-14';
+        $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS = '12-13,2019-12-14';
 
-        $date1=dol_mktime(0, 0, 0, 12, 13, 2018);
-        $date2=dol_mktime(0, 0, 0, 12, 13, 2018);
-        $result=num_public_holiday($date1,$date2,'YY',1);
+        $date1 = dol_mktime(0, 0, 0, 12, 13, 2018);
+        $date2 = dol_mktime(0, 0, 0, 12, 13, 2018);
+        $result = num_public_holiday($date1, $date2, 'YY', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1,$result,'NumPublicHoliday for YY the 2018-12-13');   // 0 opened day, 1 closed days (even if country unknown)
+        $this->assertEquals(1, $result, 'NumPublicHoliday for YY the 2018-12-13'); // 0 opened day, 1 closed days (even if country unknown)
 
-        $date1=dol_mktime(0, 0, 0, 12, 14, 2018);
-        $date2=dol_mktime(0, 0, 0, 12, 14, 2018);
-        $result=num_public_holiday($date1,$date2,'YY',1);
+        $date1 = dol_mktime(0, 0, 0, 12, 14, 2018);
+        $date2 = dol_mktime(0, 0, 0, 12, 14, 2018);
+        $result = num_public_holiday($date1, $date2, 'YY', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0,$result,'NumPublicHoliday for YY the 2018-12-14');   // 1 opened day, 0 closed days (even if country unknown)
+        $this->assertEquals(0, $result, 'NumPublicHoliday for YY the 2018-12-14'); // 1 opened day, 0 closed days (even if country unknown)
 
-        $date1=dol_mktime(0, 0, 0, 12, 14, 2019);
-        $date2=dol_mktime(0, 0, 0, 12, 14, 2019);
-        $result=num_public_holiday($date1,$date2,'YY',1);
+        $date1 = dol_mktime(0, 0, 0, 12, 14, 2019);
+        $date2 = dol_mktime(0, 0, 0, 12, 14, 2019);
+        $result = num_public_holiday($date1, $date2, 'YY', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1,$result,'NumPublicHoliday for YY the 2019-12-14');   // 0 opened day, 1 closed days (even if country unknown)
+        $this->assertEquals(1, $result, 'NumPublicHoliday for YY the 2019-12-14'); // 0 opened day, 1 closed days (even if country unknown)
     }
 
     /**
@@ -234,35 +234,35 @@ 
      */
     public function testNumOpenDay()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         // With same hours - Tuesday/Wednesday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
+        $date1 = dol_mktime(0, 0, 0, 1, 1, 2013);
+        $date2 = dol_mktime(0, 0, 0, 1, 2, 2013);
 
-        $result=num_open_day($date1,$date2,0,1,0,'FR');
+        $result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1,$result,'NumOpenDay Tuesday/Wednesday jan 2013 for FR');   // 1 opened days
+        $this->assertEquals(1, $result, 'NumOpenDay Tuesday/Wednesday jan 2013 for FR'); // 1 opened days
 
-        $result=num_open_day($date1,$date2,0,1,0,'XX');
+        $result = num_open_day($date1, $date2, 0, 1, 0, 'XX');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2,$result,'NumOpenDay Tuesday/Wednesday jan 2013 for XX');   // 2 opened days (country unknown)
+        $this->assertEquals(2, $result, 'NumOpenDay Tuesday/Wednesday jan 2013 for XX'); // 2 opened days (country unknown)
 
         // With same hours - Friday/Sunday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
+        $date1 = dol_mktime(0, 0, 0, 1, 4, 2013);
+        $date2 = dol_mktime(0, 0, 0, 1, 6, 2013);
 
-        $result=num_open_day($date1,$date2,0,1,0,'FR');
+        $result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1,$result,'NumOpenDay for FR');   // 1 opened day, 2 closed
+        $this->assertEquals(1, $result, 'NumOpenDay for FR'); // 1 opened day, 2 closed
 
-        $result=num_open_day($date1,$date2,'XX',1);
+        $result = num_open_day($date1, $date2, 'XX', 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1,$result,'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
+        $this->assertEquals(1, $result, 'NumOpenDay for XX'); // 1 opened day, 2 closes (even if country unknown)
     }
 
     /**
@@ -272,15 +272,15 @@ 
      */
     public function testConvertTime2Seconds()
     {
-    	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=convertTime2Seconds(1,1,2);
+		$result = convertTime2Seconds(1, 1, 2);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3662,$result);
+		$this->assertEquals(3662, $result);
 
 		return $result;
     }
@@ -292,19 +292,19 @@ 
      */
     public function testConvertSecondToTime()
     {
-    	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=convertSecondToTime(0,'all',86400);
+		$result = convertSecondToTime(0, 'all', 86400);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0',$result);
+		$this->assertEquals('0', $result);
 
-		$result=convertSecondToTime(86400,'all',86400);
+		$result = convertSecondToTime(86400, 'all', 86400);
     	print __METHOD__." result=".$result."\n";
-		$this->assertSame('1 '.$langs->trans("Day"),$result);
+		$this->assertSame('1 '.$langs->trans("Day"), $result);
 
 
 		return $result;
@@ -317,64 +317,64 @@ 
      */
     public function testDolPrintDate()
     {
-        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;
 
     	// Check %Y-%m-%d %H:%M:%S format
-        $result=dol_print_date(0,'%Y-%m-%d %H:%M:%S',true);
+        $result = dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
        	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:00:00',$result);
+    	$this->assertEquals('1970-01-01 00:00:00', $result);
 
     	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+    	$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 00:00:00',$result);
+    	$this->assertEquals('2500-01-01 00:00:00', $result);
 
     	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 00:00:00',$result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+    	$this->assertEquals('1912-01-01 00:00:00', $result); // dol_print_date use TZ (good) but epoch converter does not use it.
 
     	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-11676096000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1600-01-01 00:00:00',$result);
+    	$this->assertEquals('1600-01-01 00:00:00', $result);
 
     	// test with negative timezone
-    	$result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+    	$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1969-12-31 23:59:59',$result);
+    	$this->assertEquals('1969-12-31 23:59:59', $result);
 
     	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('',$conf);
+    	$outputlangs = new Translate('', $conf);
     	$outputlangs->setDefaultLang('fr_FR');
     	$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600,'dayhour',true,$outputlangs);
+    	$result = dol_print_date(0 + 24 * 3600, 'dayhour', true, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 00:00',$result);
+    	$this->assertEquals('02/01/1970 00:00', $result);
 
     	// Check %a and %b format for fr_FR
-    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+    	$result = dol_print_date(0, '%a %b %B', true, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Jeu Jan. Janvier',$result);
+    	$this->assertEquals('Jeu Jan. Janvier', $result);
 
     	// Check day format for en_US
-    	$outputlangs=new Translate('',$conf);
+    	$outputlangs = new Translate('', $conf);
     	$outputlangs->setDefaultLang('en_US');
     	$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600,'day',true,$outputlangs);
+    	$result = dol_print_date(0 + 24 * 3600, 'day', true, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970',$result);
+    	$this->assertEquals('01/02/1970', $result);
 
     	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+    	$result = dol_print_date(0, '%a %b %B', true, $outputlangs);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan January',$result);
+    	$this->assertEquals('Thu Jan January', $result);
 
     	return $result;
     }
@@ -386,20 +386,20 @@ 
      */
     public function testDolTimePlusDuree()
     {
-        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;
 
         // Check dayhour format for fr_FR
-        $outputlangs=new Translate('',$conf);
+        $outputlangs = new Translate('', $conf);
         $outputlangs->setDefaultLang('fr_FR');
         $outputlangs->load("main");
 
-        $result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0,1,'m'),1,'y'),1,'d'),'dayhour',true,$outputlangs);
+        $result = dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
        	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/02/1971 00:00',$result);
+    	$this->assertEquals('02/02/1971 00:00', $result);
 
     	return $result;
     }
@@ -411,36 +411,36 @@ 
      */
     public function testDolStringToTime()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-		$stime='19700102';
-		$result=dol_stringtotime($stime);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+		$stime = '19700102';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(86400,$result);
+		$this->assertEquals(86400, $result);
 
-		$stime='1970-01-01T02:00:00Z';
-        $result=dol_stringtotime($stime);
+		$stime = '1970-01-01T02:00:00Z';
+        $result = dol_stringtotime($stime);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+		$this->assertEquals(7200, $result);
 
-        $stime='1970-01-01 02:00:00';
-        $result=dol_stringtotime($stime);
+        $stime = '1970-01-01 02:00:00';
+        $result = dol_stringtotime($stime);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+		$this->assertEquals(7200, $result);
 
-        $stime='19700101T020000Z';
-        $result=dol_stringtotime($stime);
+        $stime = '19700101T020000Z';
+        $result = dol_stringtotime($stime);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+		$this->assertEquals(7200, $result);
 
-		$stime='19700101020000';
-		$result=dol_stringtotime($stime);
+		$stime = '19700101020000';
+		$result = dol_stringtotime($stime);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+		$this->assertEquals(7200, $result);
 
         return $result;
     }
@@ -454,14 +454,14 @@ 
     {
     	global $conf;
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 1;	// start on monday
+    	$day = 3; $month = 2; $year = 2015;
+    	$conf->global->MAIN_START_WEEK = 1; // start on monday
    		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
+		$this->assertEquals(2, (int) $prev['first_day']); // monday for month 2, year 2014 is the 2
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 0;	// start on sunday
+    	$day = 3; $month = 2; $year = 2015;
+    	$conf->global->MAIN_START_WEEK = 0; // start on sunday
    		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
+		$this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st
     }
 }

dolibarr/test/phpunit/EntrepotTest.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,78 +47,78 @@ 
  */
 class EntrepotTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return EntrepotTest
-	 */
-	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 EntrepotTest
+     */
+    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;
+        global $conf,$user,$langs,$db;
 
-    	if (empty($conf->stock->enabled)) { print __METHOD__." Module Stock must be enabled.\n"; die(); }
+        if (empty($conf->stock->enabled)) { print __METHOD__." Module Stock must be enabled.\n"; die(); }
 
         $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";
     }
 
     /**
@@ -128,20 +128,20 @@ 
      */
     public function testEntrepotCreate()
     {
-    	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 Entrepot($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Entrepot($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -155,18 +155,18 @@ 
      */
     public function testEntrepotFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Entrepot($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 Entrepot($this->savdb);
+        $result=$localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
@@ -180,18 +180,18 @@ 
      */
     public function testEntrepotUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->note='New note after update';
-    	$result=$localobject->update($localobject->id,$user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->note='New note after update';
+        $result=$localobject->update($localobject->id,$user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        return $localobject;
     }
 
     /**
@@ -205,11 +205,11 @@ 
      */
     public function testEntrepotOther($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;
 
 
         return $localobject->id;
@@ -226,20 +226,20 @@ 
      */
     public function testEntrepotDelete($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 Entrepot($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Entrepot($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$result=$localobject->delete($user);
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $result=$localobject->delete($user);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**

Spacing +57 added lines, -57 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,11 +77,11 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 
     	if (empty($conf->stock->enabled)) { print __METHOD__." Module Stock must be enabled.\n"; die(); }
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -89,7 +89,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -102,11 +102,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -128,15 +128,15 @@ 
      */
     public function testEntrepotCreate()
     {
-    	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 Entrepot($this->savdb);
+		$localobject = new Entrepot($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThanOrEqual($result, 0);
@@ -155,14 +155,14 @@ 
      */
     public function testEntrepotFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Entrepot($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 Entrepot($this->savdb);
+    	$result = $localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
@@ -180,14 +180,14 @@ 
      */
     public function testEntrepotUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->note='New note after update';
-    	$result=$localobject->update($localobject->id,$user);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject->note = 'New note after update';
+    	$result = $localobject->update($localobject->id, $user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
@@ -205,11 +205,11 @@ 
      */
     public function testEntrepotOther($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;
 
 
         return $localobject->id;
@@ -226,16 +226,16 @@ 
      */
     public function testEntrepotDelete($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 Entrepot($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Entrepot($this->savdb);
+    	$result = $localobject->fetch($id);
 
-    	$result=$localobject->delete($user);
+    	$result = $localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
@@ -249,13 +249,13 @@ 
      */
     public function testEntrepotStatic()
     {
-        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 Entrepot($db);
+        $localobject = new Entrepot($db);
 
         return;
     }

dolibarr/test/phpunit/SocieteTest.php

Indentation +9 added lines, -9 removed lines

@@ -60,9 +60,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -180,7 +180,7 @@ 
      *
      * @param   Societe $localobject    Company
      * @return  Societe $localobject    Company
-    *
+     *
      * @depends testSocieteFetch
      * The depends says test is run only if previous is ok
      */
@@ -213,13 +213,13 @@ 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-		$result=$localobject->update_note($localobject->note_private,'_private');
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
+        $result=$localobject->update_note($localobject->note_private,'_private');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
 
-		$result=$localobject->update_note($localobject->note_public, '_public');
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
+        $result=$localobject->update_note($localobject->note_public, '_public');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
         $newobject=new Societe($this->savdb);
         $result=$newobject->fetch($localobject->id);

Spacing +133 added lines, -133 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,13 +77,13 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
         if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); }
 
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(); }
+        if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(); }
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
     }
@@ -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";
     }
@@ -130,15 +130,15 @@ 
      */
     public function testSocieteCreate()
     {
-        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 Societe($this->savdb);
+        $localobject = new Societe($this->savdb);
         $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
         $this->assertLessThanOrEqual($result, 0);
@@ -157,18 +157,18 @@ 
      */
     public function testSocieteFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new Societe($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 Societe($this->savdb);
+        $result = $localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-        $result=$localobject->verify();
+        $result = $localobject->verify();
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertEquals($result, 0);
 
@@ -186,43 +186,43 @@ 
      */
     public function testSocieteUpdate($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject->note_private='New private note after update';
-        $localobject->note_public='New public note after update';
-        $localobject->name='New name';
-        $localobject->address='New address';
-        $localobject->zip='New zip';
-        $localobject->town='New town';
-        $localobject->country_id=2;
-        $localobject->status=0;
-        $localobject->phone='New tel';
-        $localobject->fax='New fax';
-        $localobject->email='newemail@newemail.com';
-        $localobject->url='New url';
-        $localobject->idprof1='new idprof1';
-        $localobject->idprof2='new idprof2';
-        $localobject->idprof3='new idprof3';
-        $localobject->idprof4='new idprof4';
-
-        $result=$localobject->update($localobject->id,$user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject->note_private = 'New private note after update';
+        $localobject->note_public = 'New public note after update';
+        $localobject->name = 'New name';
+        $localobject->address = 'New address';
+        $localobject->zip = 'New zip';
+        $localobject->town = 'New town';
+        $localobject->country_id = 2;
+        $localobject->status = 0;
+        $localobject->phone = 'New tel';
+        $localobject->fax = 'New fax';
+        $localobject->email = 'newemail@newemail.com';
+        $localobject->url = 'New url';
+        $localobject->idprof1 = 'new idprof1';
+        $localobject->idprof2 = 'new idprof2';
+        $localobject->idprof3 = 'new idprof3';
+        $localobject->idprof4 = 'new idprof4';
+
+        $result = $localobject->update($localobject->id, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-		$result=$localobject->update_note($localobject->note_private,'_private');
+		$result = $localobject->update_note($localobject->note_private, '_private');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
 
-		$result=$localobject->update_note($localobject->note_public, '_public');
+		$result = $localobject->update_note($localobject->note_public, '_public');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
-        $newobject=new Societe($this->savdb);
-        $result=$newobject->fetch($localobject->id);
+        $newobject = new Societe($this->savdb);
+        $result = $newobject->fetch($localobject->id);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -259,42 +259,42 @@ 
     public function testIdProfCheck($localobject)
     {
         // OK FR
-        $localobject->country_code='FR';
-        $localobject->idprof1=493861496;
-        $localobject->idprof2=49386149600021;
-        $result=$localobject->id_prof_check(1,$localobject);    // Must be > 0
+        $localobject->country_code = 'FR';
+        $localobject->idprof1 = 493861496;
+        $localobject->idprof2 = 49386149600021;
+        $result = $localobject->id_prof_check(1, $localobject); // Must be > 0
         print __METHOD__." OK FR idprof1 result=".$result."\n";
         $this->assertGreaterThanOrEqual(1, $result);
-        $result=$localobject->id_prof_check(2,$localobject);    // Must be > 0
+        $result = $localobject->id_prof_check(2, $localobject); // Must be > 0
         print __METHOD__." OK FR idprof2 result=".$result."\n";
         $this->assertGreaterThanOrEqual(1, $result);
 
         // KO FR
-        $localobject->country_code='FR';
-        $localobject->idprof1='id1ko';
-        $localobject->idprof2='id2ko';
-        $result=$localobject->id_prof_check(1,$localobject);    // Must be <= 0
+        $localobject->country_code = 'FR';
+        $localobject->idprof1 = 'id1ko';
+        $localobject->idprof2 = 'id2ko';
+        $result = $localobject->id_prof_check(1, $localobject); // Must be <= 0
         print __METHOD__." KO FR idprof1 result=".$result."\n";
         $this->assertLessThan(1, $result);
-        $result=$localobject->id_prof_check(2,$localobject);    // Must be <= 0
+        $result = $localobject->id_prof_check(2, $localobject); // Must be <= 0
         print __METHOD__." KO FR idprof2 result=".$result."\n";
         $this->assertLessThan(1, $result);
 
         // KO ES
-        $localobject->country_code='ES';
-        $localobject->idprof1='id1ko';
-        $result=$localobject->id_prof_check(1,$localobject);    // Must be <= 0
+        $localobject->country_code = 'ES';
+        $localobject->idprof1 = 'id1ko';
+        $result = $localobject->id_prof_check(1, $localobject); // Must be <= 0
         print __METHOD__." KO ES idprof1 result=".$result."\n";
         $this->assertLessThan(1, $result);
 
         // OK AR
-        $localobject->country_code='AR';
-        $localobject->idprof1='id1ko';
-        $localobject->idprof2='id2ko';
-        $result=$localobject->id_prof_check(1,$localobject);    // Must be > 0
+        $localobject->country_code = 'AR';
+        $localobject->idprof1 = 'id1ko';
+        $localobject->idprof2 = 'id2ko';
+        $result = $localobject->id_prof_check(1, $localobject); // Must be > 0
         print __METHOD__." OK AR idprof1 result=".$result."\n";
         $this->assertGreaterThanOrEqual(0, $result);
-        $result=$localobject->id_prof_check(2,$localobject);    // Must be > 0
+        $result = $localobject->id_prof_check(2, $localobject); // Must be > 0
         print __METHOD__." OK AR idprof2 result=".$result."\n";
         $this->assertGreaterThanOrEqual(1, $result);
 
@@ -313,29 +313,29 @@ 
      */
     public function testSocieteOther($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_as_client();
+        $result = $localobject->set_as_client();
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-        $result=$localobject->set_price_level(1,$user);
+        $result = $localobject->set_price_level(1, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-        $result=$localobject->set_remise_client(10,'Gift',$user);
+        $result = $localobject->set_remise_client(10, 'Gift', $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-        $result=$localobject->getNomUrl(1);
+        $result = $localobject->getNomUrl(1);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertNotEquals($result, '');
 
-        $result=$localobject->isInEEC();
+        $result = $localobject->isInEEC();
         print __METHOD__." id=".$localobject->id." country_code=".$localobject->country_code." result=".$result."\n";
         $this->assertTrue(true, $result);
 
@@ -358,16 +358,16 @@ 
      */
     public function testSocieteDelete($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 Societe($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Societe($this->savdb);
+        $result = $localobject->fetch($id);
 
-        $result=$localobject->delete($id, $user);
+        $result = $localobject->delete($id, $user);
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
@@ -381,13 +381,13 @@ 
      */
     public function testSocieteStatic()
     {
-        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 Societe($db);
+        $localobject = new Societe($db);
 
 
         return;
@@ -401,57 +401,57 @@ 
      */
     public function testSocieteGetFullAddress()
     {
-        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;
 
-        $localobjectadd=new Societe($db);
+        $localobjectadd = new Societe($db);
         $localobjectadd->initAsSpecimen();
 
         // France
         unset($localobjectadd->country_code);
-        $localobjectadd->country_id=1;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
+        $localobjectadd->country_id = 1;
+        $localobjectadd->name = 'New name';
+        $localobjectadd->address = 'New address';
+        $localobjectadd->zip = 'New zip';
+        $localobjectadd->town = 'New town';
+        $result = $localobjectadd->getFullAddress(1);
         print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
         $this->assertContains("New address\nNew zip New town\nFrance", $result);
 
         // Belgium
         unset($localobjectadd->country_code);
-        $localobjectadd->country_id=2;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
+        $localobjectadd->country_id = 2;
+        $localobjectadd->name = 'New name';
+        $localobjectadd->address = 'New address';
+        $localobjectadd->zip = 'New zip';
+        $localobjectadd->town = 'New town';
+        $result = $localobjectadd->getFullAddress(1);
         print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
         $this->assertContains("New address\nNew zip New town\nBelgium", $result);
 
         // Switzerland
         unset($localobjectadd->country_code);
-        $localobjectadd->country_id=6;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
+        $localobjectadd->country_id = 6;
+        $localobjectadd->name = 'New name';
+        $localobjectadd->address = 'New address';
+        $localobjectadd->zip = 'New zip';
+        $localobjectadd->town = 'New town';
+        $result = $localobjectadd->getFullAddress(1);
         print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
         $this->assertContains("New address\nNew zip New town\nSwitzerland", $result);
 
         // USA
         unset($localobjectadd->country_code);
-        $localobjectadd->country_id=11;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $localobjectadd->state='New state';
-        $result=$localobjectadd->getFullAddress(1);
+        $localobjectadd->country_id = 11;
+        $localobjectadd->name = 'New name';
+        $localobjectadd->address = 'New address';
+        $localobjectadd->zip = 'New zip';
+        $localobjectadd->town = 'New town';
+        $localobjectadd->state = 'New state';
+        $result = $localobjectadd->getFullAddress(1);
         print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
         $this->assertContains("New address\nNew town, New state, New zip\nUnited States", $result);
 

dolibarr/test/phpunit/WebservicesThirdpartyTest.php

Indentation +174 added lines, -174 removed lines

@@ -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;
@@ -85,8 +85,8 @@ 
         print __METHOD__." create nusoap_client for URL=".$this->_WS_DOL_URL."\n";
         $this->soapclient = new nusoap_client($this->_WS_DOL_URL);
         if ($this->soapclient) {
-        	$this->soapclient->soap_defencoding='UTF-8';
-        	$this->soapclient->decodeUTF8(false);
+            $this->soapclient->soap_defencoding='UTF-8';
+            $this->soapclient->decodeUTF8(false);
         }
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
@@ -145,86 +145,86 @@ 
      */
     public function testWSThirdpartycreateThirdParty()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'createThirdParty';
-
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
-
-    	$body = array (
-    			"id" => null,
-    			"ref" => "name",
-    			"ref_ext" => "12",
-    			"fk_user_author" => null,
-    			"status" => null,
-    			"client" => 1,
-    			"supplier" => 0,
-    			"customer_code" => "CU0901-5678",
-    			"supplier_code" => "SU0901-5678",
-    			"customer_code_accountancy" => "",
-    			"supplier_code_accountancy" => "",
-    			"date_creation" => "", // dateTime
-    			"date_modification" => "", // dateTime
-    			"note_private" => "",
-    			"note_public" => "",
-    			"address" => "",
-    			"zip" => "",
-    			"town" => "",
-    			"province_id" => "",
-    			"country_id" => "",
-    			"country_code" => "",
-    			"country" => "",
-    			"phone" => "",
-    			"fax" => "",
-    			"email" => "",
-    			"url" => "",
-    			"profid1" => "",
-    			"profid2" => "",
-    			"profid3" => "",
-    			"profid4" => "",
-    			"profid5" => "",
-    			"profid6" => "",
-    			"capital" => "",
-    			"vat_used" => "",
-    			"vat_number" => ""
-    	);
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	} catch(SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring'])) {
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('name',$result['ref']);
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'createThirdParty';
+
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+                'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+                'sourceapplication'=>'DEMO',
+                'login'=>'admin',
+                'password'=>'admin',
+                'entity'=>'');
+
+        $body = array (
+                "id" => null,
+                "ref" => "name",
+                "ref_ext" => "12",
+                "fk_user_author" => null,
+                "status" => null,
+                "client" => 1,
+                "supplier" => 0,
+                "customer_code" => "CU0901-5678",
+                "supplier_code" => "SU0901-5678",
+                "customer_code_accountancy" => "",
+                "supplier_code_accountancy" => "",
+                "date_creation" => "", // dateTime
+                "date_modification" => "", // dateTime
+                "note_private" => "",
+                "note_public" => "",
+                "address" => "",
+                "zip" => "",
+                "town" => "",
+                "province_id" => "",
+                "country_id" => "",
+                "country_code" => "",
+                "country" => "",
+                "phone" => "",
+                "fax" => "",
+                "email" => "",
+                "url" => "",
+                "profid1" => "",
+                "profid2" => "",
+                "profid3" => "",
+                "profid4" => "",
+                "profid5" => "",
+                "profid6" => "",
+                "capital" => "",
+                "vat_used" => "",
+                "vat_number" => ""
+        );
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('name',$result['ref']);
+
+        return $result;
     }
 
     /**
@@ -292,62 +292,62 @@ 
      *
      * Use ref_ext to retrieve thirdparty
      *
-	 * @depends testWSThirdpartycreateThirdParty
-	 *
+     * @depends testWSThirdpartycreateThirdParty
+     *
      * @param	array	$result		thirdparty created by create method
      * @return	array				thirdparty
      */
     public function testWSThirdpartygetThirdPartyByRefExt($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-    	$id = $result['id'];
-
-    	$WS_METHOD  = 'getThirdParty';
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-    	} catch(SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	print $this->soapclient->response;
-    	if (! $result || ! empty($result['faultstring'])) {
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals($id, $result['thirdparty']['id']);
-    	$this->assertEquals('name', $result['thirdparty']['ref']);
-    	$this->assertEquals('12', $result['thirdparty']['ref_ext']);
-    	$this->assertEquals('0', $result['thirdparty']['status']);
-    	$this->assertEquals('1', $result['thirdparty']['client']);
-    	$this->assertEquals('0', $result['thirdparty']['supplier']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+        $id = $result['id'];
+
+        $WS_METHOD  = 'getThirdParty';
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+                'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+                'sourceapplication'=>'DEMO',
+                'login'=>'admin',
+                'password'=>'admin',
+                'entity'=>'');
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        print $this->soapclient->response;
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals($id, $result['thirdparty']['id']);
+        $this->assertEquals('name', $result['thirdparty']['ref']);
+        $this->assertEquals('12', $result['thirdparty']['ref_ext']);
+        $this->assertEquals('0', $result['thirdparty']['status']);
+        $this->assertEquals('1', $result['thirdparty']['client']);
+        $this->assertEquals('0', $result['thirdparty']['supplier']);
+
+
+        return $result;
     }
 
     /**
@@ -360,44 +360,44 @@ 
      */
     public function testWSThirdpartydeleteThirdPartyById($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-    	$id = $result['id'];
-
-    	$WS_METHOD  = 'deleteThirdParty';
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
-
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-    	} catch(SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring'])) {
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+        $id = $result['id'];
+
+        $WS_METHOD  = 'deleteThirdParty';
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+                'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+                'sourceapplication'=>'DEMO',
+                'login'=>'admin',
+                'password'=>'admin',
+                'entity'=>'');
+
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+
+        return $result;
     }
 }

Spacing +73 added lines, -73 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';
 
 
 /**
@@ -57,7 +57,7 @@ 
     protected $soapclient;
 
     private $_WS_DOL_URL;
-    private $_ns='http://www.dolibarr.org/ns/';
+    private $_ns = 'http://www.dolibarr.org/ns/';
 
 
 
@@ -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;
 
         $this->_WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
 
@@ -85,7 +85,7 @@ 
         print __METHOD__." create nusoap_client for URL=".$this->_WS_DOL_URL."\n";
         $this->soapclient = new nusoap_client($this->_WS_DOL_URL);
         if ($this->soapclient) {
-        	$this->soapclient->soap_defencoding='UTF-8';
+        	$this->soapclient->soap_defencoding = 'UTF-8';
         	$this->soapclient->decodeUTF8(false);
         }
 
@@ -97,8 +97,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";
     }
@@ -106,7 +106,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -119,11 +119,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";
     }
@@ -145,24 +145,24 @@ 
      */
     public function testWSThirdpartycreateThirdParty()
     {
-    	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_METHOD  = 'createThirdParty';
+    	$WS_METHOD = 'createThirdParty';
 
 
     	// Call the WebService method and store its result in $result.
-    	$authentication=array(
+    	$authentication = array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     			'sourceapplication'=>'DEMO',
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
 
-    	$body = array (
+    	$body = array(
     			"id" => null,
     			"ref" => "name",
     			"ref_ext" => "12",
@@ -201,16 +201,16 @@ 
     	);
 
     	// Test URL
-    	$result='';
+    	$result = '';
     	$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	} catch(SoapFault $exception) {
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+    	} catch (SoapFault $exception) {
     		echo $exception;
-    		$result=0;
+    		$result = 0;
     	}
-    	if (! $result || ! empty($result['faultstring'])) {
+    	if (!$result || !empty($result['faultstring'])) {
     		//var_dump($soapclient);
     		print $this->soapclient->error_str;
     		print "\n<br>\n";
@@ -221,8 +221,8 @@ 
     	}
 
     	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('name',$result['ref']);
+    	$this->assertEquals('OK', $result['result']['result_code']);
+    	$this->assertEquals('name', $result['ref']);
 
     	return $result;
     }
@@ -238,33 +238,33 @@ 
      */
     public function testWSThirdpartygetThirdPartyById($result)
     {
-        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;
         $id = $result['id'];
 
-        $WS_METHOD  = 'getThirdParty';
+        $WS_METHOD = 'getThirdParty';
 
         // Call the WebService method and store its result in $result.
-        $authentication=array(
+        $authentication = array(
         'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
         'sourceapplication'=>'DEMO',
         'login'=>'admin',
         'password'=>'admin',
         'entity'=>'');
 
-        $result='';
+        $result = '';
         $parameters = array('authentication'=>$authentication, 'id'=>$id);
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
-            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-        } catch(SoapFault $exception) {
+            $result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
+        } catch (SoapFault $exception) {
             echo $exception;
-            $result=0;
+            $result = 0;
         }
-        if (! $result || ! empty($result['faultstring'])) {
+        if (!$result || !empty($result['faultstring'])) {
             //var_dump($soapclient);
             print $this->soapclient->error_str;
             print "\n<br>\n";
@@ -275,7 +275,7 @@ 
         }
 
         print __METHOD__." result=".$result['result']['result_code']."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('OK', $result['result']['result_code']);
         $this->assertEquals($id, $result['thirdparty']['id']);
         $this->assertEquals('name', $result['thirdparty']['ref']);
         $this->assertEquals('12', $result['thirdparty']['ref_ext']);
@@ -299,17 +299,17 @@ 
      */
     public function testWSThirdpartygetThirdPartyByRefExt($result)
     {
-    	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;
     	$id = $result['id'];
 
-    	$WS_METHOD  = 'getThirdParty';
+    	$WS_METHOD = 'getThirdParty';
 
     	// Call the WebService method and store its result in $result.
-    	$authentication=array(
+    	$authentication = array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     			'sourceapplication'=>'DEMO',
     			'login'=>'admin',
@@ -317,17 +317,17 @@ 
     			'entity'=>'');
 
     	// Test URL
-    	$result='';
+    	$result = '';
     	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-    	} catch(SoapFault $exception) {
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
+    	} catch (SoapFault $exception) {
     		echo $exception;
-    		$result=0;
+    		$result = 0;
     	}
     	print $this->soapclient->response;
-    	if (! $result || ! empty($result['faultstring'])) {
+    	if (!$result || !empty($result['faultstring'])) {
     		//var_dump($soapclient);
     		print $this->soapclient->error_str;
     		print "\n<br>\n";
@@ -338,7 +338,7 @@ 
     	}
 
     	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+    	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals($id, $result['thirdparty']['id']);
     	$this->assertEquals('name', $result['thirdparty']['ref']);
     	$this->assertEquals('12', $result['thirdparty']['ref_ext']);
@@ -360,33 +360,33 @@ 
      */
     public function testWSThirdpartydeleteThirdPartyById($result)
     {
-    	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;
     	$id = $result['id'];
 
-    	$WS_METHOD  = 'deleteThirdParty';
+    	$WS_METHOD = 'deleteThirdParty';
 
     	// Call the WebService method and store its result in $result.
-    	$authentication=array(
+    	$authentication = array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     			'sourceapplication'=>'DEMO',
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
 
-    	$result='';
+    	$result = '';
     	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-    	} catch(SoapFault $exception) {
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
+    	} catch (SoapFault $exception) {
     		echo $exception;
-    		$result=0;
+    		$result = 0;
     	}
-    	if (! $result || ! empty($result['faultstring'])) {
+    	if (!$result || !empty($result['faultstring'])) {
     		print $this->soapclient->error_str;
     		print "\n<br>\n";
     		print $this->soapclient->request;
@@ -396,7 +396,7 @@ 
     	}
 
     	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+    	$this->assertEquals('OK', $result['result']['result_code']);
 
     	return $result;
     }

dolibarr/test/phpunit/LangTest.php

Indentation +86 added lines, -86 removed lines

@@ -59,75 +59,75 @@ 
  */
 class LangTest 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,43 +137,43 @@ 
      */
     public function testLang()
     {
-    	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;
 
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
-		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach($filesarray as $key => $code)
-		{
-			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
-
-			print 'Check language file for lang code='.$code."\n";
-			$tmplangs=new Translate('',$conf);
-    		$langcode=$code;
-        	$tmplangs->setDefaultLang($langcode);
-			$tmplangs->load("main");
-
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
-			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
-
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
-			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
-
-			// Test java string contains only d,M,y,/,-,. and not m,...
-			$result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
-			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code);
-			$result=$tmplangs->trans("FormatDateShortJavaInput");
-			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code);
-
-			unset($tmplangs);
-		}
+        $filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
+        foreach($filesarray as $key => $code)
+        {
+            if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
+
+            print 'Check language file for lang code='.$code."\n";
+            $tmplangs=new Translate('',$conf);
+            $langcode=$code;
+            $tmplangs->setDefaultLang($langcode);
+            $tmplangs->load("main");
+
+            $result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
+            print __METHOD__." SeparatorDecimal=".$result."\n";
+            $this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+
+            $result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
+            print __METHOD__." SeparatorThousand=".$result."\n";
+            $this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+
+            // Test java string contains only d,M,y,/,-,. and not m,...
+            $result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
+            print __METHOD__." FormatDateShortJava=".$result."\n";
+            $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code);
+            $result=$tmplangs->trans("FormatDateShortJavaInput");
+            print __METHOD__." FormatDateShortJavaInput=".$result."\n";
+            $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code);
+
+            unset($tmplangs);
+        }
 
         return;
     }

Spacing +42 added lines, -42 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,40 +137,40 @@ 
      */
     public function testLang()
     {
-    	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;
 
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach($filesarray as $key => $code)
+		foreach ($filesarray as $key => $code)
 		{
-			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
+			if (!preg_match('/^[a-z]+_[A-Z]+$/', $code)) continue;
 
 			print 'Check language file for lang code='.$code."\n";
-			$tmplangs=new Translate('',$conf);
-    		$langcode=$code;
+			$tmplangs = new Translate('', $conf);
+    		$langcode = $code;
         	$tmplangs->setDefaultLang($langcode);
 			$tmplangs->load("main");
 
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
+			$result = $tmplangs->transnoentitiesnoconv("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertContains($result, array('.', ',', '/', ' ', '', 'None'), 'Error for decimal separator for lang code '.$code); // Note that ، that is coma for RTL languages is not supported
 
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
+			$result = $tmplangs->transnoentitiesnoconv("SeparatorThousand");
 			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertContains($result, array('.', ',', '/', ' ', '', '\'', 'None', 'Space'), 'Error for thousand separator for lang code '.$code); // Note that ، that is coma for RTL languages is not supported
 
 			// Test java string contains only d,M,y,/,-,. and not m,...
-			$result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
+			$result = $tmplangs->transnoentitiesnoconv("FormatDateShortJava");
 			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code);
-			$result=$tmplangs->trans("FormatDateShortJavaInput");
+			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJava KO for lang code '.$code);
+			$result = $tmplangs->trans("FormatDateShortJavaInput");
 			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code);
+			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJavaInput KO for lang code '.$code);
 
 			unset($tmplangs);
 		}

Braces +36 added lines, -11 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))
 {
@@ -148,7 +171,9 @@ 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
 		foreach($filesarray as $key => $code)
 		{
-			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
+			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) {
+			    continue;
+			}
 
 			print 'Check language file for lang code='.$code."\n";
 			$tmplangs=new Translate('',$conf);

dolibarr/test/phpunit/PaypalTest.php

Indentation +65 added lines, -65 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,78 +48,78 @@ 
  */
 class PaypalTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ProductTest
-	 */
-	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 ProductTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        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;
 
-    	if (empty($conf->paypal->enabled)) { print __METHOD__." Module Paypal must be enabled.\n"; die(); }
+        if (empty($conf->paypal->enabled)) { print __METHOD__." Module Paypal must be enabled.\n"; die(); }
 
         $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";
     }
 
     /**
@@ -129,20 +129,20 @@ 
      */
     public function testPaypalOk()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$urltotest=getPaypalPaymentUrl(1,'free');
-		print "urltotest=".$urltotest."\n";
+        $urltotest=getPaypalPaymentUrl(1,'free');
+        print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET');
+        $result=getURLContent($urltotest, 'GET');
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0);
 
-    	return $result;
+        return $result;
     }
 }

Spacing +22 added lines, -22 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';
@@ -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,11 +78,11 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 
     	if (empty($conf->paypal->enabled)) { print __METHOD__." Module Paypal must be enabled.\n"; die(); }
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -90,7 +90,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -103,11 +103,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -129,16 +129,16 @@ 
      */
     public function testPaypalOk()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$urltotest=getPaypalPaymentUrl(1,'free');
+		$urltotest = getPaypalPaymentUrl(1, 'free');
 		print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET');
+		$result = getURLContent($urltotest, 'GET');
 
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThanOrEqual($result, 0);

dolibarr/test/phpunit/PgsqlTest.php

Indentation +69 added lines, -69 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;
@@ -49,75 +49,75 @@ 
  */
 class PgsqlTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ContactTest
-	 */
-	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 ContactTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
 
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -127,11 +127,11 @@ 
      */
     public function testConvertSQLFromMysql()
     {
-    	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;
 
         $sql="ALTER TABLE llx_table RENAME TO llx_table_new;";
         $result=DoliDBPgsql::convertSQLFromMysql($sql);
@@ -159,23 +159,23 @@ 
         $this->assertEquals($result, "-- ALTER TABLE llx_table MODIFY name varchar(60); replaced by --\nALTER TABLE llx_table ALTER COLUMN name TYPE varchar(60);");
 
         // Create a constraint
-		$sql='ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)';
-		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql='ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)';
+        $result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, $sql.' DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->assertEquals($result, $sql.' DEFERRABLE INITIALLY IMMEDIATE;');
 
         // Test GROUP_CONCAT (without SEPARATOR)
-		$sql="SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b";
-		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql="SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b";
+        $result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
+        $this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
 
         // Test GROUP_CONCAT (with SEPARATOR)
-		$sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
-		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
+        $result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
+        $this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
 
-    	return $result;
+        return $result;
     }
 }

Spacing +37 added lines, -37 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';
@@ -37,7 +37,7 @@ 
 	$user->getrights();
 }
 
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -65,11 +65,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -79,9 +79,9 @@ 
 	// 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.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -89,7 +89,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -102,11 +102,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -127,52 +127,52 @@ 
      */
     public function testConvertSQLFromMysql()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-        $sql="ALTER TABLE llx_table RENAME TO llx_table_new;";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+        $sql = "ALTER TABLE llx_table RENAME TO llx_table_new;";
+        $result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, "ALTER TABLE llx_table RENAME TO llx_table_new;");
 
-        $sql="ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql = "ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;";
+        $result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, "ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0';");
 
-        $sql="ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql = "ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);";
+        $result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, "-- ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); replaced by --\nALTER TABLE llx_table RENAME COLUMN oldname TO newname");
 
-        $sql="ALTER TABLE llx_table DROP COLUMN oldname;";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql = "ALTER TABLE llx_table DROP COLUMN oldname;";
+        $result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, $sql);
 
-        $sql="ALTER TABLE llx_table MODIFY name varchar(60);";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
+        $sql = "ALTER TABLE llx_table MODIFY name varchar(60);";
+        $result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, "-- ALTER TABLE llx_table MODIFY name varchar(60); replaced by --\nALTER TABLE llx_table ALTER COLUMN name TYPE varchar(60);");
 
         // Create a constraint
-		$sql='ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)';
-		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		$sql = 'ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)';
+		$result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, $sql.' DEFERRABLE INITIALLY IMMEDIATE;');
 
         // Test GROUP_CONCAT (without SEPARATOR)
-		$sql="SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b";
-		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		$sql = "SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b";
+		$result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
 
         // Test GROUP_CONCAT (with SEPARATOR)
-		$sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
-		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		$sql = "SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
+		$result = DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');