@@ -2,54 +2,54 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Facade\Ignition; |
| 4 | 4 | |
| 5 | -use Monolog\Logger; |
|
| 6 | -use Illuminate\Support\Arr; |
|
| 7 | 5 | use Facade\FlareClient\Flare; |
| 8 | -use Illuminate\Log\LogManager; |
|
| 9 | -use Illuminate\Queue\QueueManager; |
|
| 10 | 6 | use Facade\FlareClient\Http\Client; |
| 11 | -use Illuminate\Support\Facades\Log; |
|
| 12 | -use Whoops\Handler\HandlerInterface; |
|
| 13 | -use Illuminate\Support\Facades\Route; |
|
| 14 | -use Illuminate\Foundation\Application; |
|
| 7 | +use Facade\IgnitionContracts\SolutionProviderRepository as SolutionProviderRepositoryContract; |
|
| 8 | +use Facade\Ignition\Commands\TestCommand; |
|
| 9 | +use Facade\Ignition\Context\LaravelContextDetector; |
|
| 10 | +use Facade\Ignition\DumpRecorder\DumpRecorder; |
|
| 11 | +use Facade\Ignition\ErrorPage\IgnitionWhoopsHandler; |
|
| 15 | 12 | use Facade\Ignition\ErrorPage\Renderer; |
| 16 | -use Facade\Ignition\Middleware\AddLogs; |
|
| 17 | -use Illuminate\Support\ServiceProvider; |
|
| 13 | +use Facade\Ignition\Http\Controllers\ExecuteSolutionController; |
|
| 14 | +use Facade\Ignition\Http\Controllers\HealthCheckController; |
|
| 15 | +use Facade\Ignition\Http\Controllers\ScriptController; |
|
| 16 | +use Facade\Ignition\Http\Controllers\ShareReportController; |
|
| 17 | +use Facade\Ignition\Http\Controllers\StyleController; |
|
| 18 | +use Facade\Ignition\LogRecorder\LogRecorder; |
|
| 18 | 19 | use Facade\Ignition\Logger\FlareHandler; |
| 19 | 20 | use Facade\Ignition\Middleware\AddDumps; |
| 20 | -use Illuminate\Log\Events\MessageLogged; |
|
| 21 | -use Facade\Ignition\Commands\TestCommand; |
|
| 21 | +use Facade\Ignition\Middleware\AddEnvironmentInformation; |
|
| 22 | +use Facade\Ignition\Middleware\AddGitInformation; |
|
| 23 | +use Facade\Ignition\Middleware\AddLogs; |
|
| 22 | 24 | use Facade\Ignition\Middleware\AddQueries; |
| 23 | -use Facade\Ignition\LogRecorder\LogRecorder; |
|
| 24 | 25 | use Facade\Ignition\Middleware\AddSolutions; |
| 25 | -use Facade\Ignition\Views\Engines\PhpEngine; |
|
| 26 | -use Facade\Ignition\DumpRecorder\DumpRecorder; |
|
| 27 | 26 | use Facade\Ignition\Middleware\SetNotifierName; |
| 28 | 27 | use Facade\Ignition\QueryRecorder\QueryRecorder; |
| 29 | -use Facade\Ignition\Middleware\AddGitInformation; |
|
| 30 | -use Facade\Ignition\Views\Engines\CompilerEngine; |
|
| 31 | -use Facade\Ignition\Context\LaravelContextDetector; |
|
| 32 | -use Facade\Ignition\ErrorPage\IgnitionWhoopsHandler; |
|
| 33 | -use Facade\Ignition\Http\Controllers\StyleController; |
|
| 34 | -use Facade\Ignition\Http\Controllers\ScriptController; |
|
| 35 | -use Facade\Ignition\Middleware\AddEnvironmentInformation; |
|
| 36 | -use Illuminate\View\Engines\PhpEngine as LaravelPhpEngine; |
|
| 37 | -use Facade\Ignition\Http\Controllers\HealthCheckController; |
|
| 38 | -use Facade\Ignition\Http\Controllers\ShareReportController; |
|
| 39 | -use Facade\Ignition\Http\Controllers\ExecuteSolutionController; |
|
| 40 | -use Facade\Ignition\SolutionProviders\SolutionProviderRepository; |
|
| 41 | -use Facade\Ignition\SolutionProviders\ViewNotFoundSolutionProvider; |
|
| 42 | 28 | use Facade\Ignition\SolutionProviders\BadMethodCallSolutionProvider; |
| 43 | 29 | use Facade\Ignition\SolutionProviders\DefaultDbNameSolutionProvider; |
| 30 | +use Facade\Ignition\SolutionProviders\IncorrectValetDbCredentialsSolutionProvider; |
|
| 31 | +use Facade\Ignition\SolutionProviders\InvalidRouteActionSolutionProvider; |
|
| 44 | 32 | use Facade\Ignition\SolutionProviders\MergeConflictSolutionProvider; |
| 45 | 33 | use Facade\Ignition\SolutionProviders\MissingAppKeySolutionProvider; |
| 46 | 34 | use Facade\Ignition\SolutionProviders\MissingImportSolutionProvider; |
| 35 | +use Facade\Ignition\SolutionProviders\MissingPackageSolutionProvider; |
|
| 36 | +use Facade\Ignition\SolutionProviders\SolutionProviderRepository; |
|
| 47 | 37 | use Facade\Ignition\SolutionProviders\TableNotFoundSolutionProvider; |
| 38 | +use Facade\Ignition\SolutionProviders\ViewNotFoundSolutionProvider; |
|
| 39 | +use Facade\Ignition\Views\Engines\CompilerEngine; |
|
| 40 | +use Facade\Ignition\Views\Engines\PhpEngine; |
|
| 41 | +use Illuminate\Foundation\Application; |
|
| 42 | +use Illuminate\Log\Events\MessageLogged; |
|
| 43 | +use Illuminate\Log\LogManager; |
|
| 44 | +use Illuminate\Queue\QueueManager; |
|
| 45 | +use Illuminate\Support\Arr; |
|
| 46 | +use Illuminate\Support\Facades\Log; |
|
| 47 | +use Illuminate\Support\Facades\Route; |
|
| 48 | +use Illuminate\Support\ServiceProvider; |
|
| 48 | 49 | use Illuminate\View\Engines\CompilerEngine as LaravelCompilerEngine; |
| 49 | -use Facade\Ignition\SolutionProviders\MissingPackageSolutionProvider; |
|
| 50 | -use Facade\Ignition\SolutionProviders\InvalidRouteActionSolutionProvider; |
|
| 51 | -use Facade\Ignition\SolutionProviders\IncorrectValetDbCredentialsSolutionProvider; |
|
| 52 | -use Facade\IgnitionContracts\SolutionProviderRepository as SolutionProviderRepositoryContract; |
|
| 50 | +use Illuminate\View\Engines\PhpEngine as LaravelPhpEngine; |
|
| 51 | +use Monolog\Logger; |
|
| 52 | +use Whoops\Handler\HandlerInterface; |
|
| 53 | 53 | |
| 54 | 54 | class IgnitionServiceProvider extends ServiceProvider |
| 55 | 55 | { |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Facade\Ignition\SolutionProviders; |
| 4 | 4 | |
| 5 | -use Throwable; |
|
| 6 | -use Illuminate\Support\Str; |
|
| 7 | 5 | use Facade\IgnitionContracts\BaseSolution; |
| 8 | 6 | use Facade\IgnitionContracts\HasSolutionsForThrowable; |
| 7 | +use Illuminate\Support\Str; |
|
| 9 | 8 | use Symfony\Component\Debug\Exception\FatalThrowableError; |
| 9 | +use Throwable; |
|
| 10 | 10 | |
| 11 | 11 | class MergeConflictSolutionProvider implements HasSolutionsForThrowable |
| 12 | 12 | { |
@@ -47,6 +47,9 @@ |
||
| 47 | 47 | ]; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | + /** |
|
| 51 | + * @param string $folder |
|
| 52 | + */ |
|
| 50 | 53 | private function getCurrentBranch($folder) |
| 51 | 54 | { |
| 52 | 55 | $branch = "'".trim(`cd $folder; git branch | grep \* | cut -d ' ' -f2`)."'"; |