move phpcs:ignore

htdocs/core/modules/expensereport/modules_expensereport.php

@@ -52,6 +52,7 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
 	}
 }
 
+// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 /**
  * expensereport_pdf_create
  *
@@ -65,9 +66,9 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
  *  @param      int			$hideref        Hide ref
  *  @return     int         				0 if KO, 1 if OK
  */
-// phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
+    // phpcs:enable
 	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
@@ -142,7 +143,7 @@ abstract class ModeleNumRefExpenseReport
 	/**
 	 *	Renvoie version du module numerotation
 	 *
-	 *	@return     string      Valeur
+	 *  @return     string      Valeur
 	 */
 	function getVersion()
 	{

htdocs/core/modules/export/export_excel2007.modules.php

@@ -98,7 +98,7 @@ class ExportExcel2007 extends ExportExcel
 	}
 
 
-    // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *  Close Excel file
      *

htdocs/core/modules/societe/mod_codecompta_panicum.php

@@ -67,6 +67,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		return '';
 	}
 
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
@@ -75,9 +76,9 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	 *  @param  int		$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
-    // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	function get_code($db, $societe, $type='')
 	{
+        // phpcs:enable
 		$this->code='';
 
 		if (is_object($societe)) {

htdocs/core/modules/usergroup/modules_usergroup.class.php

@@ -44,16 +44,17 @@ abstract class ModelePDFUserGroup extends CommonDocGenerator
 	public $error='';
 
 
-	/**
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
 	 *	Return list of active generation modules
 	 *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
-    // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	static function liste_modeles($db,$maxfilenamelength=0)
 	{
+        // phpcs:enable
 		global $conf;
 
 		$type = 'group';
@@ -63,4 +64,4 @@ abstract class ModelePDFUserGroup extends CommonDocGenerator
 		$list = getListOfModels($db, $type, $maxfilenamelength);
 		return $list;
 	}
-}
+}

htdocs/livraison/class/livraison.class.php

@@ -1100,25 +1100,21 @@ class LivraisonLigne extends CommonObjectLine
      */
     public $label;
 
-<<<<<<< HEAD
-	var $description;  // Description produit
-=======
 	/**
 	 * @var string product description
 	 */
 	public $description;
 
->>>>>>> upstream/develop
 	/**
 	 * @deprecated
 	 * @see product_ref
 	 */
-	var $ref;
+	public $ref;
 	/**
 	 * @deprecated
 	 * @see product_label;
 	 */
-	var $libelle;
+	public $libelle;
 
 	public $product_ref;
 	public $product_label;