Dolibarr / dolibarr

test/phpunit/ActionCommTest.php

Spacing +36 added lines, -36 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,7 +55,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		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 (!isModEnabled('agenda')) {
@@ -74,28 +74,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($db);
+		$localobject = new ActionComm($db);
 
-		$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_private = '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;
@@ -127,14 +127,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($db);
-		$result=$localobject->fetch($id);
+		$localobject = new ActionComm($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -152,14 +152,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=".$localobject->id." result=".$result."\n";
@@ -177,15 +177,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($db);
-		$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($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/LangTest.php

Spacing +43 added lines, -43 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -32,35 +32,35 @@ 
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+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("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 if (empty($user->id)) {
@@ -68,7 +68,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -87,47 +87,47 @@ 
 	 */
 	public function testLang()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
 		foreach ($filesarray as $key => $code) {
-			if (! preg_match('/^[a-z]+_[A-Z]+$/', $code)) {
+			if (!preg_match('/^[a-z]+_[A-Z]+$/', $code)) {
 				continue;
 			}
 
 			print 'Check language file for lang code='.$code."\n";
-			$tmplangs=new Translate('', $conf);
-			$langcode=$code;
+			$tmplangs = new Translate('', $conf);
+			$langcode = $code;
 			$tmplangs->setDefaultLang($langcode);
 			$tmplangs->load("main");
 
-			$result=$tmplangs->transnoentitiesnoconv("FONTFORPDF");
+			$result = $tmplangs->transnoentitiesnoconv("FONTFORPDF");
 			print __METHOD__." FONTFORPDF=".$result."\n";
 			$this->assertTrue(in_array($result, array('msungstdlight', 'stsongstdlight', 'helvetica', 'DejaVuSans', 'cid0jp', 'cid0kr', 'freemono', 'freeserif')), 'Error bad value '.$result.' for FONTFORPDF in main.lang file '.$code);
 
-			$result=$tmplangs->transnoentitiesnoconv("DIRECTION");
+			$result = $tmplangs->transnoentitiesnoconv("DIRECTION");
 			print __METHOD__." DIRECTION=".$result."\n";
 			$this->assertTrue(in_array($result, array('rtl', 'ltr')), 'Error bad value for DIRECTION in main.lang file '.$code);
 
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
+			$result = $tmplangs->transnoentitiesnoconv("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertTrue(in_array($result, array('.',',','/',' ','','None')), 'Error on decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertTrue(in_array($result, array('.', ',', '/', ' ', '', 'None')), 'Error on decimal separator for lang code '.$code); // Note that ، that is coma for RTL languages is not supported
 
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
+			$result = $tmplangs->transnoentitiesnoconv("SeparatorThousand");
 			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertTrue(in_array($result, array('.',',','/',' ','','\'','None','Space')), 'Error on thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertTrue(in_array($result, array('.', ',', '/', ' ', '', '\'', 'None', 'Space')), 'Error on thousand separator for lang code '.$code); // Note that ، that is coma for RTL languages is not supported
 
 			// Test java string contains only d,M,y,/,-,. and not m,...
-			$result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
+			$result = $tmplangs->transnoentitiesnoconv("FormatDateShortJava");
 			print __METHOD__." FormatDateShortJava=".$result."\n";
 			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJava KO for lang code '.$code);
-			$result=$tmplangs->trans("FormatDateShortJavaInput");
+			$result = $tmplangs->trans("FormatDateShortJavaInput");
 			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
 			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJavaInput KO for lang code '.$code);
 
@@ -136,26 +136,26 @@ 
 			print "Check also some syntax rules into the language file\n";
 			$filesarray2 = scandir(DOL_DOCUMENT_ROOT.'/langs/'.$code);
 			foreach ($filesarray2 as $key => $file) {
-				if (! preg_match('/\.lang$/', $file)) {
+				if (!preg_match('/\.lang$/', $file)) {
 					continue;
 				}
 
 				//print 'Check lang file '.$file."\n";
-				$filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/langs/'.$code.'/'.$file);
+				$filecontent = file_get_contents(DOL_DOCUMENT_ROOT.'/langs/'.$code.'/'.$file);
 
-				$result=preg_match('/=--$/m', $filecontent);	// A special % char we don't want. We want the common one.
+				$result = preg_match('/=--$/m', $filecontent); // A special % char we don't want. We want the common one.
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result == 0, 'Found a translation KEY=-- into file '.$code.'/'.$file.'. We probably want Key=- instead.');
 
-				$result=strpos($filecontent, '％');	// A special % char we don't want. We want the common one.
+				$result = strpos($filecontent, '％'); // A special % char we don't want. We want the common one.
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result === false, 'Found a bad percent char ％ instead of % into file '.$code.'/'.$file);
 
-				$result=preg_match('/%n/m', $filecontent);	// A sequence of char we don't want
+				$result = preg_match('/%n/m', $filecontent); // A sequence of char we don't want
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result == 0, 'Found a sequence %n into the translation file '.$code.'/'.$file.'. We probably want %s');
 
-				$result=preg_match('/<<<<</m', $filecontent);	// A sequence of char we don't want
+				$result = preg_match('/<<<<</m', $filecontent); // A sequence of char we don't want
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result == 0, 'Found a sequence <<<<< into the translation file '.$code.'/'.$file.'. Probably a bad merge of code were done.');
 			}
@@ -171,14 +171,14 @@ 
 	 */
 	public function testTrans()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$tmplangs=new Translate('', $conf);
-		$langcode='en_US';
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$tmplangs = new Translate('', $conf);
+		$langcode = 'en_US';
 		$tmplangs->setDefaultLang($langcode);
 		$tmplangs->load("main");
 

test/phpunit/FilesLibTest.php

Spacing +27 added lines, -27 removed lines

@@ -26,7 +26,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';
@@ -57,7 +57,7 @@ 
 	 */
 	public function testDolBasename()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -71,11 +71,11 @@ 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('a_file', $result);
 
-		$result = dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
+		$result = dol_basename('adir/νεο'); // With cyrillic data. Here basename fails to return correct value
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
 
-		$result = dol_basename('adir/νεο/');    // With cyrillic data. Here basename fails to return correct value
+		$result = dol_basename('adir/νεο/'); // With cyrillic data. Here basename fails to return correct value
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
 	}
@@ -88,7 +88,7 @@ 
 	 */
 	public function testDolCountNbOfLine()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -109,7 +109,7 @@ 
 	 */
 	public function testDolIsFileDir()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -135,7 +135,7 @@ 
 	*/
 	public function testDolOther()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -166,7 +166,7 @@ 
 	 */
 	public function testDolMimeType()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -212,7 +212,7 @@ 
 	 */
 	public function testDolDeleteDir()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -222,13 +222,13 @@ 
 		$dirout2 = $conf->admin->dir_temp.'/test2';
 
 		$count = 0;
-		$result = dol_delete_dir_recursive($dirout, $count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		$result = dol_delete_dir_recursive($dirout, $count); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result);
 
 		$count = 0;
 		$countdeleted = 0;
-		$result = dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		$result = dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result);
 		$this->assertGreaterThanOrEqual(0, $countdeleted);
