[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1806-gaf3bbb2

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Tue May 9 17:09:25 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  af3bbb25028508fff7a03a475bc067f8c756210a (commit)
      from  d27c201d8181600fcfa97b90590ad3d961a59da7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=af3bbb25028508fff7a03a475bc067f8c756210a

commit af3bbb25028508fff7a03a475bc067f8c756210a
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Tue May 9 17:09:19 2017 +0200

    Use __construct

diff --git a/src/common/dao/include/DataAccess.class.php b/src/common/dao/include/DataAccess.class.php
index 2b0cce1..3835878 100644
--- a/src/common/dao/include/DataAccess.class.php
+++ b/src/common/dao/include/DataAccess.class.php
@@ -23,12 +23,6 @@ require_once 'DataAccessException.class.php';
 
 class DataAccess {
 
-    /**
-    * Constructs a new DataAccess object
-    */
-    function DataAccess() {
-
-    }
    function quoteSmart($value, $params = array()) {
 
         return $value;
diff --git a/src/common/dao/include/DataAccessResult.class.php b/src/common/dao/include/DataAccessResult.class.php
index 5e0bd9e..8c0c014 100644
--- a/src/common/dao/include/DataAccessResult.class.php
+++ b/src/common/dao/include/DataAccessResult.class.php
@@ -18,13 +18,11 @@ class DataAccessResult  implements Iterator {
     var $_row;
     var $nb_rows;
 
-    function DataAccessResult($result) {
-        $this->result       = $result;
-
-            $this->_current = -1;
-            $this->_row     = false;
-            $this->rewind();
-
+    function __construct($result) {
+		$this->result = $result;
+		$this->_current = -1;
+		$this->_row = false;
+		$this->rewind();
     }
 
     /**
diff --git a/src/common/include/Plugin.class.php b/src/common/include/Plugin.class.php
index 74ff5b5..f772eeb 100644
--- a/src/common/include/Plugin.class.php
+++ b/src/common/include/Plugin.class.php
@@ -353,7 +353,7 @@ class PluginSpecificRoleSetting {
 	var $default_values = array();
 	var $global = false;
 
-	function PluginSpecificRoleSetting(&$role, $name, $global = false) {
+	function __construct(&$role, $name, $global = false) {
 		$this->global = $global;
 		$this->role =& $role;
 		$this->name = $name;
diff --git a/src/common/include/PluginInfo.class.php b/src/common/include/PluginInfo.class.php
index 1bf78eb..9d293a2 100644
--- a/src/common/include/PluginInfo.class.php
+++ b/src/common/include/PluginInfo.class.php
@@ -27,8 +27,8 @@ class PluginInfo {
     var $pluginDescriptor;
     var $propertyDescriptors;
 
-    function PluginInfo($plugin) {
-        $this->plugin              = $plugin;
+    function __construct($plugin) {
+        $this->plugin = $plugin;
     }
 
     function setPluginDescriptor($descriptor) {
diff --git a/src/common/rss/RSS.class.php b/src/common/rss/RSS.class.php
index 4b3f19f..f9bcc1fa 100644
--- a/src/common/rss/RSS.class.php
+++ b/src/common/rss/RSS.class.php
@@ -24,7 +24,8 @@
 class RSS {
     var $channel;
     var $items;
-    function RSS($channel) {
+
+    function __construct($channel) {
         $this->channel = $channel;
         $this->items   = array();
     }
diff --git a/src/common/valid/ValidFactory.class.php b/src/common/valid/ValidFactory.class.php
index b97a1be..cace988 100644
--- a/src/common/valid/ValidFactory.class.php
+++ b/src/common/valid/ValidFactory.class.php
@@ -54,8 +54,8 @@ class Valid_GroupId extends Valid {
  * Check that 'pv' parameter is set to an acceptable value.
  */
 class Valid_Pv extends Valid {
-	function Valid_Pv() {
-		parent::Valid('pv');
+	function __construct() {
+		parent::__construct('pv');
 	}
 
 	function validate($value) {
@@ -88,7 +88,7 @@ class Valid_String extends Valid_Text {
  * Wrapper for 'WhiteList' rule
  */
 class Valid_WhiteList extends Valid {
-	function Valid_WhiteList($key, $whitelist) {
+	function __construct($key, $whitelist) {
 		parent::__construct($key);
 		$this->addRule(new Rule_WhiteList($whitelist));
 	}
@@ -113,13 +113,13 @@ class Valid_UserNameFormat extends Valid_String {
 class Valid_Email extends Valid_String {
 	var $separator;
 
-	function Valid_Email($key=null, $separator=null) {
+	function __construct($key=null, $separator=null) {
 		if(is_string($separator)) {
 			$this->separator = $separator;
 		} else {
 			$this->separator = null;
 		}
-		parent::Valid($key);
+		parent::__construct($key);
 	}
 
 	function validate($value) {
diff --git a/src/plugins/globalactivity/include/GlobalactivityPluginInfo.class.php b/src/plugins/globalactivity/include/GlobalactivityPluginInfo.class.php
index 88f233e..3ed452e 100644
--- a/src/plugins/globalactivity/include/GlobalactivityPluginInfo.class.php
+++ b/src/plugins/globalactivity/include/GlobalactivityPluginInfo.class.php
@@ -25,8 +25,8 @@ require_once 'GlobalactivityPluginDescriptor.class.php';
 
 class GlobalactivityPluginInfo extends PluginInfo {
 
-    function GlobalactivityPluginInfo(&$plugin) {
-        $this->PluginInfo($plugin);
+    function __construct(&$plugin) {
+        parent::__construct($plugin);
         $this->setPluginDescriptor(new GlobalactivityPluginDescriptor());
     }
 

-----------------------------------------------------------------------

Summary of changes:
 src/common/dao/include/DataAccess.class.php                  |  6 ------
 src/common/dao/include/DataAccessResult.class.php            | 12 +++++-------
 src/common/include/Plugin.class.php                          |  2 +-
 src/common/include/PluginInfo.class.php                      |  4 ++--
 src/common/rss/RSS.class.php                                 |  3 ++-
 src/common/valid/ValidFactory.class.php                      | 10 +++++-----
 .../include/GlobalactivityPluginInfo.class.php               |  4 ++--
 7 files changed, 17 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list