alxarafe / alixar

dolibarr/dev/initdata/generate-proposal.php

Indentation +74 added lines, -74 removed lines

@@ -27,8 +27,8 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
-	exit;
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
 }
 
 // Recupere root dolibarr
@@ -100,8 +100,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -111,14 +111,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$socids[$i] = $row[0];
-	}
+    $num_thirdparties = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_thirdparties)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $socids[$i] = $row[0];
+    }
 }
 
 $contids = array();
@@ -126,14 +126,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_conts = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_conts)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$contids[$row[1]][0] = $row[0]; // A ameliorer
-	}
+    $num_conts = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_conts)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $contids[$row[1]][0] = $row[0]; // A ameliorer
+    }
 }
 
 $prodids = array();
@@ -141,14 +141,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_prods = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_prods)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$prodids[$i] = $row[0];
-	}
+    $num_prods = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_prods)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $prodids[$i] = $row[0];
+    }
 }
 
 $user->rights->propal->creer=1;
@@ -157,65 +157,65 @@ 
 
 if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
 {
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
+    require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
 }
 
 $i=0;
 $result=0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
-	$i++;
-	$socid = mt_rand(1, $num_thirdparties);
-	print "Proposal ".$i." for socid ".$socid;
+    $i++;
+    $socid = mt_rand(1, $num_thirdparties);
+    print "Proposal ".$i." for socid ".$socid;
 
-	$soc = new Societe($db);
+    $soc = new Societe($db);
 
 
-	$object = new Propal($db);
+    $object = new Propal($db);
 
     $fuser = new User($db);
     $fuser->fetch(mt_rand(1,2));
     $fuser->getRights();
     
-	$object->contactid = $contids[$socids[$socid]][0];
-	$object->socid = $socids[$socid];
-	$object->datep = $dates[mt_rand(1, count($dates)-1)];
-	$object->cond_reglement_id = 3;
-	$object->mode_reglement_id = 3;
-
-	$result=$object->create($fuser);
-	if ($result >= 0)
-	{
-		$nbp = mt_rand(2, 5);
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
-			if ($result < 0)
-			{
-				dol_print_error($db,$object->error);
-			}
-			$xnbp++;
-		}
+    $object->contactid = $contids[$socids[$socid]][0];
+    $object->socid = $socids[$socid];
+    $object->datep = $dates[mt_rand(1, count($dates)-1)];
+    $object->cond_reglement_id = 3;
+    $object->mode_reglement_id = 3;
+
+    $result=$object->create($fuser);
+    if ($result >= 0)
+    {
+        $nbp = mt_rand(2, 5);
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $prodid = mt_rand(1, $num_prods);
+            $product=new Product($db);
+            $result=$product->fetch($prodids[$prodid]);
+            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+            if ($result < 0)
+            {
+                dol_print_error($db,$object->error);
+            }
+            $xnbp++;
+        }
 		
-		$result=$object->valid($fuser);
-		if ($result > 0)
-		{
-		    $db->commit();
-		    print " OK with ref ".$object->ref."\n";
-		}
-		else
-		{
-		    print " KO\n";
-		    $db->rollback();
-		    dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
+        $result=$object->valid($fuser);
+        if ($result > 0)
+        {
+            $db->commit();
+            print " OK with ref ".$object->ref."\n";
+        }
+        else
+        {
+            print " KO\n";
+            $db->rollback();
+            dol_print_error($db,$object->error);
+        }
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+    }
 }

Spacing +69 added lines, -69 removed lines

@@ -33,7 +33,7 @@ 
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require __DIR__.'/../../htdocs/master.inc.php';
 require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
 require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php";
 require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
@@ -45,60 +45,60 @@ 
 
 define(GEN_NUMBER_PROPAL, 10);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
+    mktime(12, 0, 0, 1, 9, $year),
+    mktime(12, 0, 0, 2, 13, $year),
+    mktime(12, 0, 0, 2, 23, $year),
+    mktime(12, 0, 0, 3, 30, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 5, 9, $year),
+    mktime(12, 0, 0, 5, 1, $year),
+    mktime(12, 0, 0, 5, 13, $year),
+    mktime(12, 0, 0, 5, 19, $year),
+    mktime(12, 0, 0, 5, 23, $year),
+    mktime(12, 0, 0, 6, 3, $year),
+    mktime(12, 0, 0, 6, 19, $year),
+    mktime(12, 0, 0, 6, 24, $year),
+    mktime(12, 0, 0, 7, 3, $year),
+    mktime(12, 0, 0, 7, 9, $year),
+    mktime(12, 0, 0, 7, 23, $year),
+    mktime(12, 0, 0, 7, 30, $year),
+    mktime(12, 0, 0, 8, 9, $year),
+    mktime(12, 0, 0, 9, 23, $year),
+    mktime(12, 0, 0, 10, 3, $year),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 12, 12, $year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -151,17 +151,17 @@ 
 	}
 }
 
