PSR2 ClassDeclaration

dev/setup/codesniffer/ruleset.xml

@@ -374,7 +374,7 @@
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
-    <!--<rule ref="PSR2.Classes.ClassDeclaration" />-->
+    <rule ref="PSR2.Classes.ClassDeclaration" />
     <rule ref="PSR2.Methods.FunctionClosingBrace" />
 
 	<!-- This is not in PSR2 -->

dev/translation/autotranslator.class.php

@@ -345,5 +345,4 @@ class autoTranslator
 
 		return $rep;
 	}
-
 }

htdocs/accountancy/class/accountancycategory.class.php

@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 /**
  * Class to manage categories of an accounting account
  */
-class AccountancyCategory 	// extends CommonObject
+class AccountancyCategory // extends CommonObject
 {
     /**
      * @var DoliDB Database handler.
@@ -824,5 +824,4 @@ class AccountancyCategory 	// extends CommonObject
 			return -1;
 		}
 	}
-
 }

htdocs/adherents/canvas/actions_adherentcard_common.class.php

@@ -277,5 +277,4 @@ abstract class ActionsAdherentCardCommon
             }
         }
     }
-
 }

htdocs/adherents/class/adherent.class.php

@@ -2669,5 +2669,4 @@ class Adherent extends CommonObject
 
 		return 0;
 	}
-
 }

htdocs/adherents/class/adherent_type.class.php

@@ -555,5 +555,4 @@ class AdherentType extends CommonObject
 
 		return '';
 	}
-
 }

htdocs/adherents/class/adherentstats.class.php

@@ -181,5 +181,4 @@ class AdherentStats extends Stats
 
 		return $this->_getAllByYear($sql);
 	}
-
 }

htdocs/adherents/class/api_members.class.php

@@ -409,5 +409,4 @@ class Members extends DolibarrApi
 
 		return $result;
 	}
-
 }

htdocs/adherents/class/api_memberstypes.class.php

@@ -320,5 +320,4 @@ class MembersTypes extends DolibarrApi
 
         return $object;
     }
-
 }

htdocs/api/class/api_setup.class.php

@@ -918,5 +918,4 @@ class Setup extends DolibarrApi
 
     	return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
     }
-
 }

htdocs/asset/class/asset_type.class.php

@@ -437,5 +437,4 @@ class AssetType extends CommonObject
 	{
 		return '';
 	}
-
 }

htdocs/blockedlog/class/blockedlog.class.php

@@ -1056,5 +1056,4 @@ class BlockedLog
 
 		return $result;
 	}
-
 }

htdocs/bookmarks/class/bookmark.class.php

@@ -255,5 +255,4 @@ class Bookmark extends CommonObject
 	{
 	    return '';
 	}
-
 }

htdocs/cashdesk/class/Auth.class.php

@@ -138,6 +138,5 @@ class Auth
 
 		return $ret;
 	}
-
 }
 

htdocs/cashdesk/class/Facturation.class.php

@@ -648,5 +648,4 @@ class Facturation
             $this->prix_total_ttc = $aTotalTtc;
         }
     }
-
 }

htdocs/comm/action/class/actioncomm.class.php

@@ -1688,5 +1688,4 @@ class ActionComm extends CommonObject
 
     	return $error;
     }
-
 }

htdocs/comm/action/class/actioncommreminder.class.php

@@ -227,6 +227,5 @@ class ActionCommReminder extends CommonObject
 	{
 		$this->initAsSpecimenCommon();
 	}
-
 }
 

htdocs/comm/action/class/cactioncomm.class.php

@@ -225,5 +225,4 @@ class CActionComm
         $transcode=$langs->trans("Action".$this->code);
         if ($transcode != "Action".$this->code) return $transcode;
     }
-
 }

htdocs/comm/mailing/class/advtargetemailing.class.php

@@ -970,6 +970,4 @@ class AdvanceTargetingMailing extends CommonObject
 
 		return $return_sql_criteria;
 	}
-
-
 }

htdocs/comm/mailing/class/mailing.class.php

@@ -643,6 +643,5 @@ class Mailing extends CommonObject
 		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
 		}
 	}
-
 }
 

htdocs/comm/propal/class/propal.class.php

@@ -4235,6 +4235,5 @@ class PropaleLigne extends CommonObjectLine
 			return -2;
 		}
 	}
-
 }
 

htdocs/commande/class/commandestats.class.php

@@ -222,6 +222,5 @@ class CommandeStats extends Stats
 
 		return $this->_getAllByProduct($sql);
 	}
-
 }
 

htdocs/compta/bank/class/account.class.php

@@ -1629,7 +1629,6 @@ class Account extends CommonObject
 		$this->owner_address   = 'Owner address';
 		$this->country_id      = 1;
 	}
-
 }
 
 
@@ -2312,5 +2311,4 @@ class AccountLine extends CommonObject
 		}
 		return 0;
 	}
-
 }

htdocs/compta/bank/class/bankcateg.class.php

@@ -339,5 +339,4 @@ class BankCateg // extends CommonObject
 		$this->id = 0;
 		$this->label = '';
 	}
-
 }

htdocs/compta/bank/class/paymentvarious.class.php

@@ -599,5 +599,4 @@ class PaymentVarious extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
 }

htdocs/compta/deplacement/class/deplacement.class.php

@@ -452,6 +452,5 @@ class Deplacement extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
 }
 

htdocs/compta/facture/class/api_invoices.class.php

@@ -1259,5 +1259,4 @@ class Invoices extends DolibarrApi
         }
         return $invoice;
     }
-
 }

htdocs/compta/facture/class/facture-rec.class.php

@@ -1859,5 +1859,4 @@ class FactureLigneRec extends CommonInvoiceLine
     		return -2;
     	}
     }
-
 }

htdocs/compta/facture/class/facturestats.class.php

@@ -224,7 +224,5 @@ class FactureStats extends Stats
 
 		return $this->_getAllByProduct($sql);
 	}
-
-
 }
 

htdocs/compta/facture/class/paymentterm.class.php

@@ -482,5 +482,4 @@ class PaymentTerm // extends CommonObject
 		$this->nbjour='';
 		$this->decalage='';
 	}
-
 }

htdocs/compta/localtax/class/localtax.class.php

@@ -648,5 +648,4 @@ class Localtax extends CommonObject
 
 		return '';
 	}
-
 }

htdocs/compta/paiement/cheque/class/remisecheque.class.php

@@ -1100,5 +1100,4 @@ class RemiseCheque extends CommonObject
 		}
 		return $langs->trans('Unknown');
 	}
-
 }

htdocs/compta/paiement/class/cpaiement.class.php

@@ -370,5 +370,4 @@ class Cpaiement
 		$this->accountancy_code = '';
 		$this->module = '';
 	}
-
 }

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -1937,6 +1937,5 @@ class BonPrelevement extends CommonObject
 			if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
 		}
 	}
-
 }
 

htdocs/compta/prelevement/class/rejetprelevement.class.php

@@ -368,6 +368,5 @@ class RejetPrelevement
 			return -2;
 		}
 	}
-
 }
 

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -627,5 +627,4 @@ class PaymentSalary extends CommonObject
 	    }*/
 	    return '';
 	}
