Rename scope methods (#54)

Rename global scopes methods

Author: antonkomarev

CHANGELOG.md

@@ -13,30 +13,63 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
 
 - All methods are strict typed now
 - `Carbon\Carbon` replaced with `Illuminate\Support\Facades\Date`
-- `isRejected` method renamed to `isNotAccepted`
-- `isDeactivated` method renamed to `isNotActivated`
-- `isDisapproved` method renamed to `isNotApproved`
-- `isUninvited` method renamed to `isNotInvited`
-- `isUnkept` method renamed to `isNotKept`
-- `isUnpublished` method renamed to `isNotPublished`
-- `isUnverified` method renamed to `isNotVerified`
-- `isUnarchived` method renamed to `isNotArchived`
-- `isOpened` method renamed to `isNotClosed`
-- `isUndrafted` method renamed to `isNotDrafted`
-- `isUnended` method renamed to `isNotEnded`
-- `isUnexpired` method renamed to `isNotExpired`
-- `reject` method renamed to `undoAccept`
-- `deactivate` method renamed to `undoActivate`
-- `disapprove` method renamed to `undoApprove`
-- `uninvite` method renamed to `undoInvite`
-- `unkeep` method renamed to `undoKeep`
-- `unpublish` method renamed to `undoPublish`
-- `unverify` method renamed to `undoVerify`
-- `unarchive` method renamed to `undoArchive`
-- `open` method renamed to `undoClose`
-- `undraft` method renamed to `undoDraft`
-- `unend` method renamed to `undoEnd`
-- `unexpire` method renamed to `undoExpire`
+- `isRejected` instance method renamed to `isNotAccepted`
+- `isDeactivated` instance method renamed to `isNotActivated`
+- `isDisapproved` instance method renamed to `isNotApproved`
+- `isUninvited` instance method renamed to `isNotInvited`
+- `isUnkept` instance method renamed to `isNotKept`
+- `isUnpublished` instance method renamed to `isNotPublished`
+- `isUnverified` instance method renamed to `isNotVerified`
+- `isUnarchived` instance method renamed to `isNotArchived`
+- `isOpened` instance method renamed to `isNotClosed`
+- `isUndrafted` instance method renamed to `isNotDrafted`
+- `isUnended` instance method renamed to `isNotEnded`
+- `isUnexpired` instance method renamed to `isNotExpired`
+- `reject` instance method renamed to `undoAccept`
+- `deactivate` instance method renamed to `undoActivate`
+- `disapprove` instance method renamed to `undoApprove`
+- `uninvite` instance method renamed to `undoInvite`
+- `unkeep` instance method renamed to `undoKeep`
+- `unpublish` instance method renamed to `undoPublish`
+- `unverify` instance method renamed to `undoVerify`
+- `unarchive` instance method renamed to `undoArchive`
+- `open` instance method renamed to `undoClose`
+- `undraft` instance method renamed to `undoDraft`
+- `unend` instance method renamed to `undoEnd`
+- `unexpire` instance method renamed to `undoExpire`
+- `reject` global scope method renamed to `undoAccept`
+- `withRejected` global scope method renamed to `withNotAccepted`
+- `withoutRejected` global scope method renamed to `withoutNotAccepted`
+- `onlyRejected` global scope method renamed to `onlyNotAccepted`
+- `deactivate` global scope method renamed to `undoActivate`
+- `withDeactivated` global scope method renamed to `withNotActivated`
+- `withoutDeactivated` global scope method renamed to `withoutNotActivated`
+- `onlyDeactivated` global scope method renamed to `onlyNotActivated`
+- `disapprove` global scope method renamed to `undoApprove`
+- `withDisapproved` global scope method renamed to `withNotApproved`
+- `withoutDisapproved` global scope method renamed to `withoutNotApproved`
+- `onlyDisapproved` global scope method renamed to `onlyNotApproved`
+- `uninvite` global scope method renamed to `undoInvite`
+- `withUninvited` global scope method renamed to `withNotInvited`
+- `withoutUninvited` global scope method renamed to `withoutNotInvited`
+- `onlyUninvited` global scope method renamed to `onlyNotInvited`
+- `unkeep` global scope method renamed to `undoKeep`
+- `withUnkept` global scope method renamed to `withNotKept`
+- `withoutUnkept` global scope method renamed to `withoutNotKept`
+- `onlyUnkept` global scope method renamed to `onlyNotKept`
+- `unpublish` global scope method renamed to `undoPublish`
+- `withUnpublished` global scope method renamed to `withNotPublished`
+- `withoutUnpublished` global scope method renamed to `withoutNotPublished`
+- `onlyUnpublished` global scope method renamed to `onlyNotPublished`
+- `unverify` global scope method renamed to `undoVerify`
+- `withUnverified` global scope method renamed to `withNotVerified`
+- `withoutUnverified` global scope method renamed to `withoutNotVerified`
+- `onlyUnverified` global scope method renamed to `onlyNotVerified`
+- `unarchive` global scope method renamed to `undoArchive`
+- `open` global scope method renamed to `undoClose`
+- `undraft` global scope method renamed to `undoDraft`
+- `unend` global scope method renamed to `undoEnd`
+- `unexpire` global scope method renamed to `undoExpire`
 
 ### Removed
 

src/Scopes/Classic/AcceptedAtScope.php

@@ -27,10 +27,10 @@ final class AcceptedAtScope implements Scope
      */
     protected $extensions = [
         'Accept',
-        'Reject',
-        'WithRejected',
-        'WithoutRejected',
-        'OnlyRejected',
+        'UndoAccept',
+        'WithNotAccepted',
+        'WithoutNotAccepted',
+        'OnlyNotAccepted',
     ];
 
     /**
@@ -67,60 +67,60 @@ public function extend(Builder $builder): void
     protected function addAccept(Builder $builder): void
     {
         $builder->macro('accept', function (Builder $builder) {
-            $builder->withRejected();
+            $builder->withNotAccepted();
 
             return $builder->update(['accepted_at' => Date::now()]);
         });
     }
 
     /**
-     * Add the `reject` extension to the builder.
+     * Add the `undoAccept` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addReject(Builder $builder): void
+    protected function addUndoAccept(Builder $builder): void
     {
-        $builder->macro('reject', function (Builder $builder) {
+        $builder->macro('undoAccept', function (Builder $builder) {
             return $builder->update(['accepted_at' => null]);
         });
     }
 
     /**
-     * Add the `withRejected` extension to the builder.
+     * Add the `withNotAccepted` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithRejected(Builder $builder): void
+    protected function addWithNotAccepted(Builder $builder): void
     {
-        $builder->macro('withRejected', function (Builder $builder) {
+        $builder->macro('withNotAccepted', function (Builder $builder) {
             return $builder->withoutGlobalScope($this);
         });
     }
 
     /**
-     * Add the `withoutRejected` extension to the builder.
+     * Add the `withoutNotAccepted` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithoutRejected(Builder $builder): void
+    protected function addWithoutNotAccepted(Builder $builder): void
     {
-        $builder->macro('withoutRejected', function (Builder $builder) {
+        $builder->macro('withoutNotAccepted', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->whereNotNull('accepted_at');
         });
     }
 
     /**
-     * Add the `onlyRejected` extension to the builder.
+     * Add the `onlyNotAccepted` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addOnlyRejected(Builder $builder): void
+    protected function addOnlyNotAccepted(Builder $builder): void
     {
-        $builder->macro('onlyRejected', function (Builder $builder) {
+        $builder->macro('onlyNotAccepted', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->whereNull('accepted_at');
         });
     }

src/Scopes/Classic/AcceptedFlagScope.php

@@ -26,10 +26,10 @@ final class AcceptedFlagScope implements Scope
      */
     protected $extensions = [
         'Accept',
-        'Reject',
-        'WithRejected',
-        'WithoutRejected',
-        'OnlyRejected',
+        'UndoAccept',
+        'WithNotAccepted',
+        'WithoutNotAccepted',
+        'OnlyNotAccepted',
     ];
 
     /**
@@ -66,60 +66,60 @@ public function extend(Builder $builder): void
     protected function addAccept(Builder $builder): void
     {
         $builder->macro('accept', function (Builder $builder) {
-            $builder->withRejected();
+            $builder->withNotAccepted();
 
             return $builder->update(['is_accepted' => 1]);
         });
     }
 
     /**
-     * Add the `reject` extension to the builder.
+     * Add the `undoAccept` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addReject(Builder $builder): void
+    protected function addUndoAccept(Builder $builder): void
     {
-        $builder->macro('reject', function (Builder $builder) {
+        $builder->macro('undoAccept', function (Builder $builder) {
             return $builder->update(['is_accepted' => 0]);
         });
     }
 
     /**
-     * Add the `withRejected` extension to the builder.
+     * Add the `withNotAccepted` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithRejected(Builder $builder): void
+    protected function addWithNotAccepted(Builder $builder): void
     {
-        $builder->macro('withRejected', function (Builder $builder) {
+        $builder->macro('withNotAccepted', function (Builder $builder) {
             return $builder->withoutGlobalScope($this);
         });
     }
 
     /**
-     * Add the `withoutRejected` extension to the builder.
+     * Add the `withoutNotAccepted` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithoutRejected(Builder $builder): void
+    protected function addWithoutNotAccepted(Builder $builder): void
     {
-        $builder->macro('withoutRejected', function (Builder $builder) {
+        $builder->macro('withoutNotAccepted', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_accepted', 1);
         });
     }
 
     /**
-     * Add the `onlyRejected` extension to the builder.
+     * Add the `onlyNotAccepted` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addOnlyRejected(Builder $builder): void
+    protected function addOnlyNotAccepted(Builder $builder): void
     {
-        $builder->macro('onlyRejected', function (Builder $builder) {
+        $builder->macro('onlyNotAccepted', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_accepted', 0);
         });
     }

src/Scopes/Classic/ActiveFlagScope.php

@@ -26,10 +26,10 @@ final class ActiveFlagScope implements Scope
      */
     protected $extensions = [
         'Activate',
-        'Deactivate',
-        'WithDeactivated',
-        'WithoutDeactivated',
-        'OnlyDeactivated',
+        'UndoActivate',
+        'WithNotActivated',
+        'WithoutNotActivated',
+        'OnlyNotActivated',
     ];
 
     /**
@@ -66,60 +66,60 @@ public function extend(Builder $builder): void
     protected function addActivate(Builder $builder): void
     {
         $builder->macro('activate', function (Builder $builder) {
-            $builder->withDeactivated();
+            $builder->withNotActivated();
 
             return $builder->update(['is_active' => 1]);
         });
     }
 
     /**
-     * Add the `deactivate` extension to the builder.
+     * Add the `undoActivate` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addDeactivate(Builder $builder): void
+    protected function addUndoActivate(Builder $builder): void
     {
-        $builder->macro('deactivate', function (Builder $builder) {
+        $builder->macro('undoActivate', function (Builder $builder) {
             return $builder->update(['is_active' => 0]);
         });
     }
 
     /**
-     * Add the `withDeactivated` extension to the builder.
+     * Add the `withNotActivated` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithDeactivated(Builder $builder): void
+    protected function addWithNotActivated(Builder $builder): void
     {
-        $builder->macro('withDeactivated', function (Builder $builder) {
+        $builder->macro('withNotActivated', function (Builder $builder) {
             return $builder->withoutGlobalScope($this);
         });
     }
 
     /**
-     * Add the `withoutDeactivated` extension to the builder.
+     * Add the `withoutNotActivated` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addWithoutDeactivated(Builder $builder): void
+    protected function addWithoutNotActivated(Builder $builder): void
     {
-        $builder->macro('withoutDeactivated', function (Builder $builder) {
+        $builder->macro('withoutNotActivated', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_active', 1);
         });
     }
 
     /**
-     * Add the `onlyDeactivated` extension to the builder.
+     * Add the `onlyNotActivated` extension to the builder.
      *
      * @param \Illuminate\Database\Eloquent\Builder $builder
      * @return void
      */
-    protected function addOnlyDeactivated(Builder $builder): void
+    protected function addOnlyNotActivated(Builder $builder): void
     {
-        $builder->macro('onlyDeactivated', function (Builder $builder) {
+        $builder->macro('onlyNotActivated', function (Builder $builder) {
             return $builder->withoutGlobalScope($this)->where('is_active', 0);
         });
     }