Skip to content

Commit

Permalink
feat: use default value if config key is not present
Browse files Browse the repository at this point in the history
  • Loading branch information
Mohammad-Alavi committed Jun 8, 2024
1 parent 2491bcf commit 3845577
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Macros/ResponseTransformer/GetRequestedIncludes.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class GetRequestedIncludes
public function __invoke(): callable
{
return function (): array {
return app(Manager::class)->parseIncludes(Request::get(Config::get('apiato.requests.params.include'), []))->getRequestedIncludes();
return app(Manager::class)->parseIncludes(Request::get(Config::get('apiato.requests.params.include', 'include'), []))->getRequestedIncludes();
};
}
}
2 changes: 1 addition & 1 deletion src/Traits/CanEagerLoadTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ trait CanEagerLoadTrait {
protected function eagerLoadRequestedRelations(): void
{
$this->scopeQuery(function (Builder|Model $model) {
if (Request::has(config('apiato.requests.params.include'))) {
if (Request::has(config('apiato.requests.params.include', 'include'))) {
$validIncludes = [];
foreach (ResponseTransformer::getRequestedIncludes() as $includeName) {
$relationParts = explode('.', $includeName);
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Abstracts/Repositories/RepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static function includeDataProvider(): array
#[DataProvider('includeDataProvider')]
public function testEagerLoadSingleRelationRequestedViaRequest(string $includes, array $mustLoadRelations, array $mustNotLoadRelations): void
{
request()->offsetSet(config('apiato.requests.params.include'), $includes);
request()->offsetSet(config('apiato.requests.params.include', 'include'), $includes);
$parent = UserFactory::new()->has(
UserFactory::new()->count(3),
'children'
Expand Down

0 comments on commit 3845577

Please sign in to comment.