MDL-52285 auth: use __construct() for constructors

diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index afa87dd..4439bcb 100644 (file)
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -39,13 +39,23 @@ class auth_plugin_cas extends auth_plugin_ldap {
     /**
      * Constructor.
      */
-    function auth_plugin_cas() {
+    public function __construct() {
         $this->authtype = 'cas';
         $this->roleauth = 'auth_cas';
         $this->errorlogtag = '[AUTH CAS] ';
         $this->init_plugin($this->authtype);
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_cas() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     function prevent_local_passwords() {
         return true;
     }

diff --git a/auth/email/auth.php b/auth/email/auth.php
index 0a0827d..ffa0e91 100644 (file)
--- a/auth/email/auth.php
+++ b/auth/email/auth.php
@@ -34,11 +34,21 @@ class auth_plugin_email extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_email() {
+    public function __construct() {
         $this->authtype = 'email';
         $this->config = get_config('auth/email');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_email() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/fc/auth.php b/auth/fc/auth.php
index 75c8bd0..b987992 100644 (file)
--- a/auth/fc/auth.php
+++ b/auth/fc/auth.php
@@ -37,11 +37,21 @@ class auth_plugin_fc extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_fc() {
+    public function __construct() {
         $this->authtype = 'fc';
         $this->config = get_config('auth/fc');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_fc() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/fc/fcFPP.php b/auth/fc/fcFPP.php
index c082202..36c589e 100644 (file)
--- a/auth/fc/fcFPP.php
+++ b/auth/fc/fcFPP.php
@@ -30,7 +30,7 @@ class fcFPP
     var $_debug = FALSE;    // set to true to see some debug info
 
     // class constructor
-    function fcFPP($host="localhost", $port="3333")
+    public function __construct($host="localhost", $port="3333")
     {
     $this->_hostname = $host;
     $this->_port = $port;

diff --git a/auth/imap/auth.php b/auth/imap/auth.php
index b0d7f9f..3e3e2da 100644 (file)
--- a/auth/imap/auth.php
+++ b/auth/imap/auth.php
@@ -35,11 +35,21 @@ class auth_plugin_imap extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_imap() {
+    public function __construct() {
         $this->authtype = 'imap';
         $this->config = get_config('auth/imap');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_imap() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index 96d9bba..9d3a4ad 100644 (file)
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -143,13 +143,23 @@ class auth_plugin_ldap extends auth_plugin_base {
     /**
      * Constructor with initialisation.
      */
-    function auth_plugin_ldap() {
+    public function __construct() {
         $this->authtype = 'ldap';
         $this->roleauth = 'auth_ldap';
         $this->errorlogtag = '[AUTH LDAP] ';
         $this->init_plugin($this->authtype);
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_ldap() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/manual/auth.php b/auth/manual/auth.php
index 938aae8..c6df146 100644 (file)
--- a/auth/manual/auth.php
+++ b/auth/manual/auth.php
@@ -46,13 +46,23 @@ class auth_plugin_manual extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_manual() {
+    public function __construct() {
         $this->authtype = 'manual';
         $config = get_config(self::COMPONENT_NAME);
         $legacyconfig = get_config(self::LEGACY_COMPONENT_NAME);
         $this->config = (object)array_merge((array)$legacyconfig, (array)$config);
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_manual() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist. (Non-mnet accounts only!)

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index f061539..8bd7768 100644 (file)
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -35,12 +35,22 @@ class auth_plugin_mnet extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_mnet() {
+    public function __construct() {
         $this->authtype = 'mnet';
         $this->config = get_config('auth_mnet');
         $this->mnet = get_mnet_environment();
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_mnet() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * This function is normally used to determine if the username and password
      * are correct for local logins. Always returns false, as local users do not

diff --git a/auth/nntp/auth.php b/auth/nntp/auth.php
index c2ad283..9e8b24c 100644 (file)
--- a/auth/nntp/auth.php
+++ b/auth/nntp/auth.php
@@ -35,11 +35,21 @@ class auth_plugin_nntp extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_nntp() {
+    public function __construct() {
         $this->authtype = 'nntp';
         $this->config = get_config('auth/nntp');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_nntp() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/nologin/auth.php b/auth/nologin/auth.php
index c3ed391..9a1ec28 100644 (file)
--- a/auth/nologin/auth.php
+++ b/auth/nologin/auth.php
@@ -35,10 +35,20 @@ class auth_plugin_nologin extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_nologin() {
+    public function __construct() {
         $this->authtype = 'nologin';
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_nologin() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Do not allow any login.
      *

diff --git a/auth/none/auth.php b/auth/none/auth.php
index fcfce4c..c002930 100644 (file)
--- a/auth/none/auth.php
+++ b/auth/none/auth.php
@@ -34,11 +34,21 @@ class auth_plugin_none extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_none() {
+    public function __construct() {
         $this->authtype = 'none';
         $this->config = get_config('auth/none');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_none() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work or don't exist and false
      * if the user exists and the password is wrong.

diff --git a/auth/pam/auth.php b/auth/pam/auth.php
index fd76a09..b1e2053 100644 (file)
--- a/auth/pam/auth.php
+++ b/auth/pam/auth.php
@@ -53,12 +53,22 @@ class auth_plugin_pam extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_pam() {
+    public function __construct() {
         $this->authtype = 'pam';
         $this->config = get_config('auth/pam');
         $this->errormessage = '';
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_pam() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/pop3/auth.php b/auth/pop3/auth.php
index 5e25aa9..4bfaa0b 100644 (file)
--- a/auth/pop3/auth.php
+++ b/auth/pop3/auth.php
@@ -35,11 +35,21 @@ class auth_plugin_pop3 extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_pop3() {
+    public function __construct() {
         $this->authtype = 'pop3';
         $this->config = get_config('auth/pop3');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_pop3() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/radius/auth.php b/auth/radius/auth.php
index a74369e..24ae5d3 100644 (file)
--- a/auth/radius/auth.php
+++ b/auth/radius/auth.php
@@ -38,11 +38,21 @@ class auth_plugin_radius extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_radius() {
+    public function __construct() {
         $this->authtype = 'radius';
         $this->config = get_config('auth/radius');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_radius() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
index a4cebd8..be7c25b 100644 (file)
--- a/auth/shibboleth/auth.php
+++ b/auth/shibboleth/auth.php
@@ -38,11 +38,21 @@ class auth_plugin_shibboleth extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_shibboleth() {
+    public function __construct() {
         $this->authtype = 'shibboleth';
         $this->config = get_config('auth/shibboleth');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_shibboleth() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/auth/webservice/auth.php b/auth/webservice/auth.php
index 1fc5694..f027f1c 100644 (file)
--- a/auth/webservice/auth.php
+++ b/auth/webservice/auth.php
@@ -35,11 +35,21 @@ class auth_plugin_webservice extends auth_plugin_base {
     /**
      * Constructor.
      */
-    function auth_plugin_webservice() {
+    public function __construct() {
         $this->authtype = 'webservice';
         $this->config = get_config('auth/webservice');
     }
 
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function auth_plugin_webservice() {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct();
+    }
+
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.

diff --git a/lib/pear/Crypt/CHAP.php b/lib/pear/Crypt/CHAP.php
index 561ec9f..333db9b 100644 (file)
--- a/lib/pear/Crypt/CHAP.php
+++ b/lib/pear/Crypt/CHAP.php
@@ -85,9 +85,9 @@ class Crypt_CHAP extends PEAR
      * Generates a random challenge
      * @return void
      */
-    function Crypt_CHAP()
+    public function __construct()
     {
-        $this->PEAR();
+        parent::__construct();
         $this->generateChallenge();
     }
 
@@ -167,9 +167,9 @@ class Crypt_CHAP_MSv1 extends Crypt_CHAP
      * Loads the hash extension
      * @return void
      */
-    function Crypt_CHAP_MSv1()
+    public function __construct()
     {
-        $this->Crypt_CHAP();
+        parent::__construct();
         $this->loadExtension('hash');
     }
 
@@ -415,9 +415,9 @@ class Crypt_CHAP_MSv2 extends Crypt_CHAP_MSv1
      * Generates the 16 Bytes peer and authentication challenge
      * @return void
      */
-    function Crypt_CHAP_MSv2()
+    public function __construct()
     {
-        $this->Crypt_CHAP_MSv1();
+        parent::__construct();
         $this->generateChallenge('peerChallenge', 16);
         $this->generateChallenge('authChallenge', 16);
     }

diff --git a/lib/pear/README_MOODLE.txt b/lib/pear/README_MOODLE.txt
index 4dc1fb4..a427440 100644 (file)
--- a/lib/pear/README_MOODLE.txt
+++ b/lib/pear/README_MOODLE.txt
@@ -33,4 +33,9 @@ MDL-52081 - made all constructors PHP7 compatible
 Pear
 ====
 Changed constructors in classes PEAR and PEAR_ERROR to be __construct(). This has
-been already changed upstream in 1.10.0, remove this line after upgrade.
\ No newline at end of file
+been already changed upstream in 1.10.0, remove this line after upgrade.
+
+
+Crypt/CHAP
+==========
+MDL-52285 - made all constructors PHP7 compatible

diff --git a/mnet/environment.php b/mnet/environment.php
index 5cc649b..236e4b6 100644 (file)
--- a/mnet/environment.php
+++ b/mnet/environment.php
@@ -17,10 +17,6 @@ class mnet_environment {
     var $keypair            = array();
     var $deleted            = 0;
 
-    function mnet_environment() {
-        return true;
-    }
-
     function init() {
         global $CFG, $DB;
 

diff --git a/mnet/peer.php b/mnet/peer.php
index 9f72e17..804b7d2 100644 (file)
--- a/mnet/peer.php
+++ b/mnet/peer.php
@@ -39,10 +39,6 @@ class mnet_peer {
     /** @var int $sslverification The level of SSL verification to apply. */
     public $sslverification = self::SSL_HOST_AND_PEER;
 
-    function mnet_peer() {
-        return true;
-    }
-
     /*
      * Fetch information about a peer identified by wwwroot
      * If information does not preexist in db, collect it together based on

diff --git a/mnet/xmlrpc/client.php b/mnet/xmlrpc/client.php
index 08414cf..3597cd5 100644 (file)
--- a/mnet/xmlrpc/client.php
+++ b/mnet/xmlrpc/client.php
@@ -23,12 +23,11 @@ class mnet_xmlrpc_client {
     var $mnet     = null;
 
     /**
-     * Constructor returns true
+     * Constructor
      */
-    function mnet_xmlrpc_client() {
+    public function __construct() {
         // make sure we've got this set up before we try and do anything else
         $this->mnet = get_mnet_environment();
-        return true;
     }
 
     /**

diff --git a/mnet/xmlrpc/xmlparser.php b/mnet/xmlrpc/xmlparser.php
index 95ccd2a..caf52ea 100644 (file)
--- a/mnet/xmlrpc/xmlparser.php
+++ b/mnet/xmlrpc/xmlparser.php
@@ -17,7 +17,7 @@ class mnet_encxml_parser {
      *
      * @return bool True
      */
-    function mnet_encxml_parser() {
+    public function __construct() {
         return $this->initialise();
     }