Merge pull request #11076 from frederic34/patch-2

phpcs fix

htdocs/core/modules/modProduct.class.php

@@ -349,7 +349,7 @@ class modProduct extends DolibarrModules
             'p.note_public' => "PublicNote",//public note
             'p.note' => "PrivateNote",//private note
             'p.customcode' => 'CustomCode',
-            'p.price' => "SellingPriceHT",//without tax
+            'p.price' => "SellingPriceHT",//without
             'p.price_min' => "MinPrice",
             'p.price_ttc' => "SellingPriceTTC",//with tax
             'p.price_min_ttc' => "SellingMinPriceTTC",
@@ -519,9 +519,12 @@ class modProduct extends DolibarrModules
         if (is_object($mysoc) && $mysoc->useLocalTax(2)) $import_sample=array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
         if (! empty($conf->barcode->enabled)) $import_sample=array_merge($import_sample, array('p.barcode'=>''));
         if (! empty($conf->global->PRODUCT_USE_UNITS)) {
-			$import_sample = array_merge($import_sample, array(
+            $import_sample = array_merge(
+                $import_sample,
+                array(
                     'p.fk_unit' => 'use a unit of measure from the dictionary. G/KG/M2/M3 etc....matches field "code" in table "' . MAIN_DB_PREFIX . 'c_units"'
-			));
+                )
+            );
 
 			$this->import_convertvalue_array[$r] = array_merge($this->import_convertvalue_array[$r], array(
 				'p.fk_unit' => array(

htdocs/core/tpl/objectline_create.tpl.php

@@ -137,6 +137,7 @@ if ($nolinesbefore) {
 		print '<td class="linecolcycleref2 right"></td>';
 	}
     if (! empty($usemargins))
+
 	{
 		if (!empty($user->rights->margins->creer)) {
 		?>
@@ -149,9 +150,7 @@ if ($nolinesbefore) {
 			echo $langs->trans('BuyingPrice');
 		else
 			echo $langs->trans('CostPrice');
-		?>
+		echo '</td>';
-		</td>
-		<?php
 		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
 		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
 	}
@@ -168,9 +167,7 @@ if ($nolinesbefore) {
     // Adds a line numbering column
     if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
       $coldisplay++;
-    	?>
+      echo '<td class="nobottom linecolnum center"></td>';
-    	<td class="nobottom linecolnum center"></td>
-    	<?php
     }
 
     $coldisplay++;
@@ -348,14 +345,12 @@ if ($nolinesbefore) {
 		echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
 		echo '</div>';
 	}
-	?>
+	echo '</td>';
-	</td>
 
-	<?php
 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
 	{
-	?>
 		$coldisplay++;
+        ?>
 		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref", 'alpha', 2):''); ?>"></td>
 	<?php } ?>
 
@@ -458,9 +453,7 @@ if ($nolinesbefore) {
 if (is_object($objectline)) {
 	print $objectline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
-?>
 
-<?php
 if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
 {
 	?>

htdocs/public/stripe/confirm_payment.php

@@ -127,16 +127,16 @@ try {
     ]);
 }
 
-/**
+/*
- * generatePaymentResponse
+ * generate payment response
  *
- * @param object    $intent         Intent
+ * @param \Stripe\PaymentIntent $intent PaymentIntent
  * @return void
  */
-function generatePaymentResponse($intent) {
+function generatePaymentResponse($intent)
-    if ($intent->status == 'requires_source_action' &&
-        $intent->next_action->type == 'use_stripe_sdk')
 {
+    if ($intent->status == 'requires_source_action' &&
+        $intent->next_action->type == 'use_stripe_sdk') {
         // Tell the client to handle the action
         echo json_encode([
             'requires_action' => true,