Skip to content

Commit 538517a

Browse files
authored
Merge pull request #50 from cybercog/refactor/remove-helper-mutator-methods
Remove attribute mutator helper methods
2 parents 3dacf36 + e86b3d0 commit 538517a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+92
-1104
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
1818

1919
- Dropped PHP 5.6, 7.0 support
2020
- Dropped Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7 support
21+
- Removed attribute mutator `set*` & `unset*` methods from all helper classes
2122

2223
## [4.0.0] - 2018-09-09
2324

src/Traits/Classic/HasAcceptedAtHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@ public function initializeHasAcceptedAtHelpers(): void
2222
$this->dates[] = 'accepted_at';
2323
}
2424

25-
/**
26-
* Set accepted flag.
27-
*
28-
* @return static
29-
*/
30-
public function setAcceptedFlag()
31-
{
32-
$this->setAttribute('accepted_at', Date::now());
33-
34-
return $this;
35-
}
36-
37-
/**
38-
* Unset accepted flag.
39-
*
40-
* @return static
41-
*/
42-
public function unsetAcceptedFlag()
43-
{
44-
$this->setAttribute('accepted_at', null);
45-
46-
return $this;
47-
}
48-
4925
/**
5026
* If entity is accepted.
5127
*
@@ -73,7 +49,8 @@ public function isRejected(): bool
7349
*/
7450
public function accept(): void
7551
{
76-
$this->setAcceptedFlag()->save();
52+
$this->setAttribute('accepted_at', Date::now());
53+
$this->save();
7754

7855
$this->fireModelEvent('accepted', false);
7956
}
@@ -85,7 +62,8 @@ public function accept(): void
8562
*/
8663
public function reject(): void
8764
{
88-
$this->unsetAcceptedFlag()->save();
65+
$this->setAttribute('accepted_at', null);
66+
$this->save();
8967

9068
$this->fireModelEvent('rejected', false);
9169
}

src/Traits/Classic/HasAcceptedFlagHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,6 @@ public function initializeHasAcceptedFlagHelpers(): void
2020
$this->casts['is_accepted'] = 'boolean';
2121
}
2222

23-
/**
24-
* Set accepted flag.
25-
*
26-
* @return static
27-
*/
28-
public function setAcceptedFlag()
29-
{
30-
$this->setAttribute('is_accepted', true);
31-
32-
return $this;
33-
}
34-
35-
/**
36-
* Unset accepted flag.
37-
*
38-
* @return static
39-
*/
40-
public function unsetAcceptedFlag()
41-
{
42-
$this->setAttribute('is_accepted', false);
43-
44-
return $this;
45-
}
46-
4723
/**
4824
* If entity is accepted.
4925
*
@@ -71,7 +47,8 @@ public function isRejected(): bool
7147
*/
7248
public function accept(): void
7349
{
74-
$this->setAcceptedFlag()->save();
50+
$this->setAttribute('is_accepted', true);
51+
$this->save();
7552

7653
$this->fireModelEvent('accepted', false);
7754
}
@@ -83,7 +60,8 @@ public function accept(): void
8360
*/
8461
public function reject(): void
8562
{
86-
$this->unsetAcceptedFlag()->save();
63+
$this->setAttribute('is_accepted', false);
64+
$this->save();
8765

8866
$this->fireModelEvent('rejected', false);
8967
}

src/Traits/Classic/HasActiveFlagHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,6 @@ public function initializeHasActiveFlagHelpers(): void
2020
$this->casts['is_active'] = 'boolean';
2121
}
2222

23-
/**
24-
* Set active flag.
25-
*
26-
* @return static
27-
*/
28-
public function setActivatedFlag()
29-
{
30-
$this->setAttribute('is_active', true);
31-
32-
return $this;
33-
}
34-
35-
/**
36-
* Unset active flag.
37-
*
38-
* @return static
39-
*/
40-
public function unsetActivatedFlag()
41-
{
42-
$this->setAttribute('is_active', false);
43-
44-
return $this;
45-
}
46-
4723
/**
4824
* If entity is activated.
4925
*
@@ -71,7 +47,8 @@ public function isDeactivated(): bool
7147
*/
7248
public function activate(): void
7349
{
74-
$this->setActivatedFlag()->save();
50+
$this->setAttribute('is_active', true);
51+
$this->save();
7552

7653
$this->fireModelEvent('activated', false);
7754
}
@@ -83,7 +60,8 @@ public function activate(): void
8360
*/
8461
public function deactivate(): void
8562
{
86-
$this->unsetActivatedFlag()->save();
63+
$this->save();
64+
$this->setAttribute('is_active', false);
8765

8866
$this->fireModelEvent('deactivated', false);
8967
}

src/Traits/Classic/HasApprovedAtHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@ public function initializeHasApprovedAtHelpers(): void
2222
$this->dates[] = 'approved_at';
2323
}
2424