-$user->rights->propal->creer=1;
-$user->rights->propal->propal_advance->validate=1;
+$user->rights->propal->creer = 1;
+$user->rights->propal->propal_advance->validate = 1;
 
 
-if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
+if (!empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
 {
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
+	require_once DOL_DOCUMENT_ROOT."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
 }
 
-$i=0;
-$result=0;
+$i = 0;
+$result = 0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
 	$i++;
@@ -174,16 +174,16 @@ 
 	$object = new Propal($db);
 
     $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
+    $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
     
 	$object->contactid = $contids[$socids[$socid]][0];
 	$object->socid = $socids[$socid];
-	$object->datep = $dates[mt_rand(1, count($dates)-1)];
+	$object->datep = $dates[mt_rand(1, count($dates) - 1)];
 	$object->cond_reglement_id = 3;
 	$object->mode_reglement_id = 3;
 
-	$result=$object->create($fuser);
+	$result = $object->create($fuser);
 	if ($result >= 0)
 	{
 		$nbp = mt_rand(2, 5);
@@ -191,17 +191,17 @@ 
 		while ($xnbp < $nbp)
 		{
 			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$product = new Product($db);
+			$result = $product->fetch($prodids[$prodid]);
+			$result = $object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
-				dol_print_error($db,$object->error);
+				dol_print_error($db, $object->error);
 			}
 			$xnbp++;
 		}
 		
-		$result=$object->valid($fuser);
+		$result = $object->valid($fuser);
 		if ($result > 0)
 		{
 		    $db->commit();
@@ -211,11 +211,11 @@ 
 		{
 		    print " KO\n";
 		    $db->rollback();
-		    dol_print_error($db,$object->error);
+		    dol_print_error($db, $object->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -206,15 +206,13 @@
 		{
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
-		}
-		else
+		} else
 		{
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db,$object->error);
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db,$object->error);
 	}

dolibarr/test/phpunit/MouvementStockTest.php

Indentation +161 added lines, -161 removed lines

@@ -33,9 +33,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,74 +49,74 @@ 
  */
 class MouvementStockTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ContratTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ContratTest
+     */
+    function __construct()
+    {
+        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";
     }
 
     /**
@@ -126,97 +126,97 @@ 
      */
     public function testMouvementCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		// We create a product for tests
-		$product1=new Product($db);
-		$product1->initAsSpecimen();
-		$product1->ref.=' 1';
-		$product1->label.=' 1';
-		$product1id=$product1->create($user);
-
-		$product2=new Product($db);
-		$product2->initAsSpecimen();
-		$product2->ref.=' 2';
-		$product2->label.=' 2';
-		$product2id=$product2->create($user);
-
-		// We create a product for tests
-		$warehouse1=new Entrepot($db);
-		$warehouse1->initAsSpecimen();
-		$warehouse1->libelle.=' 1';
-		$warehouse1->description.=' 1';
-		$warehouse1id=$warehouse1->create($user);
-
-		$warehouse2=new Entrepot($db);
-		$warehouse2->initAsSpecimen();
-		$warehouse2->libelle.=' 2';
-		$warehouse2->description.=' 2';
-		$warehouse2id=$warehouse2->create($user);
-
-		$localobject=new MouvementStock($this->savdb);
-
-    	// Do a list of movement into warehouse 1
-
-    	// Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.9, 'Movement for unit test 1', 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.7, 'Movement for unit test 2', 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -5, 2, 999, 'Movement for unit test 3', 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-
-    	// Do same but into warehouse 2
-
-    	// Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.9, 'Movement for unit test 1 wh 2', 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.7, 'Movement for unit test 2 wh 2', 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -5, 2, 999, 'Movement for unit test 3 wh 2', 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
-    	print __METHOD__." 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;
+
+        // We create a product for tests
+        $product1=new Product($db);
+        $product1->initAsSpecimen();
+        $product1->ref.=' 1';
+        $product1->label.=' 1';
+        $product1id=$product1->create($user);
+
+        $product2=new Product($db);
+        $product2->initAsSpecimen();
+        $product2->ref.=' 2';
+        $product2->label.=' 2';
+        $product2id=$product2->create($user);
+
+        // We create a product for tests
+        $warehouse1=new Entrepot($db);
+        $warehouse1->initAsSpecimen();
+        $warehouse1->libelle.=' 1';
+        $warehouse1->description.=' 1';
+        $warehouse1id=$warehouse1->create($user);
+
+        $warehouse2=new Entrepot($db);
+        $warehouse2->initAsSpecimen();
+        $warehouse2->libelle.=' 2';
+        $warehouse2->description.=' 2';
+        $warehouse2id=$warehouse2->create($user);
+
+        $localobject=new MouvementStock($this->savdb);
+
+        // Do a list of movement into warehouse 1
+
+        // Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
+        $result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.9, 'Movement for unit test 1', 'Inventory Code Test');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.7, 'Movement for unit test 2', 'Inventory Code Test');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, -5, 2, 999, 'Movement for unit test 3', 'Inventory Code Test');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+
+        // Do same but into warehouse 2
+
+        // Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
+        $result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.9, 'Movement for unit test 1 wh 2', 'Inventory Code Test 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.7, 'Movement for unit test 2 wh 2', 'Inventory Code Test 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, -5, 2, 999, 'Movement for unit test 3 wh 2', 'Inventory Code Test 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+
+        return $localobject;
     }
 
     /**
@@ -230,26 +230,26 @@ 
      */
     public function testMouvementCheck($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;
 
-		$productid = $localobject->product_id;
-		$warehouseid = $localobject->entrepot_id;
+        $productid = $localobject->product_id;
+        $warehouseid = $localobject->entrepot_id;
 
-		print __METHOD__." productid=".$productid."\n";
+        print __METHOD__." productid=".$productid."\n";
 
-		$producttotest = new Product($db);
-		$producttotest->fetch($productid);
+        $producttotest = new Product($db);
+        $producttotest->fetch($productid);
 
-    	print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
-    	$this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
+        print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
+        $this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
 
-    	print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
-    	$this->assertEquals($producttotest->pmp, 9.8);
+        print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
+        $this->assertEquals($producttotest->pmp, 9.8);
 
-    	return $localobject;
+        return $localobject;
     }
 }

