[5.2] Fix automatic scope nesting

[acasar]

When applying multiple global scopes, we need to nest them even if no other where clauses were added to the query. I loosened the shouldNestWheresForScope condition to allow for that.

Bug was reported here: https://laracasts.com/discuss/channels/general-discussion/define-multiple-global-scope-for-a-model-in-laravel

[JosephSilber]

This actually broke my code, and it took me quite a while to track down 😢

I have a query scope that I want to sometimes apply with an or clause, so I was passing it in as an argument:

public function scopeOnDay($query, $column, Carbon $date, $boolean = 'and')
{
    $method = $boolean == 'and' ? 'where' : 'orWhere';

    $date = $date->startOfDay()->setTimezone('UTC');

    $query->{$method}(function ($query) use ($column, $date) {
        $query->where($column, '>=', $date->toDateTimeString());
        $query->where($column, '<', $date->addDays(1)->toDateTimeString());
    });
}

And here's how I was using it:

$query->where(function ($query) use ($date) {
    $query->onDay('created_at', $date)
          ->onDay('charged_at', $date, 'or');
});

But since all scopes are now wrapped, there's no way anymore to apply a scope with an or.

Am I missing something?

[acasar]

@JosephSilber yes, this was a breaking change in 5.2. In 5.3 we went back to allow scopes starting with OR boolean. See here: #12918

[JosephSilber]

Oh, I didn't see that. Nice.

This project is still on 5.2, so I just moved onDay to a query builder macro.