@@ -236,7 +236,7 @@ 
 		dol_mkdir($dirout2);
 		$count = 0;
 		$countdeleted = 0;
-		$result = dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		$result = dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);
 		$this->assertGreaterThanOrEqual(1, $countdeleted);
@@ -250,7 +250,7 @@ 
 	 */
 	public function testDolCopyMoveDelete()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -260,21 +260,21 @@ 
 
 		$result = dol_copy($file, '/adir/that/does/not/exists/file.csv');
 		print __METHOD__." result=".$result."\n";
-		$this->assertLessThan(0, $result, "$result".'copy dir that does not exists');    // We should have error
+		$this->assertLessThan(0, $result, "$result".'copy dir that does not exists'); // We should have error
 
 		$result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)');    // Should be 1
+		$this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)'); // Should be 1
 
 		// Again to test with overwriting=0
 		$result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0, $result, 'copy destination already exists, no overwrite');    // Should be 0
+		$this->assertEquals(0, $result, 'copy destination already exists, no overwrite'); // Should be 0
 
 		// Again to test with overwriting=1
 		$result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite');    // Should be 1
+		$this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite'); // Should be 1
 
 		// To test a move that should work
 		$result = dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1);
@@ -304,7 +304,7 @@ 
 		// Test copy with special char / delete with blob
 		$result = dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite');    // Should be 1
+		$this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite'); // Should be 1
 
 		// Try to delete using a glob criteria
 		$result = dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