Spacing +53 added lines, -53 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->fetch(1);
 	$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,8 +79,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";
     }
@@ -88,7 +88,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -101,11 +101,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -126,64 +126,64 @@ 
      */
     public function testMouvementCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// We create a product for tests
-		$product1=new Product($db);
+		$product1 = new Product($db);
 		$product1->initAsSpecimen();
-		$product1->ref.=' 1';
-		$product1->label.=' 1';
-		$product1id=$product1->create($user);
+		$product1->ref .= ' 1';
+		$product1->label .= ' 1';
+		$product1id = $product1->create($user);
 
-		$product2=new Product($db);
+		$product2 = new Product($db);
 		$product2->initAsSpecimen();
-		$product2->ref.=' 2';
-		$product2->label.=' 2';
-		$product2id=$product2->create($user);
+		$product2->ref .= ' 2';
+		$product2->label .= ' 2';
+		$product2id = $product2->create($user);
 
 		// We create a product for tests
-		$warehouse1=new Entrepot($db);
+		$warehouse1 = new Entrepot($db);
 		$warehouse1->initAsSpecimen();
-		$warehouse1->libelle.=' 1';
-		$warehouse1->description.=' 1';
-		$warehouse1id=$warehouse1->create($user);
+		$warehouse1->libelle .= ' 1';
+		$warehouse1->description .= ' 1';
+		$warehouse1id = $warehouse1->create($user);
 
-		$warehouse2=new Entrepot($db);
+		$warehouse2 = new Entrepot($db);
 		$warehouse2->initAsSpecimen();
-		$warehouse2->libelle.=' 2';
-		$warehouse2->description.=' 2';
-		$warehouse2id=$warehouse2->create($user);
+		$warehouse2->libelle .= ' 2';
+		$warehouse2->description .= ' 2';
+		$warehouse2id = $warehouse2->create($user);
 
-		$localobject=new MouvementStock($this->savdb);
+		$localobject = new MouvementStock($this->savdb);
 
     	// Do a list of movement into warehouse 1
 
     	// Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.9, 'Movement for unit test 1', 'Inventory Code Test');
+    	$result = $localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.9, 'Movement for unit test 1', 'Inventory Code Test');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.7, 'Movement for unit test 2', 'Inventory Code Test');
+    	$result = $localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.7, 'Movement for unit test 2', 'Inventory Code Test');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -5, 2, 999, 'Movement for unit test 3', 'Inventory Code Test');
+    	$result = $localobject->_create($user, $product1id, $warehouse1id, -5, 2, 999, 'Movement for unit test 3', 'Inventory Code Test');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
+    	$result = $localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
+    	$result = $localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
@@ -191,27 +191,27 @@ 
     	// Do same but into warehouse 2
 
     	// Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.9, 'Movement for unit test 1 wh 2', 'Inventory Code Test 2');
+    	$result = $localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.9, 'Movement for unit test 1 wh 2', 'Inventory Code Test 2');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.7, 'Movement for unit test 2 wh 2', 'Inventory Code Test 2');
+    	$result = $localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.7, 'Movement for unit test 2 wh 2', 'Inventory Code Test 2');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -5, 2, 999, 'Movement for unit test 3 wh 2', 'Inventory Code Test 2');
+    	$result = $localobject->_create($user, $product1id, $warehouse2id, -5, 2, 999, 'Movement for unit test 3 wh 2', 'Inventory Code Test 2');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
+    	$result = $localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
     	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
+    	$result = $localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
     	print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
