From c6cef85ccdbc1e86221ad35144c77804cf8e80ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 4 Sep 2018 21:16:17 +0200
Subject: [PATCH] move phpcs:ignore

---
 .../core/modules/expensereport/modules_expensereport.php  | 5 +++--
 htdocs/core/modules/export/export_excel2007.modules.php   | 2 +-
 htdocs/core/modules/societe/mod_codecompta_panicum.php    | 3 ++-
 htdocs/core/modules/usergroup/modules_usergroup.class.php | 7 ++++---
 htdocs/livraison/class/livraison.class.php                | 8 ++------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index 11396f84435..9ff7f671f9f 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/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()
 	{
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 5b2fd563427..74e35ff5b18 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/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
      *
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 1e990b42d69..2dd6a81de02 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/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)) {
diff --git a/htdocs/core/modules/usergroup/modules_usergroup.class.php b/htdocs/core/modules/usergroup/modules_usergroup.class.php
index ec976239b9b..caa79594080 100644
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/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;
 	}
-}
\ No newline at end of file
+}
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index e3c03b723b1..c5e4b36ed25 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/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;