-
 }

htdocs/compta/sociales/class/cchargesociales.class.php

@@ -524,5 +524,4 @@ class Cchargesociales
 		$this->module = '';
 		$this->accountancy_code = '';
 	}
-
 }

htdocs/contact/canvas/actions_contactcard_common.class.php

@@ -316,6 +316,5 @@ abstract class ActionsContactCardCommon
             $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
         }
     }
-
 }
 

htdocs/core/boxes/box_actions.php

@@ -260,6 +260,5 @@ class box_actions extends ModeleBoxes
 
 		return '';
 	}
-
 }
 

htdocs/core/boxes/box_bookmarks.php

@@ -161,6 +161,5 @@ class box_bookmarks extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_clients.php

@@ -177,6 +177,5 @@ class box_clients extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_commandes.php

@@ -202,6 +202,5 @@ class box_commandes extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 

htdocs/core/boxes/box_comptes.php

@@ -188,6 +188,5 @@ class box_comptes extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_contacts.php

@@ -189,6 +189,5 @@ class box_contacts extends ModeleBoxes
 	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_contracts.php

@@ -185,6 +185,5 @@ class box_contracts extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 

htdocs/core/boxes/box_external_rss.php

@@ -198,6 +198,5 @@ class box_external_rss extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 

