Completed
Branch develop (8d1aaf)
by
unknown
20:23
created
htdocs/expedition/list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 
152 152
 $object->fields = dol_sort_array($object->fields, 'position');
153 153
 $arrayfields = dol_sort_array($arrayfields, 'position');
154
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
154
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
155 155
 
156 156
 // Security check
157 157
 $expeditionid = GETPOSTINT('id');
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 		$TFactThirdNbLines = array();
233 233
 
234 234
 		$nb_bills_created = 0;
235
-		$lastid= 0;
235
+		$lastid = 0;
236 236
 		$lastref = '';
237 237
 
238 238
 		$db->begin();
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 			if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
553 553
 				$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
554 554
 			}
555
-			if ($search_datedelivery_start)	{
555
+			if ($search_datedelivery_start) {
556 556
 				$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
557 557
 			}
558 558
 			if ($search_datedelivery_end) {
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
 			if ($searchCategoryCustomerOperator == 0) {
791 791
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
792 792
 			} else {
793
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
793
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
794 794
 			}
795 795
 		}
796 796
 	}
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 			if ($searchCategoryProductOperator == 0) {
821 821
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_elementdet = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
822 822
 			} else {
823
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
823
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
824 824
 			}
825 825
 		}
826 826
 	}
Please login to merge, or discard this patch.
htdocs/includes/OAuth/OAuth2/Service/Microsoft2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
         if (null === $data || !is_array($data)) {
120 120
             throw new TokenResponseException('Unable to parse response.');
121 121
         } elseif (isset($data['error'])) {
122
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
122
+            throw new TokenResponseException('Error in retrieving token: "'.$data['error'].'"');
123 123
         }
124 124
         //print $data['access_token'];exit;
125 125
 
Please login to merge, or discard this patch.
htdocs/core/lib/oauth.lib.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -281,7 +281,7 @@
 block discarded – undo
281 281
 	// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
282 282
 	$supportedoauth2array = array(
283 283
 		'OAUTH_GOOGLE_NAME' => array(
284
-			'callbackfile' => 'google',		// used to generate the filename: google_oauthcallback.php
284
+			'callbackfile' => 'google', // used to generate the filename: google_oauthcallback.php
285 285
 			'picto' => 'google',
286 286
 			'urlforapp' => 'OAUTH_GOOGLE_DESC',
287 287
 			'name' => 'Google',
Please login to merge, or discard this patch.