Skip to content

Catch meta, tweak auth #1654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barryvdh merged 4 commits into from
Jan 8, 2025
Merged

Catch meta, tweak auth #1654

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf52f9e
Catch meta, tweak auth
barryvdh Jan 8, 2025
c5adc05
composer fix-style
Jan 8, 2025
efae815
Catch meta, tweak auth
barryvdh Jan 8, 2025
d5b03ba
Merge branch 'feat-tweak-meta-catch' of github.com:barryvdh/laravel-i…
barryvdh Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Console/MetaCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,12 @@ protected function getExpectedArguments()
],
[
'class' => ['\Illuminate\Support\Facades\Route', '\Illuminate\Support\Facades\Auth', 'Illuminate\Foundation\Auth\Access\Authorizable'],
'method' => ['can', 'cannot'],
'method' => ['can', 'cannot', 'cant'],
'argumentSet' => 'auth',
],
[
'class' => ['Illuminate\Contracts\Auth\Access\Authorizable'],
'method' => ['can'],
'argumentSet' => 'auth',
],
[
Expand Down Expand Up @@ -308,7 +313,13 @@ protected function loadTemplate($name)
{
if (!isset($this->templateCache[$name])) {
$file = __DIR__ . '/../../php-templates/' . basename($name) . '.php';
$value = $this->files->requireOnce($file) ?: [];
try {
$value = $this->files->requireOnce($file) ?: [];
} catch (\Throwable $e) {
$value = [];
$this->warn('Cannot load template for ' . $name . ': ' . $e->getMessage());
}

if (!$value instanceof Collection) {
$value = collect($value);
}
Expand Down
Loading