Changeset 32990 for trunk/src/wp-includes/pomo/streams.php

Timestamp:

06/28/2015 03:26:41 PM (11 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/pomo/streams.php (modified) (6 diffs)

trunk/src/wp-includes/pomo/streams.php

@@ -15 +15 @@
         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();
         }
 
@@ -131 +141 @@
          * @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 );
         }
 
@@ -197 +214 @@
         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 );
         }
 
@@ -246 +273 @@
  */
 class POMO_CachedFileReader extends POMO_StringReader {
-        function POMO_CachedFileReader($filename) {
+        /**
+         * PHP5 constructor.
+         */
+        function __construct( $filename ) {
                 parent::POMO_StringReader();
                 $this->_str = file_get_contents($filename);
@@ -253 +283 @@
                 $this->_pos = 0;
         }
+
+        /**
+         * PHP4 constructor.
+         */
+        public function POMO_CachedFileReader( $filename ) {
+                self::__construct( $filename );
+        }
 }
 endif;
@@ -261 +298 @@
  */
 class POMO_CachedIntFileReader extends POMO_CachedFileReader {
-        function POMO_CachedIntFileReader($filename) {
+        /**
+         * PHP5 constructor.
+         */
+        public function __construct( $filename ) {
                 parent::POMO_CachedFileReader($filename);
         }
-}
-endif;
+
+        /**
+         * PHP4 constructor.
+         */
+        function POMO_CachedIntFileReader( $filename ) {
+                self::__construct( $filename );
+        }
+}
+endif;
+