Skip to content

Commit

Permalink
More fixes for #4033
Browse files Browse the repository at this point in the history
  • Loading branch information
samdark committed Apr 19, 2016
1 parent 3d028df commit 886a2ec
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions framework/gii/components/Pear/Text/Diff.php
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,13 @@ 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));
assert(count($to_lines) == count($mapped_to_lines));

parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
parent::__construct($mapped_from_lines, $mapped_to_lines);

$xi = $yi = 0;
for ($i = 0; $i < count($this->_edits); $i++) {
Expand Down Expand Up @@ -369,7 +369,7 @@ function nfinal()
*/
class Text_Diff_Op_copy extends Text_Diff_Op {

function Text_Diff_Op_copy($orig, $final = false)
function __construct($orig, $final = false)
{
if (!is_array($final)) {
$final = $orig;
Expand All @@ -394,7 +394,7 @@ function &reverse()
*/
class Text_Diff_Op_delete extends Text_Diff_Op {

function Text_Diff_Op_delete($lines)
function __construct($lines)
{
$this->orig = $lines;
$this->final = false;
Expand All @@ -416,7 +416,7 @@ function &reverse()
*/
class Text_Diff_Op_add extends Text_Diff_Op {

function Text_Diff_Op_add($lines)
function __construct($lines)
{
$this->final = $lines;
$this->orig = false;
Expand All @@ -438,7 +438,7 @@ function &reverse()
*/
class Text_Diff_Op_change extends Text_Diff_Op {

function Text_Diff_Op_change($orig, $final)
function __construct($orig, $final)
{
$this->orig = $orig;
$this->final = $final;
Expand Down
2 changes: 1 addition & 1 deletion framework/gii/components/Pear/Text/Diff/ThreeWay.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ function isConflict()
*/
class Text_Diff_ThreeWay_BlockBuilder {

function Text_Diff_ThreeWay_BlockBuilder()
function __construct()
{
$this->_init();
}
Expand Down
2 changes: 1 addition & 1 deletion framework/gii/components/Pear/Text/Diff3.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ function isConflict()
*/
class Text_Diff3_BlockBuilder {

function Text_Diff3_BlockBuilder()
function __construct()
{
$this->_init();
}
Expand Down

0 comments on commit 886a2ec

Please sign in to comment.