From ed3dfe27564feba9bc8bd4bc3a9664683a553c02 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 6 May 2012 00:39:59 +0200 Subject: [PATCH] Checkstyle --- dev/codesniffer/jenkins_ruleset.xml | 2 +- dev/codesniffer/ruleset.xml | 2 +- .../cheque/class/remisecheque.class.php | 5 ++--- htdocs/core/class/hookmanager.class.php | 4 +--- htdocs/core/class/notify.class.php | 20 +++++++++---------- .../facture/doc/pdf_oursin.modules.php | 11 +++++----- .../modules/livraison/modules_livraison.php | 5 ++--- .../doc/pdf_standardlabel.class.php | 15 +++++++------- 8 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dev/codesniffer/jenkins_ruleset.xml b/dev/codesniffer/jenkins_ruleset.xml index 3d3b037d3a0..a43e9cdf7bf 100755 --- a/dev/codesniffer/jenkins_ruleset.xml +++ b/dev/codesniffer/jenkins_ruleset.xml @@ -83,7 +83,7 @@ - + diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index 53fd15787ab..bf1f21819a4 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -83,7 +83,7 @@ - + diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 7967db52988..3901d3efc90 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -27,8 +27,7 @@ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** - * \class RemiseCheque - * \brief Classe permettant la gestion des remises de cheque + * Classe permettant la gestion des remises de cheque */ class RemiseCheque extends CommonObject { @@ -119,7 +118,7 @@ class RemiseCheque extends CommonObject * @param array $toRemise array with cheques to remise * @return int <0 if KO, >0 if OK */ - function create($user, $account_id, $limit=40, $toRemise) + function create($user, $account_id, $limit, $toRemise) { global $conf; diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 1dc54c041b0..8dbe491a53e 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -25,8 +25,7 @@ /** - * \class HookManager - * \brief Class to manage hooks + * Class to manage hooks */ class HookManager { @@ -54,7 +53,6 @@ class HookManager /** * Init array this->hooks with instantiated action controlers. - * * First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS * with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file. * This make conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...)) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 0c5fe3db50e..5281c89a2c0 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -203,16 +203,16 @@ class Notify $mailfile = new CMailFile( $subject, - $sendto, - $replyto, - $message, - array($file), - array($mimefile), - array($filename[count($filename)-1]), - '', - '', - 0, - $msgishtml + $sendto, + $replyto, + $message, + array($file), + array($mimefile), + array($filename[count($filename)-1]), + '', + '', + 0, + $msgishtml ); if ($mailfile->sendfile()) diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index fb1c41e476d..d6c8102f2b7 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -34,8 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** - * \class pdf_oursin - * \brief Classe permettant de generer les factures au modele oursin + * Classe permettant de generer les factures au modele oursin */ class pdf_oursin extends ModelePDFFactures { @@ -392,7 +391,7 @@ class pdf_oursin extends ModelePDFFactures $invoice->fetch($obj->fk_facture_source); - $pdf->SetXY($tab3_posx, $tab3_top+$y ); + $pdf->SetXY($tab3_posx, $tab3_top+$y); $pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0); $pdf->SetXY($tab3_posx+21, $tab3_top+$y); $pdf->MultiCell(20, 3, price($obj->amount_ttc), 0, 'L', 0); @@ -401,7 +400,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetXY($tab3_posx+58, $tab3_top+$y); $pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0); - $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3 ); + $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3); $i++; } @@ -429,7 +428,7 @@ class pdf_oursin extends ModelePDFFactures $y+=3; $row = $this->db->fetch_object($resql); - $pdf->SetXY($tab3_posx, $tab3_top+$y ); + $pdf->SetXY($tab3_posx, $tab3_top+$y); $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0); $pdf->SetXY($tab3_posx+21, $tab3_top+$y); $pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0); @@ -440,7 +439,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetXY($tab3_posx+58, $tab3_top+$y); $pdf->MultiCell(30, 3, $row->num, 0, 'L', 0); - $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3 ); + $pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3); $i++; } diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index c9343e8ae95..e4623f85948 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -31,8 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); /** - * \class ModelePDFDeliveryOrder - * \brief Classe mere des modeles de bon de livraison + * Classe mere des modeles de bon de livraison */ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator { @@ -151,7 +150,7 @@ abstract class ModeleNumRefDeliveryOrder * * @param DoliDB $db objet base de donnee * @param Object $object object delivery - * @param string $model force le modele a utiliser ('' to not force) + * @param string $modele force le modele a utiliser ('' to not force) * @param Translate $outputlangs objet lang a utiliser pour traduction * @return int 0 if KO, 1 if OK */ diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php index c4a5b80d6ba..2b2d33d550b 100644 --- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php +++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php @@ -260,13 +260,14 @@ class pdf_standardlabel /** * Print dot line * - * @param PDF &$pdf PDF - * @param int $x1 X1 - * @param int $y1 Y1 - * @param int $x2 X2 - * @param int $y2 Y2 - * @param int $epaisseur Epaisseur - * @param int $nbPointilles Nb pointilles + * @param PDF &$pdf PDF + * @param int $x1 X1 + * @param int $y1 Y1 + * @param int $x2 X2 + * @param int $y2 Y2 + * @param int $epaisseur Epaisseur + * @param int $nbPointilles Nb pointilles + * @return void */ function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15) {