Completed
Branch develop (b27460)
by
unknown
19:18
created
test/phpunit/CommonClassTest.class.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	$_SERVER['PHP_SELF'] = "phpunit";
32 32
 }
33 33
 
34
-global $conf,$user,$langs,$db;
34
+global $conf, $user, $langs, $db;
35 35
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
36 36
 //require_once 'PHPUnit/Autoload.php';
37 37
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 		parent::__construct($name, $data, $dataName);
92 92
 
93 93
 		//$this->sharedFixture
94
-		global $conf,$user,$langs,$db;
94
+		global $conf, $user, $langs, $db;
95 95
 		$this->savconf = $conf;
96 96
 		$this->savuser = $user;
97 97
 		$this->savlangs = $langs;
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public static function setUpBeforeClass(): void
112 112
 	{
113
-		global $conf,$user,$langs,$db;
113
+		global $conf, $user, $langs, $db;
114 114
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
115 115
 
116 116
 		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 	 */
194 194
 	protected function setUp(): void
195 195
 	{
196
-		global $conf,$user,$langs,$db;
196
+		global $conf, $user, $langs, $db;
197 197
 
198 198
 		$conf = $this->savconf;
199 199
 		$user = $this->savuser;
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 				if (in_array($sKey, $fieldstoignorearray)) {
288 288
 					continue;
289 289
 				}
290
-				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
290
+				if (!$ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
291 291
 					$retAr[] = get_class($oA).'::'.$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : json_encode($oVarsA[$sKey])).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : json_encode($oVarsB[$sKey]));
292 292
 				}
293 293
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 		'accounting' => 'Accounting',
340 340
 		'agenda' => 'Agenda',
341 341
 		'ai' => 'Ai',
342
-		'anothermodule' => null,  // Not used in code, used in translations.lang
342
+		'anothermodule' => null, // Not used in code, used in translations.lang
343 343
 		'api' => 'Api',
344 344
 		'asset' => 'Asset',
345 345
 		'bank' => 'Banque',
@@ -351,9 +351,9 @@  discard block
 block discarded – undo
351 351
 		'cashdesk' => null,
352 352
 		'category' => 'Categorie',
353 353
 		'clicktodial' => 'ClickToDial',
354
-		'collab' => 'Collab',  // TODO: fill in proper name
354
+		'collab' => 'Collab', // TODO: fill in proper name
355 355
 		'comptabilite' => 'Comptabilite',
356
-		'contact' => null,  // TODO: fill in proper class
356
+		'contact' => null, // TODO: fill in proper class
357 357
 		'contract' => 'Contrat',
358 358
 		'cron' => 'Cron',
359 359
 		'datapolicy' => 'DataPolicy',
@@ -361,22 +361,22 @@  discard block
 block discarded – undo
361 361
 		'debugbar' => 'DebugBar',
362 362
 		'shipping' => 'Expedition',
363 363
 		'deplacement' => 'Deplacement',
364
-		"documentgeneration" => 'DocumentGeneration',  // TODO: fill in proper name
364
+		"documentgeneration" => 'DocumentGeneration', // TODO: fill in proper name
365 365
 		'don' => 'Don',
366 366
 		'dynamicprices' => 'DynamicPrices',
367 367
 		'ecm' => 'ECM',
368
-		'ecotax' => null,  // TODO: External module ?
368
+		'ecotax' => null, // TODO: External module ?
369 369
 		'emailcollector' => 'EmailCollector',
370 370
 		'eventorganization' => 'EventOrganization',
371 371
 		'expensereport' => 'ExpenseReport',
372 372
 		'export' => 'Export',
373
-		'externalrss' => 'ExternalRss',  // TODO: fill in proper name
373
+		'externalrss' => 'ExternalRss', // TODO: fill in proper name
374 374
 		'externalsite' => 'ExternalSite',
375 375
 		'fckeditor' => 'Fckeditor',
376 376
 		'fournisseur' => 'Fournisseur',
377 377
 		'ftp' => 'FTP',
378
-		'geoipmaxmind' => 'GeoIPMaxmind',  // TODO: fill in proper name
379
-		'google' => null,  // External ?
378
+		'geoipmaxmind' => 'GeoIPMaxmind', // TODO: fill in proper name
379
+		'google' => null, // External ?
380 380
 		'gravatar' => 'Gravatar',
381 381
 		'holiday' => 'Holiday',
382 382
 		'hrm' => 'HRM',
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
 		'ldap' => 'Ldap',
391 391
 		'loan' => 'Loan',
392 392
 		'mailing' => 'Mailing',
393
-		'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
393
+		'mailman' => null, // Same module as mailmanspip -> MailmanSpip ??
394 394
 		'mailmanspip' => 'MailmanSpip',
395 395
 		'margin' => 'Margin',
396 396
 		'member' => 'Adherent',
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		'notification' => 'Notification',
404 404
 		'numberwords' => null, // Not provided by default, no module tests
405 405
 		'oauth' => 'Oauth',
406
-		'openstreetmap' => null,  // External module?
406
+		'openstreetmap' => null, // External module?
407 407
 		'opensurvey' => 'OpenSurvey',
408 408
 		'order' => 'Commande',
409 409
 		'partnership' => 'Partnership',
@@ -430,8 +430,8 @@  discard block
 block discarded – undo
430 430
 		'stock' => 'Stock',
431 431
 		'stocktransfer' => 'StockTransfer',
432 432
 		'stripe' => 'Stripe',
433
-		'supplier_invoice' => null,  // Special case, uses invoice
434
-		'supplier_order' => null,  // Special case, uses invoice
433
+		'supplier_invoice' => null, // Special case, uses invoice
434
+		'supplier_order' => null, // Special case, uses invoice
435 435
 		'supplier_proposal' => 'SupplierProposal',
436 436
 		'syslog' => 'Syslog',
437 437
 		'takepos' => 'TakePos',
Please login to merge, or discard this patch.