Changeset 32990 for trunk/src/wp-includes/class-IXR.php

Timestamp:

06/28/2015 03:26:41 PM (10 years ago)

Author:

jorbin

Message:

Deprecate php4 style constructors

PHP7 is deprecating PHP4 style constructors, so we need to modify our code to have _construct methods that fire before the named PHP4 style constructors. The PHP4 style constructors will call the PHP5 style constructor in case it is being called directly (usually via parent::METHOD).

This modifies external libraries to add PHP5 style constructors, but doesn't add a notice for when they are used. In WordPress core code, PHP4 style constructors are being given a call to _deprecated_constructor. To the PHP4 style constructor I say "I know that I can't take no more | It ain't no lie | I wanna see you out that door | Baby, bye, bye, bye..."

Upstream: ​https://wiki.php.net/rfc/remove_php4_constructors

Props jdgrimes, netweb, jorbin
See #31982

File:

• trunk/src/wp-includes/class-IXR.php (modified) (16 diffs)

trunk/src/wp-includes/class-IXR.php

@@ -50 +50 @@
     var $type;
 
-    function IXR_Value($data, $type = false)
+    /**
+     * PHP5 constructor.
+     */
+    function __construct( $data, $type = false )
     {
         $this->data = $data;
@@ -69 +72 @@
         }
     }
+
+    /**
+     * PHP4 constructor.
+     */
+    public function IXR_Value( $data, $type = false ) {
+        self::__construct( $data, $type );
+    }
 
     function calculateType()
@@ -195 +205 @@
     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()
@@ -387 +407 @@
     var $capabilities;
 
-    function IXR_Server($callbacks = false, $data = false, $wait = false)
+    /**
+     * PHP5 constructor.
+     */
+    function __construct( $callbacks = false, $data = false, $wait = false )
     {
         $this->setCapabilities();
@@ -398 +421 @@
         }
     }
+
+    /**
+     * PHP4 constructor.
+     */
+    public function IXR_Server( $callbacks = false, $data = false, $wait = false ) {
+        self::__construct( $callbacks, $data, $wait );
+    }
 
     function serve($data = false)
@@ -601 +631 @@
     var $xml;
 
-    function IXR_Request($method, $args)
+    /**
+     * PHP5 constructor.
+     */
+    function __construct($method, $args)
     {
         $this->method = $method;
@@ -620 +653 @@
         $this->xml .= '</params></methodCall>';
     }
+
+    /**
+     * PHP4 constructor.
+     */
+    public function IXR_Request( $method, $args ) {
+        self::__construct( $method, $args );
+    }
 
     function getLength()
@@ -654 +694 @@
     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) {
@@ -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()
@@ -799 +849 @@
     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()
@@ -845 +905 @@
     var $timezone;
 
-    function IXR_Date($time)
+    /**
+     * PHP5 constructor.
+     */
+    function __construct( $time )
     {
         // $time can be a PHP timestamp or an ISO one
@@ -854 +917 @@
         }
     }
+
+    /**
+     * PHP4 constructor.
+     */
+    public function IXR_Date( $time ) {
+        self::__construct( $time );
+    }
 
     function parseTimestamp($timestamp)
@@ -903 +973 @@
     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()
@@ -925 +1005 @@
     var $help;
 
-    function IXR_IntrospectionServer()
+    /**
+     * PHP5 constructor.
+     */
+    function __construct()
     {
         $this->setCallbacks();
@@ -958 +1041 @@
         );
     }
+
+    /**
+     * PHP4 constructor.
+     */
+    public function IXR_IntrospectionServer() {
+        self::__construct();
+    }
 
     function addCallback($method, $callback, $args, $help)
@@ -1087 +1177 @@
     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()