From a36061079b99d3315e7fd0fd2d941b40878010f2 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 22 Aug 2018 11:11:59 +0200 Subject: [PATCH] Update and standardize code --- htdocs/ecm/class/htmlecm.form.class.php | 5 ++++- htdocs/expedition/class/expedition.class.php | 5 ++++- htdocs/expensereport/class/expensereport.class.php | 5 ++++- htdocs/exports/class/export.class.php | 5 ++++- htdocs/fichinter/class/fichinter.class.php | 5 ++++- htdocs/fourn/class/fournisseur.product.class.php | 5 ++++- htdocs/livraison/class/livraison.class.php | 5 ++++- htdocs/mailmanspip/class/mailmanspip.class.php | 5 ++++- .../mailings/mailinglist_mymodule_myobject.modules.php | 6 +++++- htdocs/product/class/html.formproduct.class.php | 5 ++++- .../product/dynamic_price/class/price_expression.class.php | 5 ++++- .../dynamic_price/class/price_global_variable.class.php | 5 ++++- .../class/price_global_variable_updater.class.php | 5 ++++- htdocs/resource/class/html.formresource.class.php | 5 ++++- htdocs/societe/canvas/actions_card_common.class.php | 6 +++++- htdocs/stripe/class/actions_stripe.class.php | 6 ++++-- htdocs/supplier_proposal/class/supplier_proposal.class.php | 5 ++++- 17 files changed, 70 insertions(+), 18 deletions(-) diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php index db3355bce2b..b6000cad923 100644 --- a/htdocs/ecm/class/htmlecm.form.class.php +++ b/htdocs/ecm/class/htmlecm.form.class.php @@ -27,7 +27,10 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; */ class FormEcm { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 448b13f43fa..e9246cbe751 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -2278,7 +2278,10 @@ class ExpeditionLigne extends CommonObjectLine */ public $fk_expedition; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; // From llx_expeditiondet var $qty; diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 6271ef7ffdb..821590365d8 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2378,7 +2378,10 @@ class ExpenseReport extends CommonObject */ class ExpenseReportLine { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 050318944d6..4725ea758d5 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -30,7 +30,10 @@ */ class Export { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; var $array_export_code=array(); // Tableau de "idmodule_numlot" var $array_export_module=array(); // Tableau de "nom de modules" diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index d7c2d871824..2c6c8fef402 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1309,7 +1309,10 @@ class Fichinter extends CommonObject */ class FichinterLigne extends CommonObjectLine { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 4180ecaf3d0..da9549bb4ce 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -37,7 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class. */ class ProductFournisseur extends Product { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 46b3c113ff2..bac832f013e 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -1057,7 +1057,10 @@ class Livraison extends CommonObject */ class LivraisonLigne extends CommonObjectLine { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; // From llx_expeditiondet var $qty; diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index 1630e61ce33..683e8c25414 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -38,7 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; */ class MailmanSpip { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php index cd8612cb7d1..533f07b3ba2 100644 --- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php @@ -27,7 +27,11 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets var $enabled=0; var $require_module=array(); var $picto='mymodule@mymodule'; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; /** diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index 53368c0a114..9161581eaae 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -29,7 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; */ class FormProduct { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php index 958647da0a6..282c1eadf45 100644 --- a/htdocs/product/dynamic_price/class/price_expression.class.php +++ b/htdocs/product/dynamic_price/class/price_expression.class.php @@ -29,7 +29,10 @@ */ class PriceExpression { - var $db; //!< To store db handler + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php index f09fbd2643f..923c957f051 100644 --- a/htdocs/product/dynamic_price/class/price_global_variable.class.php +++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php @@ -29,7 +29,10 @@ */ class PriceGlobalVariable { - var $db; //!< To store db handler + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php index 1cd6318494b..b4fa966119b 100644 --- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php +++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php @@ -29,7 +29,10 @@ */ class PriceGlobalVariableUpdater { - var $db; //!< To store db handler + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php index 8a6f9d96c28..2aa19ac66b5 100644 --- a/htdocs/resource/class/html.formresource.class.php +++ b/htdocs/resource/class/html.formresource.class.php @@ -33,7 +33,10 @@ require_once DOL_DOCUMENT_ROOT ."/resource/class/dolresource.class.php"; */ class FormResource { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; var $substit=array(); var $param=array(); diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 0243bc7d719..61e0a09f556 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -27,7 +27,11 @@ */ abstract class ActionsCardCommon { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $dirmodule; var $targetmodule; var $canvas; diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index 141efcf7a47..4fa83f5fe0e 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -36,8 +36,10 @@ $langs->load("stripe@stripe"); */ class ActionsStripeconnect { - /** @var DoliDB */ - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; private $config=array(); diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 1ffe4465d86..16aad03cee3 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -2636,7 +2636,10 @@ class SupplierProposal extends CommonObject */ class SupplierProposalLine extends CommonObjectLine { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message)