Skip to content

Commit

Permalink
fix: template literals deprecation for php 8.2.1 (#471)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mane-Olawale authored Jan 26, 2023
1 parent 597aaae commit b4f5955
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/SolutionProviders/MergeConflictSolutionProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function getSolutions(Throwable $throwable): array

protected function getCurrentBranch(string $directory): string
{
$branch = "'".trim(shell_exec("cd ${directory}; git branch | grep \\* | cut -d ' ' -f2"))."'";
$branch = "'".trim(shell_exec("cd {$directory}; git branch | grep \\* | cut -d ' ' -f2"))."'";

if ($branch === "''") {
$branch = 'current branch';
Expand Down

0 comments on commit b4f5955

Please sign in to comment.