Skip to content

Commit

Permalink
More PHP 7 compatibility fixes #4033
Browse files Browse the repository at this point in the history
  • Loading branch information
samdark committed Apr 19, 2016
1 parent 886a2ec commit f2054c0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions framework/gii/components/Pear/Text/Diff/ThreeWay.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function _diff3($edits1, $edits2)
*/
class Text_Diff_ThreeWay_Op {

function Text_Diff_ThreeWay_Op($orig = false, $final1 = false, $final2 = false)
function __construct($orig = false, $final1 = false, $final2 = false)
{
$this->orig = $orig ? $orig : array();
$this->final1 = $final1 ? $final1 : array();
Expand Down Expand Up @@ -194,7 +194,7 @@ function isConflict()
*/
class Text_Diff_ThreeWay_Op_copy extends Text_Diff_ThreeWay_Op {

function Text_Diff_ThreeWay_Op_Copy($lines = false)
function __construct($lines = false)
{
$this->orig = $lines ? $lines : array();
$this->final1 = &$this->orig;
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 @@ -155,7 +155,7 @@ function _diff3($edits1, $edits2)
*/
class Text_Diff3_Op {

function Text_Diff3_Op($orig = false, $final1 = false, $final2 = false)
function __construct($orig = false, $final1 = false, $final2 = false)
{
$this->orig = $orig ? $orig : array();
$this->final1 = $final1 ? $final1 : array();
Expand Down

0 comments on commit f2054c0

Please sign in to comment.