WordPress 4.3

[autoinstalls/wordpress.git] / wp-includes / Text / Diff.php

diff --git a/wp-includes/Text/Diff.php b/wp-includes/Text/Diff.php
index 3ba7b4c7ea8336d6f660334a01d868a8c2f54b88..edcdd3ac3a0d27dde7b2560d30a621d6f7b6c4cf 100644 (file)
--- a/wp-includes/Text/Diff.php
+++ b/wp-includes/Text/Diff.php
@@ -33,7 +33,7 @@ class Text_Diff {
      *                           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,6 +55,13 @@ class Text_Diff {
         $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.
      */
@@ -205,7 +212,7 @@ class Text_Diff {
      * @param string $line  The line to trim.
      * @param integer $key  The index of the line in the array. Not used.
      */
-    function trimNewlines(&$line, $key)
+    static function trimNewlines(&$line, $key)
     {
         $line = str_replace(array("\n", "\r"), '', $line);
     }
@@ -304,7 +311,7 @@ class Text_MappedDiff extends Text_Diff {
      * @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,6 +335,15 @@ class Text_MappedDiff extends Text_Diff {
         }
     }
 
+       /**
+        * 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,7 +382,10 @@ class Text_Diff_Op {
  */
 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,9 +394,16 @@ class Text_Diff_Op_copy extends Text_Diff_Op {
         $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);
+        $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
         return $reverse;
     }
 
@@ -391,15 +417,25 @@ class Text_Diff_Op_copy extends Text_Diff_Op {
  */
 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);
+        $reverse = new Text_Diff_Op_add($this->orig);
         return $reverse;
     }
 
@@ -413,15 +449,25 @@ class Text_Diff_Op_delete extends Text_Diff_Op {
  */
 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);
+        $reverse = new Text_Diff_Op_delete($this->final);
         return $reverse;
     }
 
@@ -435,15 +481,25 @@ class Text_Diff_Op_add extends Text_Diff_Op {
  */
 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);
+        $reverse = new Text_Diff_Op_change($this->final, $this->orig);
         return $reverse;
     }