Changeset 32990 for trunk/src/wp-includes/Text/Diff.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/Text/Diff.php (modified) (12 diffs)

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

@@ -34 +34 @@
      *                           containing the lines from a file.
      */
-    function Text_Diff($engine, $params)
+    function __construct( $engine, $params )
     {
         // Backward compatibility workaround.
@@ -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 );
+    }
 
     /**
@@ -305 +312 @@
      *                                  of elements as $to_lines.
      */
-    function Text_MappedDiff($from_lines, $to_lines,
+    function __construct($from_lines, $to_lines,
                              $mapped_from_lines, $mapped_to_lines)
     {
@@ -329 +336 @@
     }
 
+    /**
+     * 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 );
+    }
+
 }
 
@@ -367 +383 @@
 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)) {
@@ -376 +395 @@
     }
 
+    /**
+     * PHP4 constructor.
+     */
+    public function Text_Diff_Op_copy( $orig, $final = false ) {
+        self::__construct( $orig, $final );
+    }
+
     function &reverse()
     {
@@ -392 +418 @@
 class Text_Diff_Op_delete extends Text_Diff_Op {
 
-    function Text_Diff_Op_delete($lines)
+    /**
+     * PHP5 constructor.
+     */
+    function __construct( $lines )
     {
         $this->orig = $lines;
@@ -398 +427 @@
     }
 
+    /**
+     * PHP4 constructor.
+     */
+    public function Text_Diff_Op_delete( $lines ) {
+        self::__construct( $lines );
+    }
+
     function &reverse()
     {
@@ -414 +450 @@
 class Text_Diff_Op_add extends Text_Diff_Op {
 
-    function Text_Diff_Op_add($lines)
+    /**
+     * PHP5 constructor.
+     */
+    function __construct( $lines )
     {
         $this->final = $lines;
@@ -420 +459 @@
     }
 
+    /**
+     * PHP4 constructor.
+     */
+    public function Text_Diff_Op_add( $lines ) {
+        self::__construct( $lines );
+    }
+
     function &reverse()
     {
@@ -436 +482 @@
 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;
@@ -442 +491 @@
     }
 
+    /**
+     * PHP4 constructor.
+     */
+    public function Text_Diff_Op_change( $orig, $final ) {
+        self::__construct( $orig, $final );
+    }
+
     function &reverse()
     {