Skip to content

Commit bfc70ad

Browse files
antonkomarevantonkomarev
committed
Separate flag scopes & helper methods
1 parent c93ccdd commit bfc70ad

16 files changed

+265
-80
lines changed

‎src/Traits/Classic/HasAcceptedFlag.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,12 @@
1111

1212
namespace Cog\Flag\Traits\Classic;
1313

14-
use Cog\Flag\Scopes\Classic\AcceptedFlagScope;
15-
1614
/**
1715
* Class HasAcceptedFlag.
1816
*
1917
* @package Cog\Flag\Traits\Classic
2018
*/
2119
trait HasAcceptedFlag
2220
{
23-
/**
24-
* Boot the HasAcceptedFlag trait for a model.
25-
*
26-
* @return void
27-
*/
28-
public static function bootHasAcceptedFlag()
29-
{
30-
static::addGlobalScope(new AcceptedFlagScope);
31-
}
21+
use HasAcceptedFlagScope;
3222
}

‎src/Traits/Classic/HasAcceptedFlagScope.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of Laravel Eloquent Flag.
5+
*
6+
* (c) CyberCog <support@cybercog.su>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Cog\Flag\Traits\Classic;
13+
14+
use Cog\Flag\Scopes\Classic\AcceptedFlagScope;
15+
16+
/**
17+
* Class HasAcceptedFlagScope.
18+
*
19+
* @package Cog\Flag\Traits\Classic
20+
*/
21+
trait HasAcceptedFlagScope
22+
{
23+
/**
24+
* Boot the HasAcceptedFlagScope trait for a model.
25+
*
26+
* @return void
27+
*/
28+
public static function bootHasAcceptedFlagScope()
29+
{
30+
static::addGlobalScope(new AcceptedFlagScope);
31+
}
32+
}

‎src/Traits/Classic/HasActiveFlag.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,12 @@
1111

1212
namespace Cog\Flag\Traits\Classic;
1313

14-
use Cog\Flag\Scopes\Classic\ActiveFlagScope;
15-
1614
/**
1715
* Class HasActiveFlag.
1816
*
1917
* @package Cog\Flag\Traits\Classic
2018
*/
2119
trait HasActiveFlag
2220
{
23-
/**
24-
* Boot the HasKeptFlag trait for a model.
25-
*
26-
* @return void
27-
*/
28-
public static function bootHasActiveFlag()
29-
{
30-
static::addGlobalScope(new ActiveFlagScope);
31-
}
21+
use HasActiveFlagScope;
3222
}

‎src/Traits/Classic/HasActiveFlagScope.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of Laravel Eloquent Flag.
5+
*
6+
* (c) CyberCog <support@cybercog.su>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Cog\Flag\Traits\Classic;
13+
14+
use Cog\Flag\Scopes\Classic\ActiveFlagScope;
15+
16+
/**
17+
* Class HasActiveFlagScope.
18+
*
19+
* @package Cog\Flag\Traits\Classic
20+
*/
21+
trait HasActiveFlagScope
22+
{
23+
/**
24+
* Boot the HasKeptFlagScope trait for a model.
25+
*
26+
* @return void
27+
*/
28+
public static function bootHasActiveFlagScope()
29+
{
30+
static::addGlobalScope(new ActiveFlagScope);
31+
}
32+
}

‎src/Traits/Classic/HasApprovedFlag.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,12 @@
1111

1212
namespace Cog\Flag\Traits\Classic;
1313

14-
use Cog\Flag\Scopes\Classic\ApprovedFlagScope;
15-
1614
/**
1715
* Class HasApprovedFlag.
1816
*
1917
* @package Cog\Flag\Traits\Classic
2018
*/
2119
trait HasApprovedFlag
2220
{
23-
/**
24-
* Boot the HasApprovedFlag trait for a model.
25-
*
26-
* @return void
27-
*/
28-
public static function bootHasApprovedFlag()
29-
{
30-
static::addGlobalScope(new ApprovedFlagScope);
31-
}
21+
use HasApprovedFlagScope;
3222
}