htdocs/core/boxes/box_factures.php

@@ -206,5 +206,4 @@ class box_factures extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }

htdocs/core/boxes/box_factures_fourn.php

@@ -218,6 +218,5 @@ class box_factures_fourn extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_factures_fourn_imp.php

@@ -205,6 +205,5 @@ class box_factures_fourn_imp extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_factures_imp.php

@@ -209,5 +209,4 @@ class box_factures_imp extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }

htdocs/core/boxes/box_ficheinter.php

@@ -170,6 +170,5 @@ class box_ficheinter extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_fournisseurs.php

@@ -164,6 +164,5 @@ class box_fournisseurs extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 

htdocs/core/boxes/box_graph_invoices_permonth.php

@@ -280,6 +280,5 @@ class box_graph_invoices_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_graph_invoices_supplier_permonth.php

@@ -279,6 +279,5 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_graph_orders_permonth.php

@@ -278,6 +278,5 @@ class box_graph_orders_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_graph_orders_supplier_permonth.php

@@ -277,6 +277,5 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_graph_product_distribution.php

@@ -415,6 +415,5 @@ class box_graph_product_distribution extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_graph_propales_permonth.php

@@ -281,6 +281,5 @@ class box_graph_propales_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_members.php

@@ -182,6 +182,5 @@ class box_members extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_produits.php

@@ -230,6 +230,5 @@ class box_produits extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_produits_alerte_stock.php

@@ -242,6 +242,5 @@ class box_produits_alerte_stock extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_propales.php

@@ -192,6 +192,5 @@ class box_propales extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 

htdocs/core/boxes/box_prospect.php

@@ -180,6 +180,5 @@ class box_prospect extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_services_contracts.php

@@ -236,6 +236,5 @@ class box_services_contracts extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 

htdocs/core/boxes/box_services_expired.php

@@ -184,6 +184,5 @@ class box_services_expired extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
- }
+}
 

htdocs/core/boxes/box_supplier_orders.php

@@ -188,6 +188,5 @@ class box_supplier_orders extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 

htdocs/core/boxes/modules_boxes.php

@@ -31,7 +31,7 @@
  *
  * Boxes parent class
  */
-class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty" boxes
+class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
 {
 	/**
 	 * @var DoliDB Database handler
@@ -503,8 +503,6 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 		}
 		return $widget;
 	}
-
-
 }
 
 

htdocs/core/class/CSMSFile.class.php

@@ -244,6 +244,5 @@ class CSMSFile
             @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
         }
     }
-
 }
 

htdocs/core/class/antivir.class.php

@@ -179,6 +179,5 @@ class AntiVir
 
 		return $ret;
 	}
-
 }
 

htdocs/core/class/canvas.class.php

@@ -208,5 +208,4 @@ class Canvas
 			return $ret;
 		}
 	}
-
 }

htdocs/core/class/ccountry.class.php

@@ -333,5 +333,4 @@ class Ccountry // extends CommonObject
 			return 1;
 		}
 	}
-
 }

htdocs/core/class/commonobject.class.php

@@ -7240,5 +7240,4 @@ abstract class CommonObject
 	{
 		return count($this->comments);
 	}
-
 }

htdocs/core/class/commonorder.class.php

@@ -144,6 +144,5 @@ abstract class CommonOrderLine extends CommonObjectLine
 	public $info_bits = 0;
 
 	public $special_code = 0;
-
 }
 

htdocs/core/class/commonstickergenerator.class.php

@@ -266,5 +266,4 @@ abstract class CommonStickerGenerator
 		$this->_Height	= $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc);
 		$this->Set_Char_Size($pdf, $format['font-size']);
 	}
-
 }

htdocs/core/class/coreobject.class.php

@@ -435,5 +435,4 @@ class CoreObject extends CommonObject
 
 		return 1;
 	}
-
 }

htdocs/core/class/cstate.class.php

@@ -317,5 +317,4 @@ class Cstate // extends CommonObject
 			return 1;
 		}
 	}
-
 }

htdocs/core/class/ctypent.class.php

@@ -333,5 +333,4 @@ class Ctypent // extends CommonObject
 			return 1;
 		}
 	}
-
 }

htdocs/core/class/ctyperesource.class.php

@@ -463,7 +463,6 @@ class Ctyperesource
 		$this->label = '';
 		$this->active = '';
 	}
-
 }
 
 /**
@@ -486,5 +485,4 @@ class CtyperesourceLine
 	/**
 	 * @var mixed Sample line property 2
 	 */
-
 }

