cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Laravel 5.6 updates

Browse Source 
Travis config update

Removed HHVM script as Laravel no longer support HHVM after releasing 5.3
This commit is contained in:
Manish Verma
2018-08-06 20:08:55 +05:30
parent 126fbb0255
commit 1ac0f42a58
2464 changed files with 65239 additions and 46734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/phpspec/php-diff/lib/Diff/Renderer/Text/Context.php vendored
View File

@@ -72,17 +72,17 @@ class Diff_Renderer_Text_Context extends Diff_Renderer_Abstract
$j2 = $group[$lastItem][4];
if($i2 - $i1 >= 2) {
$diff .= '*** '.($group[0][1] + 1).','.$i2." ****\n";
$diff .= '*** '.($group[0][1] + 1).','.$i2." ****".PHP_EOL;
}
else {
$diff .= '*** '.$i2." ****\n";
}
if($j2 - $j1 >= 2) {
$separator = '--- '.($j1 + 1).','.$j2." ----\n";
$separator = '--- '.($j1 + 1).','.$j2." ----".PHP_EOL;
}
else {
$separator = '--- '.$j2." ----\n";
$separator = '--- '.$j2." ----".PHP_EOL;
}
$hasVisible = false;
@@ -99,7 +99,7 @@ class Diff_Renderer_Text_Context extends Diff_Renderer_Abstract
if($tag == 'insert') {
continue;
}
$diff .= $this->tagMap[$tag].' '.implode("\n".$this->tagMap[$tag].' ', $this->diff->GetA($i1, $i2))."\n";
$diff .= $this->tagMap[$tag].' '.implode(PHP_EOL.$this->tagMap[$tag].' ', $this->diff->GetA($i1, $i2)).PHP_EOL;
}
}
@@ -119,7 +119,7 @@ class Diff_Renderer_Text_Context extends Diff_Renderer_Abstract
if($tag == 'delete') {
continue;
}
$diff .= $this->tagMap[$tag].' '.implode("\n".$this->tagMap[$tag].' ', $this->diff->GetB($j1, $j2))."\n";
$diff .= $this->tagMap[$tag].' '.implode(PHP_EOL.$this->tagMap[$tag].' ', $this->diff->GetB($j1, $j2)).PHP_EOL;
}
}
}