25-
/**
26-
* Set approved flag.
27-
*
28-
* @return static
29-
*/
30-
public function setApprovedFlag()
31-
{
32-
$this->setAttribute('approved_at', Date::now());
33-
34-
return $this;
35-
}
36-
37-
/**
38-
* Unset approved flag.
39-
*
40-
* @return static
41-
*/
42-
public function unsetApprovedFlag()
43-
{
44-
$this->setAttribute('approved_at', null);
45-
46-
return $this;
47-
}
48-
4925
/**
5026
* If entity is approved.
5127
*
@@ -73,7 +49,8 @@ public function isDisapproved(): bool
7349
*/
7450
public function approve(): void
7551
{
76-
$this->setApprovedFlag()->save();
52+
$this->setAttribute('approved_at', Date::now());
53+
$this->save();
7754

7855
$this->fireModelEvent('approved', false);
7956
}
@@ -85,7 +62,8 @@ public function approve(): void
8562
*/
8663
public function disapprove(): void
8764
{
88-
$this->unsetApprovedFlag()->save();
65+
$this->setAttribute('approved_at', null);
66+
$this->save();
8967

9068
$this->fireModelEvent('disapproved', false);
9169
}

src/Traits/Classic/HasApprovedFlagHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,6 @@ public function initializeHasApprovedFlagHelpers(): void
2020
$this->casts['is_approved'] = 'boolean';
2121
}
2222

23-
/**
24-
* Set approved flag.
25-
*
26-
* @return static
27-
*/
28-
public function setApprovedFlag()
29-
{
30-
$this->setAttribute('is_approved', true);
31-
32-
return $this;
33-
}
34-
35-
/**
36-
* Unset approved flag.
37-
*
38-
* @return static
39-
*/
40-
public function unsetApprovedFlag()
41-
{
42-
$this->setAttribute('is_approved', false);
43-
44-
return $this;
45-
}
46-
4723
/**
4824
* If entity is approved.
4925
*
@@ -71,7 +47,8 @@ public function isDisapproved(): bool
7147
*/
7248
public function approve(): void
7349
{
74-
$this->setApprovedFlag()->save();
50+
$this->setAttribute('is_approved', true);
51+
$this->save();
7552

7653
$this->fireModelEvent('approved', false);
7754
}
@@ -83,7 +60,8 @@ public function approve(): void
8360
*/
8461
public function disapprove(): void
8562
{
86-
$this->unsetApprovedFlag()->save();
63+
$this->setAttribute('is_approved', false);
64+
$this->save();
8765

8866
$this->fireModelEvent('disapproved', false);
8967
}

src/Traits/Classic/HasInvitedAtHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@ public function initializeHasInvitedAtHelpers(): void
2222
$this->dates[] = 'invited_at';
2323
}
2424

25-
/**
26-
* Set invited flag.
27-
*
28-
* @return static
29-
*/
30-
public function setInvitedFlag()
31-
{
32-
$this->setAttribute('invited_at', Date::now());
33-
34-
return $this;
35-
}
36-
37-
/**
38-
* Unset invited flag.
39-
*
40-
* @return static
41-
*/
42-
public function unsetInvitedFlag()
43-
{
44-
$this->setAttribute('invited_at', null);
45-
46-
return $this;
47-
}
48-
4925
/**
5026
* If entity is invited.
5127
*
@@ -73,7 +49,8 @@ public function isUninvited(): bool
7349
*/
7450
public function invite(): void
7551
{
76-
$this->setInvitedFlag()->save();
52+
$this->setAttribute('invited_at', Date::now());
53+
$this->save();
7754

7855
$this->fireModelEvent('invited', false);
7956
}
@@ -85,7 +62,8 @@ public function invite(): void
8562
*/
8663
public function uninvite(): void
8764
{
88-
$this->unsetInvitedFlag()->save();
65+
$this->setAttribute('invited_at', null);
66+
$this->save();
8967

9068
$this->fireModelEvent('uninvited', false);
9169
}

src/Traits/Classic/HasInvitedFlagHelpers.php

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,6 @@ public function initializeHasInvitedFlagHelpers(): void
2020
$this->casts['is_invited'] = 'boolean';
2121
}
2222

23-
/**
24-
* Set invited flag.
25-
*
26-
* @return static
27-
*/
28-
public function setInvitedFlag()
29-
{
30-
$this->setAttribute('is_invited', true);
31-
32-
return $this;
33-
}
34-
35-
/**
36-
* Unset invited flag.
37-
*
38-
* @return static
39-
*/
40-
public function unsetInvitedFlag()
41-
{
42-
$this->setAttribute('is_invited', false);
43-
44-
return $this;
45-
}
46-
4723
/**
4824
* If entity is invited.
4925
*
@@ -71,7 +47,8 @@ public function isUninvited(): bool
7147
*/
7248
public function invite(): void
7349
{
74-
$this->setInvitedFlag()->save();
50+
$this->setAttribute('is_invited', true);
51+
$this->save();
7552

7653
$this->fireModelEvent('invited', false);
7754
}
@@ -83,7 +60,8 @@ public function invite(): void
8360
*/
8461
public function uninvite(): void
8562
{
86-
$this->unsetInvitedFlag()->save();
63+
$this->setAttribute('is_invited', false);
64+
$this->save();
8765

8866
$this->fireModelEvent('uninvited', false);
8967
}

0 commit comments

Comments
 (0)