Aggiornato Composer
This commit is contained in:
@@ -9,9 +9,10 @@ class ScriptController
|
||||
{
|
||||
public function __invoke(Request $request)
|
||||
{
|
||||
if (!isset(Ignition::scripts()[$request->script])) {
|
||||
if (! isset(Ignition::scripts()[$request->script])) {
|
||||
abort(404, 'Script not found');
|
||||
}
|
||||
|
||||
return response(
|
||||
file_get_contents(
|
||||
Ignition::scripts()[$request->script]
|
||||
|
||||
@@ -49,7 +49,7 @@ class MergeConflictSolutionProvider implements HasSolutionsForThrowable
|
||||
|
||||
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';
|
||||
|
||||
@@ -34,6 +34,13 @@ class ViewNotFoundSolutionProvider implements HasSolutionsForThrowable
|
||||
|
||||
$suggestedView = $this->findRelatedView($missingView);
|
||||
|
||||
if ($suggestedView == $missingView) {
|
||||
return [
|
||||
BaseSolution::create("{$missingView} was not found.")
|
||||
->setSolutionDescription('View names should not contain the . character!'),
|
||||
];
|
||||
}
|
||||
|
||||
if ($suggestedView) {
|
||||
return [
|
||||
BaseSolution::create("{$missingView} was not found.")
|
||||
|
||||
Reference in New Issue
Block a user