htdocs/core/class/doleditor.class.php

@@ -344,6 +344,5 @@ class DolEditor
         if ($noprint) return $out;
         else print $out;
     }
-
 }
 

htdocs/core/class/dolgraph.class.php

@@ -1097,6 +1097,5 @@ class DolGraph
 		}
 		return 0;
 	}
-
 }
 

htdocs/core/class/emailsenderprofile.class.php

@@ -423,7 +423,6 @@ class EmailSenderProfile extends CommonObject
 	{
 		$this->initAsSpecimenCommon();
 	}
-
 }
 
 /**

htdocs/core/class/events.class.php

@@ -297,5 +297,4 @@ class Events // extends CommonObject
 		$this->dateevent=time();
 		$this->description='This is a specimen event';
 	}
-
 }

htdocs/core/class/fiscalyear.class.php

@@ -335,5 +335,4 @@ class Fiscalyear extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
 }

htdocs/core/class/genericobject.class.php

@@ -38,6 +38,5 @@ class GenericObject extends CommonObject
 	{
 	    $this->db=$db;
 	}
-
 }
 

htdocs/core/class/hookmanager.class.php

@@ -283,5 +283,4 @@ class HookManager
 
         return ($error?-1:$resaction);
 	}
-
 }

htdocs/core/class/html.form.class.php

@@ -7113,6 +7113,5 @@ class Form
 
 		return $out;
 	}
-
 }
 

htdocs/core/class/html.formactions.class.php

@@ -366,5 +366,4 @@ class FormActions
         else print $out;
         return '';
     }
-
 }

htdocs/core/class/html.formbarcode.class.php

@@ -186,6 +186,5 @@ class FormBarCode
             print '</td></tr></table></form>';
         }
     }
-
 }
 

htdocs/core/class/html.formcompany.class.php

@@ -867,6 +867,5 @@ class FormCompany
     		}
     	}
     }
-
 }
 

htdocs/core/class/html.formcontract.class.php

@@ -187,5 +187,4 @@ class FormContract
         print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
         print '</form>';
 	}
-
 }

htdocs/core/class/html.formfile.class.php

@@ -1829,6 +1829,5 @@ class FormFile
 		}
 		return $out;
 	}
-
 }
 

htdocs/core/class/html.formmail.class.php

@@ -1385,7 +1385,6 @@ class FormMail extends Form
 
 		return $tmparray;
 	}
-
 }
 
 

htdocs/core/class/html.formmargin.class.php

@@ -282,6 +282,5 @@ class FormMargin
 		print '</table>';
 		print '</div>';
 	}
-
 }
 

htdocs/core/class/html.formorder.class.php

@@ -100,6 +100,5 @@ class FormOrder extends Form
 
 		return 1;
 	}
-
 }
 

htdocs/core/class/html.formother.class.php

@@ -1255,6 +1255,5 @@ class FormOther
             dol_print_error($this->db);
         }
     }
-
 }
 

htdocs/core/class/html.formprojet.class.php

@@ -665,5 +665,4 @@ class FormProjets
 			return -1;
 		}
 	}
-
 }

htdocs/core/class/html.formsms.class.php

@@ -360,6 +360,5 @@ function limitChars(textarea, limit, infodiv)
 
         print "<!-- End form SMS -->\n";
     }
-
 }
 

htdocs/core/class/html.formsocialcontrib.class.php

@@ -120,6 +120,5 @@ class FormSocialContrib
             dol_print_error($db,$db->lasterror());
         }
     }
-
 }
 

htdocs/core/class/html.formwebsite.class.php

@@ -205,5 +205,4 @@ class FormWebsite
 
     	return $out;
     }
-
 }

htdocs/core/class/infobox.class.php

@@ -281,6 +281,5 @@ class InfoBox
             return -1;
         }
     }
-
 }