@@ -319,7 +319,7 @@ 
 	 */
 	public function testDolCompressUnCompress()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -407,7 +407,7 @@ 
 	 */
 	public function testDolCheckSecureAccessDocument()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -427,7 +427,7 @@ 
 		// Check access to SPECIMEN
 		$user->rights->facture->lire = 0;
 		$user->rights->facture->creer = 0;
-		$filename = 'SPECIMEN.pdf';             // Filename relative to module part
+		$filename = 'SPECIMEN.pdf'; // Filename relative to module part
 		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
 		$this->assertEquals(1, $result['accessallowed'], "Check access allowed to '$filename'".json_encode($result));
 
@@ -435,32 +435,32 @@ 
 		// Check read permission
 		$user->rights->facture->lire = 1;
 		$user->rights->facture->creer = 1;
-		$filename = 'FA010101/FA010101.pdf';    // Filename relative to module part
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
 		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
 		$this->assertEquals(1, $result['accessallowed'], "Check access allowed to '$filename'".json_encode($result));
 
 		$user->rights->facture->lire = 0;
 		$user->rights->facture->creer = 0;
-		$filename = 'FA010101/FA010101.pdf';    // Filename relative to module part
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
 		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
 		$this->assertEquals(0, $result['accessallowed'], "Check access denied to '$filename':".json_encode($result));
 
 		// Check write permission
 		$user->rights->facture->lire = 0;
 		$user->rights->facture->creer = 0;
-		$filename = 'FA010101/FA010101.pdf';    // Filename relative to module part
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
 		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
 		$this->assertEquals(0, $result['accessallowed']);
 
 		$user->rights->facture->lire = 1;
 		$user->rights->facture->creer = 1;
-		$filename = 'FA010101/FA010101.pdf';    // Filename relative to module part
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
 		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
 		$this->assertEquals(1, $result['accessallowed']);
 
 		$user->rights->facture->lire = 1;
 		$user->rights->facture->creer = 0;
-		$filename = 'FA010101/FA010101.pdf';    // Filename relative to module part
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
 		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
 		$this->assertEquals(0, $result['accessallowed']);
 
@@ -477,7 +477,7 @@ 
 	 */
 	public function testDolDirMove()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;

test/phpunit/ProductTest.php

