Skip to content

Commit 7e02208

Browse files
mrubinskcweiske
authored andcommitted
Do not assign the results of new as a reference
Cherry-pick 39407c0 from master
1 parent 12e89f0 commit 7e02208

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Text/Diff.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function getDiff()
6363
{
6464
return $this->_edits;
6565
}
66-
66+
6767
/**
6868
* returns the number of new (added) lines in a given diff.
6969
*
@@ -83,7 +83,7 @@ function countAddedLines()
8383
}
8484
return $count;
8585
}
86-
86+
8787
/**
8888
* Returns the number of deleted (removed) lines in a given diff.
8989
*
@@ -380,7 +380,7 @@ function Text_Diff_Op_copy($orig, $final = false)
380380

381381
function &reverse()
382382
{
383-
$reverse = &new Text_Diff_Op_copy($this->final, $this->orig);
383+
$reverse = new Text_Diff_Op_copy($this->final, $this->orig);
384384
return $reverse;
385385
}
386386

@@ -402,7 +402,7 @@ function Text_Diff_Op_delete($lines)
402402

403403
function &reverse()
404404
{
405-
$reverse = &new Text_Diff_Op_add($this->orig);
405+
$reverse = new Text_Diff_Op_add($this->orig);
406406
return $reverse;
407407
}
408408

@@ -424,7 +424,7 @@ function Text_Diff_Op_add($lines)
424424

425425
function &reverse()
426426
{
427-
$reverse = &new Text_Diff_Op_delete($this->final);
427+
$reverse = new Text_Diff_Op_delete($this->final);
428428
return $reverse;
429429
}
430430

@@ -446,7 +446,7 @@ function Text_Diff_Op_change($orig, $final)
446446

447447
function &reverse()
448448
{
449-
$reverse = &new Text_Diff_Op_change($this->final, $this->orig);
449+
$reverse = new Text_Diff_Op_change($this->final, $this->orig);
450450
return $reverse;
451451
}
452452

Text/Diff/Engine/native.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ function diff($from_lines, $to_lines)
106106
++$yi;
107107
}
108108
if ($copy) {
109-
$edits[] = &new Text_Diff_Op_copy($copy);
109+
$edits[] = new Text_Diff_Op_copy($copy);
110110
}
111111

112112
// Find deletes & adds.
@@ -121,11 +121,11 @@ function diff($from_lines, $to_lines)
121121
}
122122

123123
if ($delete && $add) {
124-
$edits[] = &new Text_Diff_Op_change($delete, $add);
124+
$edits[] = new Text_Diff_Op_change($delete, $add);
125125
} elseif ($delete) {
126-
$edits[] = &new Text_Diff_Op_delete($delete);
126+
$edits[] = new Text_Diff_Op_delete($delete);
127127
} elseif ($add) {
128-
$edits[] = &new Text_Diff_Op_add($add);
128+
$edits[] = new Text_Diff_Op_add($add);
129129
}
130130
}
131131

Text/Diff/Engine/xdiff.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ function diff($from_lines, $to_lines)
4747
}
4848
switch ($line[0]) {
4949
case ' ':
50-
$edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
50+
$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
5151
break;
5252

5353
case '+':
54-
$edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
54+
$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
5555
break;
5656

5757
case '-':
58-
$edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
58+
$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
5959
break;
6060
}
6161
}

0 commit comments

Comments
 (0)