From b4f5955825bb4b74cba0f94001761c46335c33e9 Mon Sep 17 00:00:00 2001 From: Ilesanmi Olawale Adedotun <47121750+Mane-Olawale@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:34:59 +0100 Subject: [PATCH] fix: template literals deprecation for php 8.2.1 (#471) --- src/SolutionProviders/MergeConflictSolutionProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SolutionProviders/MergeConflictSolutionProvider.php b/src/SolutionProviders/MergeConflictSolutionProvider.php index 5e91aa63..a46b2016 100644 --- a/src/SolutionProviders/MergeConflictSolutionProvider.php +++ b/src/SolutionProviders/MergeConflictSolutionProvider.php @@ -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';