@@ -230,11 +230,11 @@ 
      */
     public function testMouvementCheck($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;
 
 		$productid = $localobject->product_id;
 		$warehouseid = $localobject->entrepot_id;
@@ -245,7 +245,7 @@ 
 		$producttotest->fetch($productid);
 
     	print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
-    	$this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
+    	$this->assertEquals($producttotest->stock_reel, 28); // 28 is result of stock movement defined into testMouvementCreate
 
     	print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
     	$this->assertEquals($producttotest->pmp, 9.8);

dolibarr/test/phpunit/ActionCommTest.php

Indentation +14 added lines, -14 removed lines

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

Spacing +47 added lines, -47 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         if (empty($conf->agenda->enabled)) { print __METHOD__." module agenda must be enabled.\n"; die(); }
@@ -87,7 +87,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -100,11 +100,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
         //print $db->getVersion()."\n";
@@ -127,28 +127,28 @@ 
      */
     public function testActionCommCreate()
     {
-        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;
 
         $now = dol_now();
 
-        $localobject=new ActionComm($this->savdb);
+        $localobject = new ActionComm($this->savdb);
 
-        $localobject->type_code   = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+        $localobject->type_code   = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
         $localobject->code        = 'AC_PHPUNITTEST';
         $localobject->label       = 'This is a description';
         $localobject->note        = 'This is note';
         $localobject->fk_project  = 0;
         $localobject->datep       = $now;
         $localobject->datef       = $now;
-        $localobject->percentage  = -1;   // Not applicable
+        $localobject->percentage  = -1; // Not applicable
         $localobject->socid       = 0;
         $localobject->contactid   = 0;
-        $localobject->authorid    = $user->id;   // User saving action
-        $localobject->userownerid = $user->id;	// Owner of action
+        $localobject->authorid    = $user->id; // User saving action
+        $localobject->userownerid = $user->id; // Owner of action
         // Fields when action is en email (content should be added into note)
         /*$localobject->email_msgid = $object->email_msgid;
          $localobject->email_from  = $object->email_from;
@@ -180,14 +180,14 @@ 
      */
     public function testActionCommFetch($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 ActionComm($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new ActionComm($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -205,14 +205,14 @@ 
      */
     public function testActionCommUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
-    	$localobject->label='New label';
-    	$result=$localobject->update($user);
+    	$localobject->label = 'New label';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -230,15 +230,15 @@ 
      */
     public function testActionCommDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new ActionComm($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject = new ActionComm($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/WebservicesInvoicesTest.php

Indentation +314 added lines, -314 removed lines

@@ -33,9 +33,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;
 
@@ -51,47 +51,47 @@ 
  */
 class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-	protected $soapclient;
-
-	private static $socid;
-
-	protected $ns = 'http://www.dolibarr.org/ns/';
-
-	/**
-	 * 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;
-
-		// Set the WebService URL
-		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
-		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-		$this->soapclient = new nusoap_client($WS_DOL_URL);
-		if ($this->soapclient)
-		{
-			$this->soapclient->soap_defencoding='UTF-8';
-			$this->soapclient->decodeUTF8(false);
-		}
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+    protected $soapclient;
+
+    private static $socid;
+
+    protected $ns = 'http://www.dolibarr.org/ns/';
+
+    /**
+     * 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;
+
+        // Set the WebService URL
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $this->soapclient = new nusoap_client($WS_DOL_URL);
+        if ($this->soapclient)
+        {
+            $this->soapclient->soap_defencoding='UTF-8';
+            $this->soapclient->decodeUTF8(false);
+        }
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
 
     /**
      * setUpBeforeClass
@@ -102,38 +102,38 @@ 
     {
         global $conf,$user,$langs,$db;
 
-		// create a third_party, needed to create an invoice
-		//
-		// The third party is created in setUpBeforeClass() and not in the
-		// constructor to avoid creating several objects (the constructor is
-		// called for each test).
-		//
-		// The third party must be created before beginning the DB transaction
-		// because there is a foreign key constraint between invoices and third
-		// parties (tables: lx_facture and llx_societe) and with MySQL,
-		// constraints are checked immediately, they are not deferred to
-		// transaction commit. So if the invoice is created in the same
-		// transaction than the third party, the FK constraint fails.
-		// See this post for more detail: http://stackoverflow.com/a/5014744/5187108
-		$societe=new Societe($db);
-		$societe->ref='';
-		$societe->name='name';
-		$societe->ref_ext='ref-phpunit';
-		$societe->status=1;
-		$societe->client=1;
-		$societe->code_client='CU0901-1234';
-		$societe->code_fournisseur='SU0901-1234';
-		$societe->fournisseur=0;
-		$societe->date_creation=$now;
-		$societe->tva_assuj=0;
-		$societe->particulier=0;
-
-		$societe->create($user);
-
-		self::$socid = $societe->id;
-		print __METHOD__." societe created id=".$societe->id."\n";
-
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        // create a third_party, needed to create an invoice
+        //
+        // The third party is created in setUpBeforeClass() and not in the
+        // constructor to avoid creating several objects (the constructor is
+        // called for each test).
+        //
+        // The third party must be created before beginning the DB transaction
+        // because there is a foreign key constraint between invoices and third
+        // parties (tables: lx_facture and llx_societe) and with MySQL,
+        // constraints are checked immediately, they are not deferred to
+        // transaction commit. So if the invoice is created in the same
+        // transaction than the third party, the FK constraint fails.
+        // See this post for more detail: http://stackoverflow.com/a/5014744/5187108
+        $societe=new Societe($db);
+        $societe->ref='';
+        $societe->name='name';
+        $societe->ref_ext='ref-phpunit';
+        $societe->status=1;
+        $societe->client=1;
+        $societe->code_client='CU0901-1234';
+        $societe->code_fournisseur='SU0901-1234';
+        $societe->fournisseur=0;
+        $societe->date_creation=$now;
+        $societe->tva_assuj=0;
+        $societe->particulier=0;
+
+        $societe->create($user);
+
+        self::$socid = $societe->id;
+        print __METHOD__." societe created id=".$societe->id."\n";
+
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
     }
@@ -145,36 +145,36 @@ 
      */
     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";
     }
 
 
@@ -185,93 +185,93 @@ 
      */
     public function testWSInvoicesCreateInvoice()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'createInvoice';
-
-    	$body = array (
-    			"id" => null,
-				"ref" => null,
-				"ref_ext" => "ref-phpunit-2",
-				"thirdparty_id" => self::$socid,
-				"fk_user_author" => null,
-				"fk_user_valid" => null,
-				"date" => "2015-04-19 20:16:53",
-				"date_due" => "",
-				"date_creation" => "",
-				"date_validation" => "",
-				"date_modification" =>  "",
-				"type" => "",
-				"total_net" => "36.30",
-				"total_vat" => "6.00",
-				"total" => "42.30",
-				"payment_mode_id" => 50,
-				"note_private" => "Synchronised from Prestashop",
-				"note_public" => "",
-				"status" => "1",
-				"close_code" => null ,
-				"close_note" => null,
-				"project_id" => null,
-				"lines" => array(
-					array("id" => null,
-					"type" => 0,
-					"desc" => "Horloge Vinyle Serge",
-					"vat_rate" => 20,
-					"qty" => 1,
-					"unitprice" => "30.000000",
-					"total_net" => "30.000000",
-					"total_vat" => "6.00",
-					"total" => "36.000000",
-					"date_start" => "",
-					"date_end" => "",
-					"payment_mode_id" => "",
-					"product_id" => "",
-					"product_ref" => "",
-					"product_label" => "",
-					"product_desc" => "" ))
-					);
-
-    	// 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,'invoice'=>$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('ref-phpunit-2', $result['ref_ext']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'createInvoice';
+
+        $body = array (
+                "id" => null,
+                "ref" => null,
+                "ref_ext" => "ref-phpunit-2",
+                "thirdparty_id" => self::$socid,
+                "fk_user_author" => null,
+                "fk_user_valid" => null,
+                "date" => "2015-04-19 20:16:53",
+                "date_due" => "",
+                "date_creation" => "",
+                "date_validation" => "",
+                "date_modification" =>  "",
+                "type" => "",
+                "total_net" => "36.30",
+                "total_vat" => "6.00",
+                "total" => "42.30",
+                "payment_mode_id" => 50,
+                "note_private" => "Synchronised from Prestashop",
+                "note_public" => "",
+                "status" => "1",
+                "close_code" => null ,
+                "close_note" => null,
+                "project_id" => null,
+                "lines" => array(
+                    array("id" => null,
+                    "type" => 0,
+                    "desc" => "Horloge Vinyle Serge",
+                    "vat_rate" => 20,
+                    "qty" => 1,
+                    "unitprice" => "30.000000",
+                    "total_net" => "30.000000",
+                    "total_vat" => "6.00",
+                    "total" => "36.000000",
+                    "date_start" => "",
+                    "date_end" => "",
+                    "payment_mode_id" => "",
+                    "product_id" => "",
+                    "product_ref" => "",
+                    "product_label" => "",
+                    "product_desc" => "" ))
+                    );
+
+        // 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,'invoice'=>$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('ref-phpunit-2', $result['ref_ext']);
+
+
+        return $result;
     }
 
     /**
@@ -285,49 +285,49 @@ 
      */
     public function testWSInvoicesGetInvoiceByRefExt($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'getInvoice';
-
-    	// 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'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
-    	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']);
-    	$this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'getInvoice';
+
+        // 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'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
+        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']);
+        $this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
+
+
+        return $result;
     }
 
     /**
@@ -341,93 +341,93 @@ 
      */
     public function testWSInvoicesUpdateInvoiceByRefExt($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'updateInvoice';
-
-    	// update status to 2
-    	$body = array (
-    		"id" => null,
-			"ref" => null,
-			"ref_ext" => "ref-phpunit-2",
-			"thirdparty_id" => self::$socid,
-			"fk_user_author" => null,
-			"fk_user_valid" => null,
-			"date" => "2015-04-19 20:16:53",
-			"date_due" => "",
-			"date_creation" => "",
-			"date_validation" => "",
-			"date_modification" =>  "",
-			"type" => "",
-			"total_net" => "36.30",
-			"total_vat" => "6.00",
-			"total" => "42.30",
-			"payment_mode_id" => 50,
-			"note_private" => "Synchronised from Prestashop",
-			"note_public" => "",
-			"status" => "2",
-			"close_code" => null ,
-			"close_note" => null,
-			"project_id" => null,
-			"lines"  => array(
-				array(
-				"id"  => null,
-				"type" => 0,
-				"desc" => "Horloge Vinyle Serge",
-				"vat_rate" => 20,
-				"qty" => "1",
-				"unitprice" => "30.000000",
-				"total_net" => "30.000000",
-				"total_vat" => "6.00",
-				"total" => "36.000000",
-				"date_start" => "",
-				"date_end" => "",
-				"payment_mode_id" => "",
-				"product_id" => "",
-				"product_ref" => "",
-				"product_label" => "",
-				"product_desc" => "" ))
-			);
-
-    	// 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,'invoice'=>$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']))
-    	{
-    		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'].$result['result']['result_label']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'updateInvoice';
+
+        // update status to 2
+        $body = array (
+            "id" => null,
+            "ref" => null,
+            "ref_ext" => "ref-phpunit-2",
+            "thirdparty_id" => self::$socid,
+            "fk_user_author" => null,
+            "fk_user_valid" => null,
+            "date" => "2015-04-19 20:16:53",
+            "date_due" => "",
+            "date_creation" => "",
+            "date_validation" => "",
+            "date_modification" =>  "",
+            "type" => "",
+            "total_net" => "36.30",
+            "total_vat" => "6.00",
+            "total" => "42.30",
+            "payment_mode_id" => 50,
+            "note_private" => "Synchronised from Prestashop",
+            "note_public" => "",
+            "status" => "2",
+            "close_code" => null ,
+            "close_note" => null,
+            "project_id" => null,
+            "lines"  => array(
+                array(
+                "id"  => null,
+                "type" => 0,
+                "desc" => "Horloge Vinyle Serge",
+                "vat_rate" => 20,
+                "qty" => "1",
+                "unitprice" => "30.000000",
+                "total_net" => "30.000000",
+                "total_vat" => "6.00",
+                "total" => "36.000000",
+                "date_start" => "",
+                "date_end" => "",
+                "payment_mode_id" => "",
+                "product_id" => "",
+                "product_ref" => "",
+                "product_label" => "",
+                "product_desc" => "" ))
+            );
+
+        // 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,'invoice'=>$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']))
+        {
+            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'].$result['result']['result_label']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('ref-phpunit-2', $result['ref_ext']);
+
+
+        return $result;
     }
 }

Spacing +76 added lines, -76 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))
@@ -37,9 +37,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';
 
 
 /**
@@ -72,11 +72,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;
 
 		// Set the WebService URL
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
@@ -84,7 +84,7 @@ 
 		$this->soapclient = new nusoap_client($WS_DOL_URL);
 		if ($this->soapclient)
 		{
-			$this->soapclient->soap_defencoding='UTF-8';
+			$this->soapclient->soap_defencoding = 'UTF-8';
 			$this->soapclient->decodeUTF8(false);
 		}
 
@@ -100,7 +100,7 @@ 
      */
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
 		// create a third_party, needed to create an invoice
 		//
@@ -115,25 +115,25 @@ 
 		// transaction commit. So if the invoice is created in the same
 		// transaction than the third party, the FK constraint fails.
 		// See this post for more detail: http://stackoverflow.com/a/5014744/5187108
-		$societe=new Societe($db);
-		$societe->ref='';
-		$societe->name='name';
-		$societe->ref_ext='ref-phpunit';
-		$societe->status=1;
-		$societe->client=1;
-		$societe->code_client='CU0901-1234';
-		$societe->code_fournisseur='SU0901-1234';
-		$societe->fournisseur=0;
-		$societe->date_creation=$now;
-		$societe->tva_assuj=0;
-		$societe->particulier=0;
+		$societe = new Societe($db);
+		$societe->ref = '';
+		$societe->name = 'name';
+		$societe->ref_ext = 'ref-phpunit';
+		$societe->status = 1;
+		$societe->client = 1;
+		$societe->code_client = 'CU0901-1234';
+		$societe->code_fournisseur = 'SU0901-1234';
+		$societe->fournisseur = 0;
+		$societe->date_creation = $now;
+		$societe->tva_assuj = 0;
+		$societe->particulier = 0;
 
 		$societe->create($user);
 
 		self::$socid = $societe->id;
 		print __METHOD__." societe created id=".$societe->id."\n";
 
-		$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";
     }
@@ -145,7 +145,7 @@ 
      */
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -158,11 +158,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";
     }
@@ -185,15 +185,15 @@ 
      */
     public function testWSInvoicesCreateInvoice()
     {
-    	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  = 'createInvoice';
+    	$WS_METHOD = 'createInvoice';
 
-    	$body = array (
+    	$body = array(
     			"id" => null,
 				"ref" => null,
 				"ref_ext" => "ref-phpunit-2",
@@ -213,7 +213,7 @@ 
 				"note_private" => "Synchronised from Prestashop",
 				"note_public" => "",
 				"status" => "1",
-				"close_code" => null ,
+				"close_code" => null,
 				"close_note" => null,
 				"project_id" => null,
 				"lines" => array(
@@ -232,11 +232,11 @@ 
 					"product_id" => "",
 					"product_ref" => "",
 					"product_label" => "",
-					"product_desc" => "" ))
+					"product_desc" => ""))
 					);
 
     	// Call the WebService method and store its result in $result.
-    	$authentication=array(
+    	$authentication = array(
     	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     	'sourceapplication'=>'DEMO',
     	'login'=>'admin',
@@ -244,18 +244,18 @@ 
     	'entity'=>'');
 
     	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'invoice'=>$body);
+    	$result = '';
+    	$parameters = array('authentication'=>$authentication, 'invoice'=>$body);
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	}
-    	catch(SoapFault $exception)
+    	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;
@@ -267,7 +267,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('ref-phpunit-2', $result['ref_ext']);
 
 
@@ -285,16 +285,16 @@ 
      */
     public function testWSInvoicesGetInvoiceByRefExt($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;
 
-    	$WS_METHOD  = 'getInvoice';
+    	$WS_METHOD = 'getInvoice';
 
     	// Call the WebService method and store its result in $result.
-    	$authentication=array(
+    	$authentication = array(
     	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     	'sourceapplication'=>'DEMO',
     	'login'=>'admin',
@@ -302,18 +302,18 @@ 
     	'entity'=>'');
 
     	// Test URL
-    	$result='';
+    	$result = '';
     	$parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	}
-    	catch(SoapFault $exception)
+    	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";
@@ -323,7 +323,7 @@ 
     		print "\n";
     	}
     	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+    	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
 
 
