Completed
Branch develop (373df2)
by
unknown
27:04
created
dev/tools/test/namespacemig/bbb.class.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class Bbb
20 20
 {
21
-	const BBB='bbb';
21
+	const BBB = 'bbb';
22 22
 
23 23
 	/**
24 24
 	 * do
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	{
30 30
 		global $globalaaa, $globalbbb;
31 31
 		echo 'dobbb'."\n";
32
-		$globalaaa.='+bbb';
33
-		$globalbbb.='+bbb';
32
+		$globalaaa .= '+bbb';
33
+		$globalbbb .= '+bbb';
34 34
 	}
35 35
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,9 +25,11 @@
 block discarded – undo
25 25
 	 *
26 26
 	 * @return void
27 27
 	 */
28
-	public function do()
28
+	public function do {
29
+		()
29 30
 	{
30 31
 		global $globalaaa, $globalbbb;
32
+	}
31 33
 		echo 'dobbb'."\n";
32 34
 		$globalaaa.='+bbb';
33 35
 		$globalbbb.='+bbb';
Please login to merge, or discard this patch.
dev/tools/test/namespacemig/aaa.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
  */
21 21
 class Aaa
22 22
 {
23
-	const AAA='aaa';
23
+	const AAA = 'aaa';
24 24
 
25 25
 	/**
26 26
 	 * do
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,8 +27,10 @@
 block discarded – undo
27 27
 	 *
28 28
 	 * @return void
29 29
 	 */
30
-	public function do()
30
+	public function do {
31
+		()
31 32
 	{
32 33
 		echo 'doaaa'."\n";
33 34
 	}
35
+	}
34 36
 }
Please login to merge, or discard this patch.
dev/tools/test/testtcpdf.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@
 block discarded – undo
65 65
  - To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
66 66
 
67 67
 */
68
-$permissions=array('copy');
69
-$user_pass='aaa';
70
-$owner_pass=null;
71
-$mode=0;
72
-$pubkeys=null;
68
+$permissions = array('copy');
69
+$user_pass = 'aaa';
70
+$owner_pass = null;
71
+$mode = 0;
72
+$pubkeys = null;
73 73
 $pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys);
74 74
 
75 75
 // Example with public-key
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
 Encryption Example
124 124
 
125 125
 Consult the source code documentation for the SetProtection() method.
126
-EOD;
126
+eod;
127 127
 
128 128
 // print a block of text using Write()
129 129
 $pdf->Write(0, $txt, '', 0, 'L', true, 0, false, false, 0);
Please login to merge, or discard this patch.
dev/translation/autotranslator.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 $sapi_type = php_sapi_name();
30 30
 $script_file = basename(__FILE__);
31
-$path=dirname(__FILE__).'/';
31
+$path = dirname(__FILE__).'/';
32 32
 
33 33
 // Test if batch mode
34 34
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
45 45
 $langs->load("main");
46 46
 
47 47
 // Global variables
48
-$version='1.14';
49
-$error=0;
48
+$version = '1.14';
49
+$error = 0;
50 50
 
51 51
 
52 52
 // -------------------- START OF YOUR CODE HERE --------------------
53 53
 @set_time_limit(0);
54 54
 print "***** ".$script_file." (".$version.") *****\n";
55
-$dir=DOL_DOCUMENT_ROOT."/langs";
55
+$dir = DOL_DOCUMENT_ROOT."/langs";
56 56
 
57 57
 // Check parameters
58
-if (! isset($argv[3])) {
58
+if (!isset($argv[3])) {
59 59
 	print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
60 60
 	print "Example: ".$script_file."  en_US         pt_PT              123456\n";
61 61
 	print "Rem:     lang_code to use can be found on https://translate.google.com\n";
@@ -66,18 +66,18 @@  discard block
 block discarded – undo
66 66
 print 'Argument 1='.$argv[1]."\n";
67 67
 print 'Argument 2='.$argv[2]."\n";
68 68
 print 'Argument 3='.$argv[3]."\n";
69
-$file='';
69
+$file = '';
70 70
 if (isset($argv[4])) {
71
-	$file=$argv[4];
71
+	$file = $argv[4];
72 72
 	print 'Argument 4='.$argv[4]."\n";
73 73
 }
74 74
 print 'Files will be generated/updated in directory '.$dir."\n";
75 75
 
76 76
 if ($argv[2] != 'all') {
77
-	if (! is_dir($dir.'/'.$argv[2])) {
77
+	if (!is_dir($dir.'/'.$argv[2])) {
78 78
 		print 'Create directory '.$dir.'/'.$argv[2]."\n";
79
-		$result=mkdir($dir.'/'.$argv[2]);
80
-		if (! $result) {
79
+		$result = mkdir($dir.'/'.$argv[2]);
80
+		if (!$result) {
81 81
 			$db->close();
82 82
 			return -1;
83 83
 		}
Please login to merge, or discard this patch.
dev/initdata/generate-thirdparty.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 
106 106
 print "Generates ".GEN_NUMBER_SOCIETE." companies\n";
107 107
 for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
108
-	print "Company $s\n";
108
+	print "company $s\n";
109 109
 	$soc = new Societe($db);
110 110
 	$soc->name = "Company num ".time()."$s";
111 111
 	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 $sapi_type = php_sapi_name();
28 28
 $script_file = basename(__FILE__);
29
-$path=dirname(__FILE__).'/';
29
+$path = dirname(__FILE__).'/';
30 30
 
31 31
 // Test si mode batch
32 32
 $sapi_type = php_sapi_name();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Recupere root dolibarr
39 39
 //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
40
-require __DIR__. '/../../htdocs/master.inc.php';
40
+require __DIR__.'/../../htdocs/master.inc.php';
41 41
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
46 46
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
47 47
 
48
-$listoftown = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
49
-$listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
48
+$listoftown = array("Auray", "Baden", "Vannes", "Pirouville", "Haguenau", "Souffelweiersheim", "Illkirch-Graffenstaden", "Lauterbourg", "Picauville", "Sainte-Mère Eglise", "Le Bono");
49
+$listoflastname = array("Joe", "Marc", "Steve", "Laurent", "Nico", "Isabelle", "Dorothee", "Saby", "Brigitte", "Karine", "Jose-Anne", "Celine", "Virginie");
50 50
 
51 51
 
52 52
 /*
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
 define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
57 57
 
58 58
 
59
-$ret=$user->fetch('', 'admin');
60
-if (! $ret > 0) {
59
+$ret = $user->fetch('', 'admin');
60
+if (!$ret > 0) {
61 61
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
62 62
 	exit;
63 63
 }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 
67 67
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
68
-$resql=$db->query($sql);
68
+$resql = $db->query($sql);
69 69
 if ($resql) {
70 70
 	$num = $db->num_rows($resql);
71 71
 	$i = 0;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 }
78 78
 
79 79
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
80
-$resql=$db->query($sql);
80
+$resql = $db->query($sql);
81 81
 if ($resql) {
82 82
 	$num = $db->num_rows($resql);
83 83
 	$i = 0;
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 }
92 92
 
93 93
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
94
-$resql=$db->query($sql);
94
+$resql = $db->query($sql);
95 95
 if ($resql) {
96 96
 	$num = $db->num_rows($resql);
97 97
 	$i = 0;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	print "Company $s\n";
112 112
 	$soc = new Societe($db);
113 113
 	$soc->name = "Company num ".time()."$s";
114
-	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
115
-	$soc->client = mt_rand(1, 2);		// Une societe sur 2 est prospect, l'autre client
116
-	$soc->fournisseur = mt_rand(0, 1);	// Une societe sur 2 est fournisseur
117
-	$soc->code_client='CU'.time()."$s";
118
-	$soc->code_fournisseur='SU'.time()."$s";
119
-	$soc->tva_assuj=1;
120
-	$soc->country_id=1;
121
-	$soc->country_code='FR';
114
+	$soc->town = $listoftown[mt_rand(0, count($listoftown) - 1)];
115
+	$soc->client = mt_rand(1, 2); // Une societe sur 2 est prospect, l'autre client
116
+	$soc->fournisseur = mt_rand(0, 1); // Une societe sur 2 est fournisseur
117
+	$soc->code_client = 'CU'.time()."$s";
118
+	$soc->code_fournisseur = 'SU'.time()."$s";
119
+	$soc->tva_assuj = 1;
120
+	$soc->country_id = 1;
121
+	$soc->country_code = 'FR';
122 122
 	// Un client sur 3 a une remise de 5%
123
-	$user_remise=mt_rand(1, 3);
124
-	if ($user_remise==3) {
125
-		$soc->remise_percent=5;
123
+	$user_remise = mt_rand(1, 3);
124
+	if ($user_remise == 3) {
125
+		$soc->remise_percent = 5;
126 126
 	}
127 127
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
128 128
 	$soc->note_private = 'Company created by the script generate-societe.php';
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 			$contact = new Contact($db);
136 136
 			$contact->socid = $soc->id;
137 137
 			$contact->lastname = "Lastname".$c;
138
-			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
138
+			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname) - 1)];
139 139
 			if ($contact->create($user)) {
140 140
 			}
141 141
 		}
Please login to merge, or discard this patch.
dev/initdata/generate-product.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 	$produit->tva_tx = "20.0";
107 107
 	$ret=$produit->create($user);
108 108
 	if ($ret < 0) {
109
-		print "Error $ret - ".$produit->error."\n";
109
+		print "error $ret - ".$produit->error."\n";
110 110
 	} else {
111 111
 		print " OK with ref ".$produit->ref."\n";
112 112
 	}
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 $sapi_type = php_sapi_name();
28 28
 $script_file = basename(__FILE__);
29
-$path=dirname(__FILE__).'/';
29
+$path = dirname(__FILE__).'/';
30 30
 
31 31
 // Test si mode batch
32 32
 $sapi_type = php_sapi_name();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Recupere root dolibarr
39 39
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
40
-require __DIR__. '/../../htdocs/master.inc.php';
40
+require __DIR__.'/../../htdocs/master.inc.php';
41 41
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 define('GEN_NUMBER_PRODUIT', $argv[1] ?? 100);
54 54
 
55 55
 
56
-$ret=$user->fetch('', 'admin');
57
-if (! $ret > 0) {
56
+$ret = $user->fetch('', 'admin');
57
+if (!$ret > 0) {
58 58
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
59 59
 	exit;
60 60
 }
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 
64 64
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
65
-$resql=$db->query($sql);
65
+$resql = $db->query($sql);
66 66
 if ($resql) {
67 67
 	$num = $db->num_rows($resql);
68 68
 	$i = 0;
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 }
75 75
 
76 76
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
77
-$resql=$db->query($sql);
77
+$resql = $db->query($sql);
78 78
 if ($resql) {
79 79
 	$num = $db->num_rows($resql);
80 80
 	$i = 0;
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 }
89 89
 
90 90
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
91
-$resql=$db->query($sql);
91
+$resql = $db->query($sql);
92 92
 if ($resql) {
93 93
 	$num = $db->num_rows($resql);
94 94
 	$i = 0;
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	$produit->description = 'Description '.time().$s;
114 114
 	$produit->price = mt_rand(1, 999.99);
115 115
 	$produit->tva_tx = "20.0";
116
-	$ret=$produit->create($user);
116
+	$ret = $produit->create($user);
117 117
 	if ($ret < 0) {
118 118
 		print "Error $ret - ".$produit->error."\n";
119 119
 	} else {
Please login to merge, or discard this patch.
htdocs/contact/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 }
95 95
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
96 96
 
97
-$permissiontoadd = $user->hasRight('societe', 'contact', 'creer');	// Used by the include of actions_dellink.inc.php
97
+$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php
98 98
 
99 99
 
100 100
 /*
Please login to merge, or discard this patch.
htdocs/product/traduction.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -134,15 +134,15 @@  discard block
 block discarded – undo
134 134
 
135 135
 		foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
136 136
 			if ($key == $current_lang) {
137
-				$object->label = GETPOST("libelle-" . $key);
138
-				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
139
-				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
137
+				$object->label = GETPOST("libelle-".$key);
138
+				$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
139
+				$object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
140 140
 
141 141
 				$object->update($object->id, $user);
142 142
 			} else {
143
-				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
144
-				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
145
-				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
143
+				$object->multilangs[$key]["label"] = GETPOST("libelle-".$key);
144
+				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
145
+				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
146 146
 			}
147 147
 		}
148 148
 
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
 if (empty($reshook)) {
236 236
 	if ($action == '') {
237 237
 		if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
238
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
238
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>';
239 239
 			if ($cnt_trans > 0) {
240
-				print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>';
240
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
241 241
 			}
242 242
 		}
243 243
 	}
Please login to merge, or discard this patch.
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 		));
156 156
 
157 157
 		// Retrieve all extrafields if not already not know (should not happen)
158
-		if (! is_object($extrafields)) {
158
+		if (!is_object($extrafields)) {
159 159
 			$extrafields = new ExtraFields($this->db);
160 160
 			$extrafields->fetch_name_optionals_label($product->table_element);
161 161
 		}
Please login to merge, or discard this patch.