archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-06 17:54:03 +00:00
Code Activity

Code and comment style improvements

Browse source
This commit is contained in:
lukinovec 2022-07-22 09:24:42 +02:00 • committed by GitHub
parent 1e75221e12
commit f4136f697c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Database/Concerns/PendingScope.php
View file

@ -27,7 +27,7 @@ class PendingScope implements Scope
*/
public function apply(Builder $builder, Model $model)
{
$builder->when(!config('tenancy.pending.include_in_queries'), function (Builder $builder){
$builder->when(! config('tenancy.pending.include_in_queries'), function (Builder $builder){
$builder->whereNull('data->pending_since');
});
}
@ -71,10 +71,8 @@ class PendingScope implements Scope
{
$builder->macro('withoutPending', function (Builder $builder) {
// Only use whereNull('data->pending_since') when Laravel 6 support is dropped
// Issue fixed in Laravel 7 https://github.com/laravel/framework/pull/32417
$builder->withoutGlobalScope($this)
->where('data->pending_since', 'like', 'null')
->whereNull('data->pending_since')
->orWhereNull('data');
return $builder;
@ -90,10 +88,7 @@ class PendingScope implements Scope
protected function addOnlyPending(Builder $builder)
{
$builder->macro('onlyPending', function (Builder $builder) {
// Use whereNotNull when Laravel 6 is dropped
// Issue fixed in Laravel 7 https://github.com/laravel/framework/pull/32417
$builder->withoutGlobalScope($this)->where('data->pending_since', 'not like', 'null');
$builder->withoutGlobalScope($this)->whereNotNull('data->pending_since');
return $builder;
});