@@ -341,16 +341,16 @@ 
      */
     public function testWSInvoicesUpdateInvoiceByRefExt($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;
 
-    	$WS_METHOD  = 'updateInvoice';
+    	$WS_METHOD = 'updateInvoice';
 
     	// update status to 2
-    	$body = array (
+    	$body = array(
     		"id" => null,
 			"ref" => null,
 			"ref_ext" => "ref-phpunit-2",
@@ -370,7 +370,7 @@ 
 			"note_private" => "Synchronised from Prestashop",
 			"note_public" => "",
 			"status" => "2",
-			"close_code" => null ,
+			"close_code" => null,
 			"close_note" => null,
 			"project_id" => null,
 			"lines"  => array(
@@ -394,7 +394,7 @@ 
 			);
 
     	// Call the WebService method and store its result in $result.
-    	$authentication=array(
+    	$authentication = array(
     	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     	'sourceapplication'=>'DEMO',
     	'login'=>'admin',
@@ -402,18 +402,18 @@ 
     	'entity'=>'');
 
     	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'invoice'=>$body);
+    	$result = '';
+    	$parameters = array('authentication'=>$authentication, 'invoice'=>$body);
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
     	}
-    	catch(SoapFault $exception)
+    	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";
@@ -424,7 +424,7 @@ 
     	}
 
     	print __METHOD__." result=".$result['result']['result_code'].$result['result']['result_label']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+    	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 
 

Braces +3 added lines, -6 removed lines

@@ -249,8 +249,7 @@ 
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	}
-    	catch(SoapFault $exception)
+    	} catch(SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -307,8 +306,7 @@ 
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	}
-    	catch(SoapFault $exception)
+    	} catch(SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -407,8 +405,7 @@ 
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	}
-    	catch(SoapFault $exception)
+    	} catch(SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;

dolibarr/test/phpunit/CommonInvoiceTest.php

Indentation +3 added lines, -3 removed lines

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

Spacing +20 added lines, -20 removed lines

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

dolibarr/test/phpunit/AdminLibTest.php

Indentation +15 added lines, -15 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -123,24 +123,24 @@ 
      */
     public function testVersionCompare()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=versioncompare(array(3,1,-4),array(3,1,1));
+        $result = versioncompare(array(3, 1, -4), array(3, 1, 1));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-3,$result);
-        $result=versioncompare(array(3,1,0),array(3,1,1));
+        $this->assertEquals(-3, $result);
+        $result = versioncompare(array(3, 1, 0), array(3, 1, 1));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-3,$result);
-        $result=versioncompare(array(3,1,0),array(3,2,0));
+        $this->assertEquals(-3, $result);
+        $result = versioncompare(array(3, 1, 0), array(3, 2, 0));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-2,$result);
-        $result=versioncompare(array(3,1,0),array(3,1,0));
+        $this->assertEquals(-2, $result);
+        $result = versioncompare(array(3, 1, 0), array(3, 1, 0));
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0,$result);
+        $this->assertEquals(0, $result);
 
         return $result;
     }
