Completed
Branch develop (c4712c)
by
unknown
22:15
created
htdocs/core/boxes/box_members_last_subscriptions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@
 block discarded – undo
153 153
 
154 154
 					$datetoprint = dol_print_date($this->db->jdate($obj->datem ? $obj->datem : $obj->datec), 'dayhour', 'tzuserrel');
155 155
 					$this->info_box_contents[$line][] = [
156
-						'td' => 'class="right tdoverflowmax150 maxwidth150onsmartphone" title="' . dol_escape_htmltag($langs->trans("DateModification") . ': ' . $datetoprint).'"',
156
+						'td' => 'class="right tdoverflowmax150 maxwidth150onsmartphone" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.$datetoprint).'"',
157 157
 						'text' => $datetoprint,
158 158
 					];
159 159
 
Please login to merge, or discard this patch.
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';
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 		parent::__construct($name, $data, $dataName);
95 95
 
96 96
 		//$this->sharedFixture
97
-		global $conf,$user,$langs,$db;
97
+		global $conf, $user, $langs, $db;
98 98
 		$this->savconf = $conf;
99 99
 		$this->savuser = $user;
100 100
 		$this->savlangs = $langs;
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public static function setUpBeforeClass(): void
115 115
 	{
116
-		global $conf,$user,$langs,$db;
116
+		global $conf, $user, $langs, $db;
117 117
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
118 118
 
119 119
 		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 	 */
213 213
 	protected function setUp(): void
214 214
 	{
215
-		global $conf,$user,$langs,$db;
215
+		global $conf, $user, $langs, $db;
216 216
 
217 217
 		$conf = $this->savconf;
218 218
 		$user = $this->savuser;
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 				if (in_array($sKey, $fieldstoignorearray)) {
311 311
 					continue;
312 312
 				}
313
-				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
313
+				if (!$ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
314 314
 					$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]));
315 315
 				}
316 316
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 		'accounting' => 'Accounting',
363 363
 		'agenda' => 'Agenda',
364 364
 		'ai' => 'Ai',
365
-		'anothermodule' => null,  // Not used in code, used in translations.lang
365
+		'anothermodule' => null, // Not used in code, used in translations.lang
366 366
 		'api' => 'Api',
367 367
 		'asset' => 'Asset',
368 368
 		'bank' => 'Banque',
@@ -374,9 +374,9 @@  discard block
 block discarded – undo
374 374
 		'cashdesk' => null,
375 375
 		'category' => 'Categorie',
376 376
 		'clicktodial' => 'ClickToDial',
377
-		'collab' => 'Collab',  // TODO: fill in proper name
377
+		'collab' => 'Collab', // TODO: fill in proper name
378 378
 		'comptabilite' => 'Comptabilite',
379
-		'contact' => null,  // TODO: fill in proper class
379
+		'contact' => null, // TODO: fill in proper class
380 380
 		'contract' => 'Contrat',
381 381
 		'cron' => 'Cron',
382 382
 		'datapolicy' => 'DataPolicy',
@@ -384,21 +384,21 @@  discard block
 block discarded – undo
384 384
 		'debugbar' => 'DebugBar',
385 385
 		'shipping' => 'Expedition',
386 386
 		'deplacement' => 'Deplacement',
387
-		"documentgeneration" => 'DocumentGeneration',  // TODO: fill in proper name
387
+		"documentgeneration" => 'DocumentGeneration', // TODO: fill in proper name
388 388
 		'don' => 'Don',
389 389
 		'dynamicprices' => 'DynamicPrices',
390 390
 		'ecm' => 'ECM',
391
-		'ecotax' => null,  // TODO: External module ?
391
+		'ecotax' => null, // TODO: External module ?
392 392
 		'emailcollector' => 'EmailCollector',
393 393
 		'eventorganization' => 'EventOrganization',
394 394
 		'expensereport' => 'ExpenseReport',
395 395
 		'export' => 'Export',
396
-		'externalrss' => 'ExternalRss',  // TODO: fill in proper name
396
+		'externalrss' => 'ExternalRss', // TODO: fill in proper name
397 397
 		'fckeditor' => 'Fckeditor',
398 398
 		'fournisseur' => 'Fournisseur',
399 399
 		'ftp' => 'FTP',
400
-		'geoipmaxmind' => 'GeoIPMaxmind',  // TODO: fill in proper name
401
-		'google' => null,  // External ?
400
+		'geoipmaxmind' => 'GeoIPMaxmind', // TODO: fill in proper name
401
+		'google' => null, // External ?
402 402
 		'gravatar' => 'Gravatar',
403 403
 		'holiday' => 'Holiday',
404 404
 		'hrm' => 'HRM',
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 		'ldap' => 'Ldap',
413 413
 		'loan' => 'Loan',
414 414
 		'mailing' => 'Mailing',
415
-		'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
415
+		'mailman' => null, // Same module as mailmanspip -> MailmanSpip ??
416 416
 		'mailmanspip' => 'MailmanSpip',
417 417
 		'margin' => 'Margin',
418 418
 		'member' => 'Adherent',
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 		'notification' => 'Notification',
426 426
 		'numberwords' => null, // Not provided by default, no module tests
427 427
 		'oauth' => 'Oauth',
428
-		'openstreetmap' => null,  // External module?
428
+		'openstreetmap' => null, // External module?
429 429
 		'opensurvey' => 'OpenSurvey',
430 430
 		'order' => 'Commande',
431 431
 		'partnership' => 'Partnership',
@@ -453,8 +453,8 @@  discard block
 block discarded – undo
453 453
 		'stocktransfer' => 'StockTransfer',
454 454
 		'stripe' => 'Stripe',
455 455
 		'subtotals' => 'Subtotals',
456
-		'supplier_invoice' => null,  // Special case, uses invoice
457
-		'supplier_order' => null,  // Special case, uses invoice
456
+		'supplier_invoice' => null, // Special case, uses invoice
457
+		'supplier_order' => null, // Special case, uses invoice
458 458
 		'supplier_proposal' => 'SupplierProposal',
459 459
 		'syslog' => 'Syslog',
460 460
 		'takepos' => 'TakePos',
Please login to merge, or discard this patch.