From 0452c2d68e01f34fa17f4c10d6824a537a3f9281 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 20 Jul 2014 15:39:38 +0200 Subject: [PATCH 1/3] Qual: Enhance PHPCS sheet. --- dev/codesniffer/ruleset.dtd | 3 ++- dev/codesniffer/ruleset.xml | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dev/codesniffer/ruleset.dtd b/dev/codesniffer/ruleset.dtd index 0d498bb033c..e307d564e12 100755 --- a/dev/codesniffer/ruleset.dtd +++ b/dev/codesniffer/ruleset.dtd @@ -1,7 +1,8 @@ - + + diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index 24cc4b46e7b..9c4d5d4f09b 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -3,6 +3,10 @@ Dolibarr coding standard. + */conf.php + */includes/* + */documents/* + @@ -18,6 +22,9 @@ 0 + + + @@ -46,6 +53,9 @@ --> + + + From 85ccb094b41d82c542aacff0311201641c35f653 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 20 Jul 2014 15:54:37 +0200 Subject: [PATCH 2/3] Fix: More complete exclusion list --- dev/codesniffer/ruleset.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index 9c4d5d4f09b..38ea1310d22 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -6,7 +6,9 @@ */conf.php */includes/* */documents/* - + */custom/* + */nltechno* + From 8d46b02d672c5e4109258792bcf58cc8bdcf7e26 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 20 Jul 2014 15:58:05 +0200 Subject: [PATCH 3/3] Fix: missing property --- htdocs/adherents/class/adherent.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index b03bff940dd..fd30c21486d 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -90,6 +90,7 @@ class Adherent extends CommonObject var $user_login; var $fk_soc; + var $thirdparty; // Loaded by ->fetch_thirdparty() // Fields loaded by fetch_subscriptions() var $first_subscription_date;