@@ -156,13 +156,13 @@ 
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
-		$moduledescriptor=new modExpenseReport($db);
+		$moduledescriptor = new modExpenseReport($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
 		print "Enable module modAPI";
-		$moduledescriptor=new modApi($db);
+		$moduledescriptor = new modApi($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
     }

dolibarr/test/phpunit/AccountingAccountTest.php

Indentation +13 added lines, -13 removed lines

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

Spacing +44 added lines, -44 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
         //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
         if (empty($conf->accounting->enabled)) { print __METHOD__." module accouting must be enabled.\n"; die(); }
@@ -87,7 +87,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -100,11 +100,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
         //print $db->getVersion()."\n";
@@ -127,13 +127,13 @@ 
      */
     public function testAccountingAccountCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
+        $localobject = new AccountingAccount($this->savdb);
         $localobject->fk_pcg_version = 'PCG99-ABREGE';
         $localobject->account_category = 0;
         $localobject->pcg_type = 'XXXXX';
@@ -141,7 +141,7 @@ 
         $localobject->account_parent = 0;
         $localobject->label = 'Account specimen';
         $localobject->active = 0;
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -159,14 +159,14 @@ 
      */
     public function testAccountingAccountFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new AccountingAccount($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -184,14 +184,14 @@ 
      */
     public function testAccountingAccountUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
-    	$localobject->label='New label';
-    	$result=$localobject->update($user);
+    	$localobject->label = 'New label';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -209,15 +209,15 @@ 
      */
     public function testAccountingAccountDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new AccountingAccount($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject = new AccountingAccount($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/FactureTestRounding.php

Indentation +157 added lines, -157 removed lines

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

Spacing +72 added lines, -72 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -35,7 +35,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -77,8 +77,8 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+    	global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
 	protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -128,29 +128,29 @@ 
      */
     public function testFactureRoundingCreate1()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-        $localobject=new Facture($this->savdb);
+        $localobject = new Facture($this->savdb);
         $localobject->initAsSpecimen();
-        $localobject->lines=array();
+        $localobject->lines = array();
         unset($localobject->total_ht);
         unset($localobject->total_ttc);
         unset($localobject->total_tva);
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         // Add two lines
-        for ($i=0; $i<2; $i++)
+        for ($i = 0; $i < 2; $i++)
         {
             $localobject->addline('Description '.$i, 1.24, 1, 10);
         }
 
-        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->fetch($result);
         //var_dump($newlocalobject);
 
@@ -171,29 +171,29 @@ 
      */
     public function testFactureRoundingCreate2()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-        $localobject=new Facture($this->savdb);
+        $localobject = new Facture($this->savdb);
         $localobject->initAsSpecimen();
-        $localobject->lines=array();
+        $localobject->lines = array();
         unset($localobject->total_ht);
         unset($localobject->total_ttc);
         unset($localobject->total_vat);
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         // Add two lines
-        for ($i=0; $i<2; $i++)
+        for ($i = 0; $i < 2; $i++)
         {
             $localobject->addline('Description '.$i, 1.24, 1, 10);
         }
 
-        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->fetch($result);
         //var_dump($newlocalobject);
 
@@ -211,31 +211,31 @@ 
      */
     public function testFactureAddLine1()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
     	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-    	$localobject1a=new Facture($this->savdb);
+    	$localobject1a = new Facture($this->savdb);
     	$localobject1a->initAsSpecimen('nolines');
-    	$facid=$localobject1a->create($user);
-    	$localobject1a->addline('Line 1', 6.36, 15, 21);	// This include update_price
+    	$facid = $localobject1a->create($user);
+    	$localobject1a->addline('Line 1', 6.36, 15, 21); // This include update_price
     	print __METHOD__." id=".$facid." total_ttc=".$localobject1a->total_ttc."\n";
     	$this->assertEquals(95.40, $localobject1a->total_ht);
     	$this->assertEquals(20.03, $localobject1a->total_tva);
     	$this->assertEquals(115.43, $localobject1a->total_ttc);
 
     	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1;
 
-    	$localobject1b=new Facture($this->savdb);
+    	$localobject1b = new Facture($this->savdb);
     	$localobject1b->initAsSpecimen('nolines');
-    	$facid=$localobject1b->create($user);
-    	$localobject1b->addline('Line 1', 6.36, 15, 21);	// This include update_price
+    	$facid = $localobject1b->create($user);
+    	$localobject1b->addline('Line 1', 6.36, 15, 21); // This include update_price
     	print __METHOD__." id=".$facid." total_ttc=".$localobject1b->total_ttc."\n";
     	$this->assertEquals(95.40, $localobject1b->total_ht, 'testFactureAddLine1 total_ht');
     	$this->assertEquals(20.03, $localobject1b->total_tva, 'testFactureAddLine1 total_tva');
@@ -252,18 +252,18 @@ 
      */
     public function testFactureAddLine2()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
     	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-    	$localobject2=new Facture($this->savdb);
+    	$localobject2 = new Facture($this->savdb);
     	$localobject2->initAsSpecimen('nolines');
-    	$facid=$localobject2->create($user);
+    	$facid = $localobject2->create($user);
     	$localobject2->addline('Line 1', 6.36, 5, 21);
     	$localobject2->addline('Line 2', 6.36, 5, 21);
     	$localobject2->addline('Line 3', 6.36, 5, 21);
@@ -273,11 +273,11 @@ 
     	$this->assertEquals(115.44, $localobject2->total_ttc);
 
     	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1;
 
-    	$localobject2=new Facture($this->savdb);
+    	$localobject2 = new Facture($this->savdb);
     	$localobject2->initAsSpecimen('nolines');
-    	$facid=$localobject2->create($user);
+    	$facid = $localobject2->create($user);
     	$localobject2->addline('Line 1', 6.36, 5, 21);
     	$localobject2->addline('Line 2', 6.36, 5, 21);
     	$localobject2->addline('Line 3', 6.36, 5, 21);
@@ -297,18 +297,18 @@ 
      */
     public function testFactureAddLine3()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
     	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0;
 
-    	$localobject3=new Facture($this->savdb);
+    	$localobject3 = new Facture($this->savdb);
     	$localobject3->initAsSpecimen('nolines');
-    	$facid=$localobject3->create($user);
+    	$facid = $localobject3->create($user);
     	$localobject3->addline('Line 1', 6.36, 3, 21);
     	$localobject3->addline('Line 2', 6.36, 3, 21);
     	$localobject3->addline('Line 3', 6.36, 3, 21);
@@ -320,11 +320,11 @@ 
     	$this->assertEquals(115.45, $localobject3->total_ttc);
 
     	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1;
 
-    	$localobject3=new Facture($this->savdb);
+    	$localobject3 = new Facture($this->savdb);
     	$localobject3->initAsSpecimen('nolines');
-    	$facid=$localobject3->create($user);
+    	$facid = $localobject3->create($user);
     	$localobject3->addline('Line 1', 6.36, 3, 21);
     	$localobject3->addline('Line 2', 6.36, 3, 21);
     	$localobject3->addline('Line 3', 6.36, 3, 21);

dolibarr/test/phpunit/ImportTest.php

Indentation +53 added lines, -53 removed lines

@@ -49,74 +49,74 @@ 
  */
 class ImportTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ImportTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ImportTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
-		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        global $conf,$user,$langs,$db;
+        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		//$db->rollback();
+        global $conf,$user,$langs,$db;
+        //$db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -134,6 +134,6 @@ 
         // according to option
 
 
-		return true;
+        return true;
     }
 }

Spacing +24 added lines, -24 removed lines

@@ -23,21 +23,21 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 /**
@@ -65,11 +65,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -79,7 +79,7 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
@@ -88,7 +88,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		//$db->rollback();
 
 		print __METHOD__."\n";
@@ -101,11 +101,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -127,7 +127,7 @@ 
      */
     public function testImportSample1()
     {
-        $file=dirname(__FILE__).'/Example_import_company_1.csv';
+        $file = dirname(__FILE__).'/Example_import_company_1.csv';
 
         // TODO
         // Run import on file and check the record with field "auto" are filled

Braces +33 added lines, -10 removed lines

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