Spacing +37 added lines, -37 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,7 +55,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if (!isModEnabled('product')) {
 			print __METHOD__." Module Product must be enabled.\n";
@@ -75,15 +75,15 @@ 
 	 */
 	public function testProductCreate()
 	{
-		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 Product($db);
+		$localobject = new Product($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0, "Creation of product");
@@ -102,14 +102,14 @@ 
 	 */
 	public function testProductFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Product($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Product($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -127,15 +127,15 @@ 
 	 */
 	public function testProductUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$localobject->note_public = 'New public note after update';
 		$localobject->note_private = 'New private note after update';
-		$result=$localobject->update($localobject->id, $user);
+		$result = $localobject->update($localobject->id, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Error '.$localobject->error);
 
@@ -153,11 +153,11 @@ 
 	 */
 	public function testProductOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$this->assertEquals(0, 0);
 
@@ -175,16 +175,16 @@ 
 	 */
 	public function testProductDelete($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 Product($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Product($db);
+		$result = $localobject->fetch($id);
 
-		$result=$localobject->delete($user);
+		$result = $localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 

test/phpunit/ProfidLibTest.php

Spacing +35 added lines, -35 removed lines

@@ -23,42 +23,42 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db,$mysoc;
+global $conf, $user, $langs, $db, $mysoc;
 //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/profid.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+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("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 
@@ -80,11 +80,11 @@ 
 	public function testIsValidLuhn()
 	{
 		// Tests OK
-		$this->assertTrue(isValidLuhn(972487086));		// int
-		$this->assertTrue(isValidLuhn("972487086"));	// string
+		$this->assertTrue(isValidLuhn(972487086)); // int
+		$this->assertTrue(isValidLuhn("972487086")); // string
 		// Tests KO
-		$this->assertFalse(isValidLuhn(123456789));		// int
-		$this->assertFalse(isValidLuhn("123456789"));	// string
+		$this->assertFalse(isValidLuhn(123456789)); // int
+		$this->assertFalse(isValidLuhn("123456789")); // string
 	}
 
 
@@ -97,11 +97,11 @@ 
 	{
 		// Tests OK
 		$this->assertTrue(isValidSiren("732829320"));
-		$this->assertTrue(isValidSiren(" 732 829 320 "));	// formatted with spaces
+		$this->assertTrue(isValidSiren(" 732 829 320 ")); // formatted with spaces
 		// Tests NOK
-		$this->assertFalse(isValidSiren("123456ABC"));		// not numeric
-		$this->assertFalse(isValidSiren("43336767"));		// Luhn test OK but length != 9
-		$this->assertFalse(isValidSiren("123456789"));		// 9 digits but Luhn test KO
+		$this->assertFalse(isValidSiren("123456ABC")); // not numeric
+		$this->assertFalse(isValidSiren("43336767")); // Luhn test OK but length != 9
+		$this->assertFalse(isValidSiren("123456789")); // 9 digits but Luhn test KO
 	}
 
 
@@ -115,12 +115,12 @@ 
 	{
 		// Tests OK
 		$this->assertTrue(isValidSiret("73282932000074"));
-		$this->assertTrue(isValidSiret(" 732 829 320 00074 "));		// formatted with spaces
-		$this->assertTrue(isValidSiret("35600000049837"));			// Specific cases of "La Poste" companies
+		$this->assertTrue(isValidSiret(" 732 829 320 00074 ")); // formatted with spaces
+		$this->assertTrue(isValidSiret("35600000049837")); // Specific cases of "La Poste" companies
 		// Tests NOK
-		$this->assertFalse(isValidSiret("123456ABC12345"));			// not numeric
-		$this->assertFalse(isValidSiret("3624679471379"));			// Luhn test OK but length != 14
-		$this->assertFalse(isValidSiret("12345678912345"));			// 14 digits but Luhn test KO
+		$this->assertFalse(isValidSiret("123456ABC12345")); // not numeric
+		$this->assertFalse(isValidSiret("3624679471379")); // Luhn test OK but length != 14
+		$this->assertFalse(isValidSiret("12345678912345")); // 14 digits but Luhn test KO
 	}
 
 
@@ -134,10 +134,10 @@ 
 	{
 		// Tests OK
 		$this->assertTrue(isValidTinForPT("123456789"));
-		$this->assertTrue(isValidTinForPT(" 123 456 789 "));		// formatted with spaces
+		$this->assertTrue(isValidTinForPT(" 123 456 789 ")); // formatted with spaces
 		// Tests NOK
-		$this->assertFalse(isValidTinForPT("123456ABC"));			// not numeric
-		$this->assertFalse(isValidTinForPT("12345678"));			// length != 9
+		$this->assertFalse(isValidTinForPT("123456ABC")); // not numeric
+		$this->assertFalse(isValidTinForPT("12345678")); // length != 9
 	}
 
 
@@ -151,10 +151,10 @@ 
 	{
 		// Tests OK
 		$this->assertTrue(isValidTinForDZ("123456789123456"));
-		$this->assertTrue(isValidTinForDZ(" 12345 67891 23456 "));		// formatted with spaces
+		$this->assertTrue(isValidTinForDZ(" 12345 67891 23456 ")); // formatted with spaces
 		// Tests NOK
-		$this->assertFalse(isValidTinForDZ("123456789123ABC"));			// not numeric
-		$this->assertFalse(isValidTinForDZ("123456789123"));			// length != 15
+		$this->assertFalse(isValidTinForDZ("123456789123ABC")); // not numeric
+		$this->assertFalse(isValidTinForDZ("123456789123")); // length != 15
 	}
 
 
@@ -170,10 +170,10 @@ 
 		$this->assertTrue(isValidTinForBE("0123.123.123"));
 		$this->assertTrue(isValidTinForBE("1234.123.123"));
 		// Tests NOK
-		$this->assertFalse(isValidTinForBE("2345.123.123"));		// First digit shall be 0 or 1
-		$this->assertFalse(isValidTinForBE("1234 123 123"));		// formatted with spaces instead of dots
-		$this->assertFalse(isValidTinForBE("1234123123"));			// without dots formatting
-		$this->assertFalse(isValidTinForBE("ABCD.123.123"));		// not digits only
+		$this->assertFalse(isValidTinForBE("2345.123.123")); // First digit shall be 0 or 1
+		$this->assertFalse(isValidTinForBE("1234 123 123")); // formatted with spaces instead of dots
+		$this->assertFalse(isValidTinForBE("1234123123")); // without dots formatting
+		$this->assertFalse(isValidTinForBE("ABCD.123.123")); // not digits only
 	}
 
 	// TODO

test/phpunit/BOMTest.php

Spacing +17 added lines, -17 removed lines

@@ -23,7 +23,7 @@ 
  * \brief   PHPUnit test for BillOfMaterials class.
  */
 
-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;
 
 $langs->load("main");
 
@@ -56,15 +56,15 @@ 
 	 */
 	public function testBOMCreate()
 	{
-		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 BOM($db);
+		$localobject = new BOM($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -83,15 +83,15 @@ 
 	 */
 	public function testBOMDelete($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 BOM($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		$localobject = new BOM($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/WebservicesThirdpartyTest.php

Spacing +51 added lines, -51 removed lines

@@ -24,12 +24,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
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 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';
 
 
 /**
@@ -53,7 +53,7 @@ 
 {
 	protected $soapclient;
 
-	private $ns='http://www.dolibarr.org/ns/';
+	private $ns = 'http://www.dolibarr.org/ns/';
 
 
 	/**
@@ -68,11 +68,11 @@ 
 		parent::__construct($name);
 
 		//$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;
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
 
@@ -80,7 +80,7 @@ 
 		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->soap_defencoding = 'UTF-8';
 			$this->soapclient->decodeUTF8(false);
 		}
 
@@ -97,17 +97,17 @@ 
 	 */
 	public function testWSThirdpartycreateThirdParty()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$WS_METHOD  = 'createThirdParty';
+		$WS_METHOD = 'createThirdParty';
 
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 				'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 				'sourceapplication'=>'DEMO',
 				'login'=>'admin',
@@ -153,16 +153,16 @@ 
 		);
 
 		// Test URL
-		$result='';
+		$result = '';
 		$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -190,33 +190,33 @@ 
 	 */
 	public function testWSThirdpartygetThirdPartyById($result)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 		$id = $result['id'];
 
-		$WS_METHOD  = 'getThirdParty';
+		$WS_METHOD = 'getThirdParty';
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 		'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 		'sourceapplication'=>'DEMO',
 		'login'=>'admin',
 		'password'=>'admin',
 		'entity'=>'');
 
-		$result='';
+		$result = '';
 		$parameters = array('authentication'=>$authentication, 'id'=>$id);
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -251,17 +251,17 @@ 
 	 */
 	public function testWSThirdpartygetThirdPartyByRefExt($result)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 		$id = $result['id'];
 
-		$WS_METHOD  = 'getThirdParty';
+		$WS_METHOD = 'getThirdParty';
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 				'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 				'sourceapplication'=>'DEMO',
 				'login'=>'admin',
@@ -269,17 +269,17 @@ 
 				'entity'=>'');
 
 		// Test URL
-		$result='';
+		$result = '';
 		$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
 		print $this->soapclient->response;
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -312,33 +312,33 @@ 
 	 */
 	public function testWSThirdpartydeleteThirdPartyById($result)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 		$id = $result['id'];
 
-		$WS_METHOD  = 'deleteThirdParty';
+		$WS_METHOD = 'deleteThirdParty';
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 				'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 				'sourceapplication'=>'DEMO',
 				'login'=>'admin',
 				'password'=>'admin',
 				'entity'=>'');
 
-		$result='';
+		$result = '';
 		$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
 		print __METHOD__." call method ".$WS_METHOD."\n";
 		try {
 			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			print 'Error: '.$this->soapclient->error_str;
 			print "\n<br>\n";
 			print $this->soapclient->request;

test/phpunit/ContratTest.php

Spacing +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,21 +55,21 @@ 
 	 */
 	public function testContratCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$soc = new Societe($db);
 		$soc->name = "ContratTest Unittest";
 		$socid = $soc->create($user);
 		$this->assertLessThan($socid, 0, $soc->errorsToString());
 
-		$localobject=new Contrat($db);
+		$localobject = new Contrat($db);
 		$localobject->initAsSpecimen();
 		$localobject->socid = $socid;
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -88,14 +88,14 @@ 
 	 */
 	public function testContratFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Contrat($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Contrat($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -114,11 +114,11 @@ 
 	 */
 	public function testContratOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		/*$result=$localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -143,15 +143,15 @@ 
 	 */
 	public function testContratDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Contrat($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Contrat($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/UserTest.php

Spacing +73 added lines, -73 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,14 +55,14 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if (getDolGlobalString('MAIN_MODULE_LDAP')) {
 			print "\n".__METHOD__." module LDAP must be disabled.\n";
 			die(1);
 		}
 
-		$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";
 	}
@@ -74,17 +74,17 @@ 
 	 */
 	public function testUserCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__." USER_PASSWORD_GENERATED=".getDolGlobalString('USER_PASSWORD_GENERATED')."\n";
 
-		$localobject=new User($db);
+		$localobject = new User($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0, 'Creation of user has failed: '.$localobject->error);
 		print __METHOD__." result=".$result."\n";
@@ -101,14 +101,14 @@ 
 	 */
 	public function testUserFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new User($db);
-		$result=$localobject->fetch($id);
+		$localobject = new User($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -125,23 +125,23 @@ 
 	 */
 	public function testUserUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$this->changeProperties($localobject);
-		$result=$localobject->update($user);
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
 		// Test everything are still same than specimen
-		$newlocalobject=new User($db);
+		$newlocalobject = new User($db);
 		$newlocalobject->initAsSpecimen();
 		$this->changeProperties($newlocalobject);
-		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','flagdelsessionsbefore','iplastlogin','ippreviouslogin','trackid')), array());    // Actual, Expected
+		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id', 'socid', 'societe_id', 'specimen', 'note', 'ref', 'pass', 'pass_indatabase', 'pass_indatabase_crypted', 'pass_temp', 'datec', 'datem', 'datelastlogin', 'datepreviouslogin', 'flagdelsessionsbefore', 'iplastlogin', 'ippreviouslogin', 'trackid')), array()); // Actual, Expected
 
 		return $localobject;
 	}
@@ -156,13 +156,13 @@ 
 	 */
 	public function testUserDisable($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->setstatus(0);
+		$result = $localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -180,11 +180,11 @@ 
 	 */
 	public function testUserOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		/*$result=$localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -206,17 +206,17 @@ 
 	 */
 	public function testUserHasRight($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 		/*$result=$localobject->setstatus(0);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 		*/
 
-		print __METHOD__." id=". $localobject->id ."\n";
+		print __METHOD__." id=".$localobject->id."\n";
 		//$this->assertNotEquals($user->date_creation, '');
 		$localobject->addrights(0, 'supplier_proposal');
 		$this->assertEquals($localobject->hasRight('member', ''), 0);
@@ -238,11 +238,11 @@ 
 	 */
 	public function testUserSetPassword($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;
 
 		// Test the 'none' password generator
 
@@ -351,15 +351,15 @@ 
 	 */
 	public function testUserDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new User($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		$localobject = new User($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -376,15 +376,15 @@ 
 	 */
 	public function testUserAddPermission($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new User($db);
-		$result=$localobject->fetch(1);			// Other tests use the user id 1
-		$result=$localobject->addrights(0, 'supplier_proposal');
+		$localobject = new User($db);
+		$result = $localobject->fetch(1); // Other tests use the user id 1
+		$result = $localobject->addrights(0, 'supplier_proposal');
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -401,7 +401,7 @@ 
 	 */
 	public function changeProperties(&$localobject)
 	{
-		$localobject->note_private='New note after update';
+		$localobject->note_private = 'New note after update';
 	}
 
 	/**
@@ -415,23 +415,23 @@ 
 	 */
 	public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
 	{
-		$retAr=array();
+		$retAr = array();
 
 		if (get_class($oA) !== get_class($oB)) {
-			$retAr[]="Supplied objects are not of same class.";
+			$retAr[] = "Supplied objects are not of same class.";
 		} else {
-			$oVarsA=get_object_vars($oA);
-			$oVarsB=get_object_vars($oB);
-			$aKeys=array_keys($oVarsA);
+			$oVarsA = get_object_vars($oA);
+			$oVarsB = get_object_vars($oB);
+			$aKeys = array_keys($oVarsA);
 			foreach ($aKeys as $sKey) {
 				if (in_array($sKey, $fieldstoignorearray)) {
 					continue;
 				}
-				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
+				if (!$ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+					$retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
+					$retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 			}
 		}