Skip to content

Commit

Permalink
Merge pull request #15 from secondnetwork/dependabot/composer/interve…
Browse files Browse the repository at this point in the history
…ntion/image-tw-2.7.2or-tw-3.0.0

build(deps): update intervention/image requirement from ^2.7.2 to ^2.7.2 || ^3.0.0
  • Loading branch information
secondnetwork authored Dec 11, 2023
2 parents 1f1c09f + 41020b9 commit 4f46c28
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^8.1",
"blade-ui-kit/blade-icons": "^1.5.3",
"illuminate/support": "^10.21",
"intervention/image": "^2.7.2",
"intervention/image": "^2.7.2 || ^3.0.0",
"laravel/folio": "^1.1.4",
"laravel/fortify": "^1.19.0",
"livewire/livewire": "^3.2.6",
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Metadata extends Component

public string $groupname;

public function __construct(string $pagename, string $groupname = null)
public function __construct(string $pagename, ?string $groupname = null)
{
$this->pagename = $pagename;
$this->dismissible = $groupname;
Expand Down
4 changes: 2 additions & 2 deletions src/Concerns/HandlesValidationErrors.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ public function ariaDescribedBy()
return '';
}

public function hasErrorsAndShow(string $name = null, string $bag = 'default'): bool
public function hasErrorsAndShow(?string $name = null, string $bag = 'default'): bool
{
return $this->showErrors
? $this->hasError($name, $bag)
: false;
}

public function hasError(string $name = null, string $bag = 'default'): bool
public function hasError(?string $name = null, string $bag = 'default'): bool
{
$errors = View::shared('errors', fn () => request()->session()->get('errors', new ViewErrorBag));

Expand Down

0 comments on commit 4f46c28

Please sign in to comment.