surya/apimacro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiornato Composer

Browse Source
This commit is contained in:
Paolo A
2024-05-17 12:24:19 +00:00
parent 4ac62108b5
commit ec201d75b2
2238 changed files with 38684 additions and 59785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/facade/ignition/src/SolutionProviders/MergeConflictSolutionProvider.php vendored
View File

@@ -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';

7
vendor/facade/ignition/src/SolutionProviders/ViewNotFoundSolutionProvider.php vendored
View File

@@ -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.")