Merge pull request #11 from derrabus/deprecate-legacy-constructors

Deprecate php-4-style constructors
pear · Nov 11, 2015 · b1ec3a7 · b1ec3a7
2 parents 51a84c7 + 40b6357
commit b1ec3a7
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 43 deletions.
diff --git a/Log.php b/Log.php
@@ -111,6 +111,10 @@ class Log
                             '%{class}'      => '%8$s',
                             '%\{'           => '%%{');
 
+    public function __construct()
+    {
+    }
+
     /**
      * Attempts to return a concrete Log instance of type $handler.
      *

diff --git a/Log/composite.php b/Log/composite.php
@@ -35,15 +35,15 @@ class Log_composite extends Log
     /**
      * Constructs a new composite Log object.
      *
-     * @param boolean   $name       This parameter is ignored.
-     * @param boolean   $ident      This parameter is ignored.
-     * @param boolean   $conf       This parameter is ignored.
-     * @param boolean   $level      This parameter is ignored.
+     * @param string   $name       This parameter is ignored.
+     * @param string   $ident      This parameter is ignored.
+     * @param array    $conf       This parameter is ignored.
+     * @param int      $level      This parameter is ignored.
      *
      * @access public
      */
-    function Log_composite($name, $ident = '', $conf = array(),
-                           $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_ident = $ident;
     }

diff --git a/Log/console.php b/Log/console.php
@@ -64,15 +64,15 @@ class Log_console extends Log
 
     /**
      * Constructs a new Log_console object.
-     * 
+     *
      * @param string $name     Ignored.
      * @param string $ident    The identity string.
      * @param array  $conf     The configuration array.
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_console($name, $ident = '', $conf = array(),
-                         $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_ident = $ident;

diff --git a/Log/daemon.php b/Log/daemon.php
@@ -61,18 +61,17 @@ class Log_daemon extends Log
      */
     var $_timeout = 1;
 
-
     /**
      * Constructs a new syslog object.
      *
-     * @param string $name     The syslog facility.
-     * @param string $ident    The identity string.
-     * @param array  $conf     The configuration array.
-     * @param int    $maxLevel Maximum level at which to log.
+     * @param string $name  The syslog facility.
+     * @param string $ident The identity string.
+     * @param array  $conf  The configuration array.
+     * @param int    $level Maximum level at which to log.
      * @access public
      */
-    function Log_daemon($name, $ident = '', $conf = array(),
-                        $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         /* Ensure we have a valid integer value for $name. */
         if (empty($name) || !is_int($name)) {

diff --git a/Log/display.php b/Log/display.php
@@ -55,8 +55,8 @@ class Log_display extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_display($name = '', $ident = '', $conf = array(),
-                         $level = PEAR_LOG_DEBUG)
+    public function __construct($name = '', $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_ident = $ident;

diff --git a/Log/error_log.php b/Log/error_log.php
@@ -65,8 +65,8 @@ class Log_error_log extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_error_log($name, $ident = '', $conf = array(),
-                           $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_type = $name;

diff --git a/Log/file.php b/Log/file.php
@@ -95,8 +95,8 @@ class Log_file extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_file($name, $ident = '', $conf = array(),
-                      $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_filename = $name;

diff --git a/Log/firebug.php b/Log/firebug.php
@@ -78,8 +78,8 @@ class Log_firebug extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_firebug($name = '', $ident = 'PHP', $conf = array(),
-                         $level = PEAR_LOG_DEBUG)
+    public function __construct($name = '', $ident = 'PHP', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_ident = $ident;

diff --git a/Log/mail.php b/Log/mail.php
@@ -116,8 +116,8 @@ class Log_mail extends Log
      * @param int    $level     Log messages up to and including this level.
      * @access public
      */
-    function Log_mail($name, $ident = '', $conf = array(),
-                      $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_recipients = $name;

diff --git a/Log/mcal.php b/Log/mcal.php
@@ -61,7 +61,6 @@ class Log_mcal extends Log
      */
     var $_name = LOG_SYSLOG;
 
-
     /**
      * Constructs a new Log_mcal object.
      *
@@ -71,8 +70,8 @@ class Log_mcal extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_mcal($name, $ident = '', $conf = array(),
-                      $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_name = $name;

diff --git a/Log/mdb2.php b/Log/mdb2.php
@@ -112,8 +112,8 @@ class Log_mdb2 extends Log
      * @param int $level           Log messages up to and including this level.
      * @access public
      */
-    function Log_mdb2($name, $ident = '', $conf = array(),
-                     $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_table = $name;

diff --git a/Log/null.php b/Log/null.php
@@ -27,8 +27,8 @@ class Log_null extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_null($name, $ident = '', $conf = array(),
-					  $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_ident = $ident;

diff --git a/Log/observer.php b/Log/observer.php
@@ -47,7 +47,7 @@ class Log_observer
      *
      * @access public
      */
-    function Log_observer($priority = PEAR_LOG_INFO)
+    public function __construct($priority = PEAR_LOG_INFO)
     {
         $this->_id = md5(microtime());
         $this->_priority = $priority;

diff --git a/Log/sql.php b/Log/sql.php
@@ -107,7 +107,6 @@ class Log_sql extends Log
      */
     var $_identLimit = 16;
 
-
     /**
      * Constructs a new sql logging object.
      *
@@ -117,8 +116,8 @@ class Log_sql extends Log
      * @param int $level           Log messages up to and including this level.
      * @access public
      */
-    function Log_sql($name, $ident = '', $conf = array(),
-                     $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_table = $name;

diff --git a/Log/sqlite.php b/Log/sqlite.php
@@ -59,7 +59,6 @@ class Log_sqlite extends Log
      */
     var $_table = 'log_table';
 
-
     /**
      * Constructs a new sql logging object.
      *
@@ -71,7 +70,7 @@ class Log_sqlite extends Log
      * @param int    $level        Log messages up to and including this level.
      * @access public
      */
-    function Log_sqlite($name, $ident = '', &$conf, $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', &$conf, $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_table = $name;

diff --git a/Log/syslog.php b/Log/syslog.php
@@ -78,8 +78,8 @@ class Log_syslog extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_syslog($name, $ident = '', $conf = array(),
-                        $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         /* Ensure we have a valid integer value for $name. */
         if (empty($name) || !is_int($name)) {

diff --git a/Log/win.php b/Log/win.php
@@ -69,8 +69,8 @@ class Log_win extends Log
      * @param int    $level    Log messages up to and including this level.
      * @access public
      */
-    function Log_win($name, $ident = '', $conf = array(),
-                          $level = PEAR_LOG_DEBUG)
+    public function __construct($name, $ident = '', $conf = array(),
+                                $level = PEAR_LOG_DEBUG)
     {
         $this->_id = md5(microtime());
         $this->_name = str_replace(' ', '_', $name);