‎src/Traits/Classic/HasApprovedFlagScope.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of Laravel Eloquent Flag.
5+
*
6+
* (c) CyberCog <support@cybercog.su>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Cog\Flag\Traits\Classic;
13+
14+
use Cog\Flag\Scopes\Classic\ApprovedFlagScope;
15+
16+
/**
17+
* Class HasApprovedFlagScope.
18+
*
19+
* @package Cog\Flag\Traits\Classic
20+
*/
21+
trait HasApprovedFlagScope
22+
{
23+
/**
24+
* Boot the HasApprovedFlagScope trait for a model.
25+
*
26+
* @return void
27+
*/
28+
public static function bootHasApprovedFlagScope()
29+
{
30+
static::addGlobalScope(new ApprovedFlagScope);
31+
}
32+
}

‎src/Traits/Classic/HasKeptFlag.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Cog\Flag\Traits\Classic;
1313

1414
use Carbon\Carbon;
15-
use Cog\Flag\Scopes\Classic\KeptFlagScope;
1615
use Illuminate\Database\Eloquent\Builder;
1716

1817
/**
@@ -22,15 +21,15 @@
2221
*/
2322
trait HasKeptFlag
2423
{
24+
use HasKeptFlagScope;
25+
2526
/**
2627
* Boot the HasKeptFlag trait for a model.
2728
*
2829
* @return void
2930
*/
3031
public static function bootHasKeptFlag()
3132
{
32-
static::addGlobalScope(new KeptFlagScope);
33-
3433
static::creating(function ($entity) {
3534
if (!$entity->is_kept) {
3635
$entity->is_kept = false;

‎src/Traits/Classic/HasKeptFlagScope.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of Laravel Eloquent Flag.
5+
*
6+
* (c) CyberCog <support@cybercog.su>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Cog\Flag\Traits\Classic;
13+
14+
use Cog\Flag\Scopes\Classic\KeptFlagScope;
15+
16+
/**
17+
* Class HasKeptFlagScope.
18+
*
19+
* @package Cog\Flag\Traits\Classic
20+
*/
21+
trait HasKeptFlagScope
22+
{
23+
/**
24+
* Boot the HasKeptFlagScope trait for a model.
25+
*
26+
* @return void
27+
*/
28+
public static function bootHasKeptFlagScope()
29+
{
30+
static::addGlobalScope(new KeptFlagScope);
31+
}
32+
}

‎src/Traits/Classic/HasPublishedFlag.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,12 @@
1111

1212
namespace Cog\Flag\Traits\Classic;
1313

14-
use Cog\Flag\Scopes\Classic\PublishedFlagScope;
15-
1614
/**
1715
* Class HasPublishedFlag.
1816
*
1917
* @package Cog\Flag\Traits\Classic
2018
*/
2119
trait HasPublishedFlag
2220
{
23-
/**
24-
* Boot the HasPublishedFlag trait for a model.
25-
*
26-
* @return void
27-
*/
28-
public static function bootHasPublishedFlag()
29-
{
30-
static::addGlobalScope(new PublishedFlagScope);
31-
}
21+
use HasPublishedFlagScope;
3222
}

‎src/Traits/Classic/HasPublishedFlagScope.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of Laravel Eloquent Flag.
5+
*
6+
* (c) CyberCog <support@cybercog.su>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Cog\Flag\Traits\Classic;
13+
14+
use Cog\Flag\Scopes\Classic\PublishedFlagScope;
15+
16+
/**
17+
* Class HasPublishedFlagScope.
18+
*
19+
* @package Cog\Flag\Traits\Classic
20+
*/
21+
trait HasPublishedFlagScope
22+
{
23+
/**
24+
* Boot the HasPublishedFlagScope trait for a model.
25+
*
26+
* @return void
27+
*/
28+
public static function bootHasPublishedFlagScope()
29+
{
30+
static::addGlobalScope(new PublishedFlagScope);
31+
}
32+
}

0 commit comments

Comments
 (0)