Ticket #31982: 31982.1.diff

src/wp-admin/includes/class-ftp-pure.php

@@ -27 +27 @@
  */
 class ftp extends ftp_base {
 
-        function ftp($verb=FALSE, $le=FALSE) {
-                $this->__construct($verb, $le);
-        }
-
         function __construct($verb=FALSE, $le=FALSE) {
                 parent::__construct(false, $verb, $le);
         }
 
+        function ftp($verb=FALSE, $le=FALSE) {
+                $this->__construct($verb, $le);
+        }
+
 // <!-- --------------------------------------------------------------------------------------- -->
 // <!--       Private functions                                                                 -->
 // <!-- --------------------------------------------------------------------------------------- -->

src/wp-admin/includes/class-ftp-sockets.php

@@ -27 +27 @@
  */
 class ftp extends ftp_base {
 
-        function ftp($verb=FALSE, $le=FALSE) {
-                $this->__construct($verb, $le);
-        }
-
         function __construct($verb=FALSE, $le=FALSE) {
                 parent::__construct(true, $verb, $le);
         }
 
+        function ftp($verb=FALSE, $le=FALSE) {
+                $this->__construct($verb, $le);
+        }
+
 // <!-- --------------------------------------------------------------------------------------- -->
 // <!--       Private functions                                                                 -->
 // <!-- --------------------------------------------------------------------------------------- -->

src/wp-admin/includes/class-ftp.php

@@ -121 +121 @@
         var $AutoAsciiExt;
 
         /* Constructor */
-        function ftp_base($port_mode=FALSE) {
-                $this->__construct($port_mode);
-        }
-
         function __construct($port_mode=FALSE, $verb=FALSE, $le=FALSE) {
                 $this->LocalEcho=$le;
                 $this->Verbose=$verb;
@@ -157 +153 @@
                 elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac;
         }
 
+        function ftp_base($port_mode=FALSE) {
+                $this->__construct($port_mode);
+        }
+
 // <!-- --------------------------------------------------------------------------------------- -->
 // <!--       Public functions                                                                  -->
 // <!-- --------------------------------------------------------------------------------------- -->

src/wp-admin/includes/class-pclzip.php

@@ -212 +212 @@
   //   Note that no real action is taken, if the archive does not exist it is not
   //   created. Use create() for that.
   // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
+  function __construct($p_zipname)
   {
 
     // ----- Tests the zlib
@@ -229 +229 @@
     // ----- Return
     return;
   }
+
+  public function PclZip($p_zipname) {
+    self::__construct($p_zipname);
+  }
   // --------------------------------------------------------------------------------
 
   // --------------------------------------------------------------------------------

src/wp-admin/includes/deprecated.php

@@ -470 +470 @@
         var $paging_text;
 
         /**
-         * PHP4 Constructor - Sets up the object properties.
+         * PHP5 Constructor - Sets up the object properties.
          *
          * @since 2.1.0
          *
@@ -479 +479 @@
          * @param string $role Role name.
          * @return WP_User_Search
          */
-        function WP_User_Search ($search_term = '', $page = '', $role = '') {
+        function __construct( $search_term = '', $page = '', $role = '' ) {
                 _deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' );
 
                 $this->search_term = wp_unslash( $search_term );
@@ -493 +493 @@
         }
 
         /**
+         * PHP4 Constructor - Sets up the object properties.
+         *
+         * @since 2.1.0
+         *
+         * @param string $search_term Search terms string.
+         * @param int $page Optional. Page ID.
+         * @param string $role Role name.
+         * @return WP_User_Search
+         */
+        public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
+                self::__construct( $search_term, $page, $role );
+        }
+
+        /**
          * {@internal Missing Short Description}}
          *
          * {@internal Missing Long Description}}

src/wp-includes/Text/Diff.php

@@ -33 +33 @@
      *                           Normally an array of two arrays, each
      *                           containing the lines from a file.
      */
-    function Text_Diff($engine, $params)
+    function __construct( $engine, $params )
     {
         // Backward compatibility workaround.
         if (!is_string($engine)) {
@@ -55 +55 @@
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_Diff( $engine, $params ) {
+                self::__construct( $engine, $params );
+        }
+
     /**
      * Returns the array of differences.
      */
@@ -304 +311 @@
      * @param array $mapped_to_lines    This array should have the same number
      *                                  of elements as $to_lines.
      */
-    function Text_MappedDiff($from_lines, $to_lines,
+    function __construct($from_lines, $to_lines,
                              $mapped_from_lines, $mapped_to_lines)
     {
         assert(count($from_lines) == count($mapped_from_lines));
@@ -328 +335 @@
         }
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_MappedDiff( $from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines ) {
+                self::__construct( $from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines );
+        }
+
 }
 
 /**
@@ -366 +382 @@
  */
 class Text_Diff_Op_copy extends Text_Diff_Op {
 
-    function Text_Diff_Op_copy($orig, $final = false)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $orig, $final = false )
     {
         if (!is_array($final)) {
             $final = $orig;
@@ -375 +394 @@
         $this->final = $final;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_Diff_Op_copy( $orig, $final = false ) {
+                self::__construct( $orig, $final );
+        }
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
@@ -391 +417 @@
  */
 class Text_Diff_Op_delete extends Text_Diff_Op {
 
-    function Text_Diff_Op_delete($lines)
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $lines )
     {
         $this->orig = $lines;
         $this->final = false;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_Diff_Op_delete( $lines ) {
+                self::__construct( $lines );
+        }
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_add($this->orig);
@@ -413 +449 @@
  */
 class Text_Diff_Op_add extends Text_Diff_Op {
 
-    function Text_Diff_Op_add($lines)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $lines )
     {
         $this->final = $lines;
         $this->orig = false;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_Diff_Op_add( $lines ) {
+                self::__construct( $lines );
+        }
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_delete($this->final);
@@ -435 +481 @@
  */
 class Text_Diff_Op_change extends Text_Diff_Op {
 
-    function Text_Diff_Op_change($orig, $final)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $orig, $final )
     {
         $this->orig = $orig;
         $this->final = $final;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_Diff_Op_change( $orig, $final ) {
+                self::__construct( $orig, $final );
+        }
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_change($this->final, $this->orig);

src/wp-includes/Text/Diff/Renderer.php

@@ -33 +33 @@
     /**
      * Constructor.
      */
-    function Text_Diff_Renderer($params = array())
+    function __construct( $params = array() )
     {
         foreach ($params as $param => $value) {
             $v = '_' . $param;
@@ -43 +43 @@
         }
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function Text_Diff_Renderer( $params = array() ) {
+                self::__construct( $params );
+        }
+
     /**
      * Get any renderer parameters.
      *

src/wp-includes/atomlib.php

@@ -87 +87 @@
     var $feed;
     var $current;
 
-    function AtomParser() {
+        /**
+         * PHP5 constructor.
+         */
+    function __construct() {
 
         $this->feed = new AtomFeed();
         $this->current = null;
@@ -95 +98 @@
         $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function AtomParser() {
+                self::__construct();
+        }
+
     function _p($msg) {
         if($this->debug) {
             print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";

src/wp-includes/class-IXR.php

@@ -49 +49 @@
     var $data;
     var $type;
 
-    function IXR_Value($data, $type = false)
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $data, $type = false )
     {
         $this->data = $data;
         if (!$type) {
@@ -69 +72 @@
         }
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Value( $data, $type = false ) {
+                self::__construct( $data, $type );
+        }
+
     function calculateType()
     {
         if ($this->data === true || $this->data === false) {
@@ -194 +204 @@
     // The XML parser
     var $_parser;
 
-    function IXR_Message($message)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $message )
     {
         $this->message =& $message;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Message( $message ) {
+                self::__construct( $message );
+        }
+
     function parse()
     {
         // first remove the XML declaration
@@ -386 +406 @@
     var $message;
     var $capabilities;
 
-    function IXR_Server($callbacks = false, $data = false, $wait = false)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $callbacks = false, $data = false, $wait = false )
     {
         $this->setCapabilities();
         if ($callbacks) {
@@ -398 +421 @@
         }
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Server( $callbacks = false, $data = false, $wait = false ) {
+                self::__construct( $callbacks, $data, $wait );
+        }
+
     function serve($data = false)
     {
         if (!$data) {
@@ -600 +630 @@
     var $args;
     var $xml;
 
-    function IXR_Request($method, $args)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct($method, $args)
     {
         $this->method = $method;
         $this->args = $args;
@@ -620 +653 @@
         $this->xml .= '</params></methodCall>';
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Request( $method, $args ) {
+                self::__construct( $method, $args );
+        }
+
     function getLength()
     {
         return strlen($this->xml);
@@ -653 +693 @@
     // Storage place for an error message
     var $error = false;
 
-    function IXR_Client($server, $path = false, $port = 80, $timeout = 15)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $server, $path = false, $port = 80, $timeout = 15 )
     {
         if (!$path) {
             // Assume we have been given a URL instead
@@ -679 +722 @@
         $this->timeout = $timeout;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Client( $server, $path = false, $port = 80, $timeout = 15 ) {
+                self::__construct( $server, $path, $port, $timeout );
+        }
+
     function query()
     {
         $args = func_get_args();
@@ -798 +848 @@
     var $code;
     var $message;
 
-    function IXR_Error($code, $message)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $code, $message )
     {
         $this->code = $code;
         $this->message = htmlspecialchars($message);
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Error( $code, $message ) {
+                self::__construct( $code, $message );
+        }
+
     function getXml()
     {
         $xml = <<<EOD
@@ -844 +904 @@
     var $second;
     var $timezone;
 
-    function IXR_Date($time)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $time )
     {
         // $time can be a PHP timestamp or an ISO one
         if (is_numeric($time)) {
@@ -854 +917 @@
         }
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Date( $time ) {
+                self::__construct( $time );
+        }
+
     function parseTimestamp($timestamp)
     {
         $this->year = date('Y', $timestamp);
@@ -902 +972 @@
 {
     var $data;
 
-    function IXR_Base64($data)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $data )
     {
         $this->data = $data;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_Base64( $data ) {
+                self::__construct( $data );
+        }
+
     function getXml()
     {
         return '<base64>'.base64_encode($this->data).'</base64>';
@@ -924 +1004 @@
     var $signatures;
     var $help;
 
-    function IXR_IntrospectionServer()
+        /**
+         * PHP5 constructor.
+         */
+    function __construct()
     {
         $this->setCallbacks();
         $this->setCapabilities();
@@ -958 +1041 @@
         );
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_IntrospectionServer() {
+                self::__construct();
+        }
+
     function addCallback($method, $callback, $args, $help)
     {
         $this->callbacks[$method] = $callback;
@@ -1086 +1176 @@
 {
     var $calls = array();
 
-    function IXR_ClientMulticall($server, $path = false, $port = 80)
+        /**
+         * PHP5 constructor.
+         */
+    function __construct( $server, $path = false, $port = 80 )
     {
         parent::IXR_Client($server, $path, $port);
         $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function IXR_ClientMulticall( $server, $path = false, $port = 80 ) {
+                self::__construct( $server, $path, $port );
+        }
+
     function addCall()
     {
         $args = func_get_args();

src/wp-includes/class-json.php

@@ -140 +140 @@
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function Services_JSON($use = 0)
+    function __construct( $use = 0 )
     {
         $this->use = $use;
         $this->_mb_strlen            = function_exists('mb_strlen');
         $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
         $this->_mb_substr            = function_exists('mb_substr');
     }
+
+        /**
+         * PHP4 constructor.
+         */
+        public function Services_JSON( $use = 0 ) {
+                self::__construct( $use );
+        }
     // private - cache the mbstring lookup results..
     var $_mb_strlen = false;
     var $_mb_substr = false;
@@ -910 +917 @@
 
     class Services_JSON_Error extends PEAR_Error
     {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
+        function __construct($message = 'unknown error', $code = null,
                                      $mode = null, $options = null, $userinfo = null)
         {
             parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
         }
+
+        public function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null) {
+                self::__construct($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null);
+        }
     }
 
 } else {
@@ -924 +937 @@
      */
     class Services_JSON_Error
     {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
+            /**
+             * PHP5 constructor.
+             */
+        function __construct( $message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null )
         {
 
         }
+
+            /**
+             * PHP4 constructor.
+             */
+                public function Services_JSON_Error( $message = 'unknown error', $code = null,
+                                             $mode = null, $options = null, $userinfo = null ) {
+                        self::__construct( $message, $code, $mode, $options, $userinfo );
+                }
     }
     
 }

src/wp-includes/class-phpass.php

@@ -39 +39 @@
         var $portable_hashes;
         var $random_state;
 
-        function PasswordHash($iteration_count_log2, $portable_hashes)
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $iteration_count_log2, $portable_hashes )
         {
                 $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -52 +55 @@
                 $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function PasswordHash( $iteration_count_log2, $portable_hashes ) {
+                self::__construct( $iteration_count_log2, $portable_hashes );
+        }
+
         function get_random_bytes($count)
         {
                 $output = '';

src/wp-includes/class-pop3.php

@@ -44 +44 @@
                                 //  This must be set to true
                                 //  manually
 
-    function POP3 ( $server = '', $timeout = '' ) {
+        /**
+         * PHP5 constructor.
+         */
+    function __construct ( $server = '', $timeout = '' ) {
         settype($this->BUFFER,"integer");
         if( !empty($server) ) {
             // Do not allow programs to alter MAILSERVER
@@ -62 +65 @@
         return true;
     }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function POP3( $server = '', $timeout = '' ) {
+                self::__construct( $server, $timeout );
+        }
+
     function update_timer () {
         if (!ini_get('safe_mode'))
             set_time_limit($this->TIMEOUT);

src/wp-includes/pomo/entry.php

@@ -40 +40 @@
          *      - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
          *      - flags (array) -- flags like php-format
          */
-        function Translation_Entry($args=array()) {
+        function __construct( $args = array() ) {
                 // if no singular -- empty object
                 if (!isset($args['singular'])) {
                         return;
@@ -56 +56 @@
         }
 
         /**
+         * PHP4 constructor.
+         */
+        public function Translation_Entry( $args = array() ) {
+                self::__construct( $args );
+        }
+
+        /**
          * Generates a unique key for this entry
          *
          * @return string|bool the key or false if the entry is empty

src/wp-includes/pomo/streams.php

@@ -14 +14 @@
         var $endian = 'little';
         var $_post = '';
 
-        function POMO_Reader() {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct() {
                 $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
                 $this->_pos = 0;
         }
 
         /**
+         * PHP4 constructor.
+         */
+        public function POMO_Reader() {
+                self::__construct();
+        }
+
+        /**
          * Sets the endianness of the file.
          *
          * @param $endian string 'big' or 'little'
@@ -122 +132 @@
         /**
          * @param string $filename
          */
-        function POMO_FileReader($filename) {
+        function __construct( $filename ) {
                 parent::POMO_Reader();
                 $this->_f = fopen($filename, 'rb');
         }
 
         /**
+         * PHP4 constructor.
+         */
+        public function POMO_FileReader( $filename ) {
+                self::__construct( $filename );
+        }
+
+        /**
          * @param int $bytes
          */
         function read($bytes) {
@@ -176 +193 @@
 
         var $_str = '';
 
-        function POMO_StringReader($str = '') {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $str = '' ) {
                 parent::POMO_Reader();
                 $this->_str = $str;
                 $this->_pos = 0;
         }
 
         /**
+         * PHP4 constructor.
+         */
+        public function POMO_StringReader( $str = '' ) {
+                self::__construct( $str );
+        }
+
+        /**
          * @param string $bytes
          * @return string
          */
@@ -219 +246 @@
  * Reads the contents of the file in the beginning.
  */
 class POMO_CachedFileReader extends POMO_StringReader {
-        function POMO_CachedFileReader($filename) {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $filename ) {
                 parent::POMO_StringReader();
                 $this->_str = file_get_contents($filename);
                 if (false === $this->_str)
                         return false;
                 $this->_pos = 0;
         }
+
+        /**
+         * PHP4 constructor.
+         */
+        public function POMO_CachedFileReader( $filename ) {
+                self::__construct( $filename );
+        }
 }
 endif;
 
@@ -234 +271 @@
  * Reads the contents of the file in the beginning.
  */
 class POMO_CachedIntFileReader extends POMO_CachedFileReader {
-        function POMO_CachedIntFileReader($filename) {
+        /**
+         * PHP5 constructor.
+         */
+        public function __construct( $filename ) {
                 parent::POMO_CachedFileReader($filename);
         }
+
+        /**
+         * PHP4 constructor.
+         */
+        function POMO_CachedIntFileReader( $filename ) {
+                self::__construct( $filename );
+        }
 }
-endif;
- No newline at end of file
+endif;
+

src/wp-includes/rss.php

@@ -55 +55 @@
 
         var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
 
-        function MagpieRSS ($source) {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $source ) {
 
                 # if PHP xml isn't compiled in, die
                 #
@@ -97 +100 @@
                 $this->normalize();
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function MagpieRSS( $source ) {
+                self::__construct( $source );
+        }
+
         function feed_start_element($p, $element, &$attrs) {
                 $el = $element = strtolower($element);
                 $attrs = array_change_key_case($attrs, CASE_LOWER);
@@ -709 +719 @@
         var $MAX_AGE    = 43200;                // when are files stale, default twelve hours
         var $ERROR              = '';                   // accumulate error messages
 
-        function RSSCache ($base='', $age='') {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $base = '', $age = '' ) {
                 $this->BASE_CACHE = WP_CONTENT_DIR . '/cache';
                 if ( $base ) {
                         $this->BASE_CACHE = $base;
@@ -720 +733 @@
 
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function RSSCache( $base = '', $age = '' ) {
+                self::__construct( $base, $age );
+        }
+
 /*=======================================================================*\
         Function:       set
         Purpose:        add an item to the cache, keyed on url

src/wp-includes/widgets.php

@@ -544 +544 @@
 class WP_Widget_Factory {
         public $widgets = array();
 
-        public function WP_Widget_Factory() {
+        /**
+         * PHP5 constructor.
+         */
+        public function __construct() {
                 add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
         }
 
         /**
+         * PHP4 constructor.
+         */
+        public function WP_Widget_Factory() {
+                self::__construct();
+        }
+
+        /**
          * Register a widget subclass.
          *
          * @since 2.8.0

tests/phpunit/includes/utils.php

@@ -25 +25 @@
         var $events;
         var $debug;
 
-        function MockAction($debug=0) {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $debug = 0 ) {
                 $this->reset();
                 $this->debug = $debug;
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function MockAction( $debug = 0 ) {
+                self::__construct( $debug );
+        }
+
         function reset() {
                 $this->events = array();
         }
@@ -129 +139 @@
         var $xml;
         var $data = array();
 
-        function testXMLParser($in) {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $in ) {
                 $this->xml = xml_parser_create();
                 xml_set_object($this->xml, $this);
                 xml_parser_set_option($this->xml,XML_OPTION_CASE_FOLDING, 0);
@@ -138 +151 @@
                 $this->parse($in);
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function testXMLParser( $in ) {
+                self::__construct( $in );
+        }
+
         function parse($in) {
                 $parse = xml_parse($this->xml, $in, sizeof($in));
                 if (!$parse) {

tests/phpunit/includes/wp-profiler.php

@@ -21 +21 @@
         var $stack;
         var $profile;
 
-        // constructor
-        function WPProfiler() {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct() {
                 $this->stack = array();
                 $this->profile = array();
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function WPProfiler() {
+                self::__construct();
+        }
+
         function start($name) {
                 $time = $this->microtime();
 

tools/i18n/add-textdomain.php

@@ -14 +14 @@
         var $modified_contents = '';
         var $funcs;
 
-        function AddTextdomain() {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct() {
                 $makepot = new MakePOT;
                 $this->funcs = array_keys( $makepot->rules );
         }
 
+        /**
+         * PHP4 constructor.
+         */
+        public function AddTextdomain() {
+                self::__construct();
+        }
+
         function usage() {
                 $usage = "Usage: php add-textdomain.php [-i] <domain> <file>\n\nAdds the string <domain> as a last argument to all i18n function calls in <file>\nand prints the modified php file on standard output.\n\nOptions:\n    -i    Modifies the PHP file in place, instead of printing it to standard output.\n";
                 fwrite(STDERR, $usage);