Remove global scopes auto apply (#56)

Remove auto-apply global scopes by default

Author: antonkomarev

CHANGELOG.md

@@ -7,7 +7,11 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
 ### Added
 
 - Laravel 5.8 support
-- Flag fields auto-casting
+- ([#48](https://github.com/cybercog/laravel-eloquent-flag/pull/48)) Flag fields auto-casting
+- Added `shouldApplyAcceptedAtScope` & `shouldApplyAcceptedFlagScope` methods to control Accepted flags global scope auto apply.
+- Added `shouldApplyActiveFlagScope` methods to control Active flag global scope auto apply.
+- Added `shouldApplyApprovedAtScope` & `shouldApplyApprovedFlagScope` methods to control Approved flags global scope auto apply.
+- Added `shouldApplyClosedAtScope` & `shouldApplyClosedFlagScope` methods to control Closed flags global scope auto apply.
 
 ### Changed
 
@@ -87,7 +91,8 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
 
 - Dropped PHP 5.6, 7.0 support
 - Dropped Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7 support
-- Removed attribute mutator `set*` & `unset*` methods from all helper classes
+- ([#50](https://github.com/cybercog/laravel-eloquent-flag/pull/50)) Removed attribute mutator `set*` & `unset*` methods from all helper classes
+- ([#56](https://github.com/cybercog/laravel-eloquent-flag/pull/56)) Removed global scopes auto-apply
 
 ## [4.0.0] - 2018-09-09
 

src/Scopes/Classic/AcceptedAtScope.php

@@ -42,7 +42,9 @@ final class AcceptedAtScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->whereNotNull('accepted_at');
+        if (method_exists($model, 'shouldApplyAcceptedAtScope') && $model->shouldApplyAcceptedAtScope()) {
+            $builder->whereNotNull('accepted_at');
+        }
     }
 
     /**

src/Scopes/Classic/AcceptedFlagScope.php

@@ -41,7 +41,9 @@ final class AcceptedFlagScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->where('is_accepted', 1);
+        if (method_exists($model, 'shouldApplyAcceptedFlagScope') && $model->shouldApplyAcceptedFlagScope()) {
+            $builder->where('is_accepted', 1);
+        }
     }
 
     /**

src/Scopes/Classic/ActiveFlagScope.php

@@ -41,7 +41,9 @@ final class ActiveFlagScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->where('is_active', 1);
+        if (method_exists($model, 'shouldApplyActiveFlagScope') && $model->shouldApplyActiveFlagScope()) {
+            $builder->where('is_active', 1);
+        }
     }
 
     /**

src/Scopes/Classic/ApprovedAtScope.php

@@ -42,7 +42,9 @@ final class ApprovedAtScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->whereNotNull('approved_at');
+        if (method_exists($model, 'shouldApplyApprovedAtScope') && $model->shouldApplyApprovedAtScope()) {
+            $builder->whereNotNull('approved_at');
+        }
     }
 
     /**

src/Scopes/Classic/ApprovedFlagScope.php

@@ -41,7 +41,9 @@ final class ApprovedFlagScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->where('is_approved', 1);
+        if (method_exists($model, 'shouldApplyApprovedFlagScope') && $model->shouldApplyApprovedFlagScope()) {
+            $builder->where('is_approved', 1);
+        }
     }
 
     /**

src/Scopes/Classic/InvitedAtScope.php

@@ -42,11 +42,9 @@ final class InvitedAtScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (method_exists($model, 'shouldApplyInvitedAtScope') && !$model->shouldApplyInvitedAtScope()) {
-            return;
+        if (method_exists($model, 'shouldApplyInvitedAtScope') && $model->shouldApplyInvitedAtScope()) {
+            $builder->whereNotNull('invited_at');
         }
-
-        $builder->whereNotNull('invited_at');
     }
 
     /**

src/Scopes/Classic/InvitedFlagScope.php

@@ -41,11 +41,9 @@ final class InvitedFlagScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (method_exists($model, 'shouldApplyInvitedFlagScope') && !$model->shouldApplyInvitedFlagScope()) {
-            return;
+        if (method_exists($model, 'shouldApplyInvitedFlagScope') && $model->shouldApplyInvitedFlagScope()) {
+            $builder->where('is_invited', 1);
         }
-
-        $builder->where('is_invited', 1);
     }
 
     /**

src/Scopes/Classic/KeptFlagScope.php

@@ -41,7 +41,9 @@ final class KeptFlagScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $builder->where('is_kept', 1);
+        if (method_exists($model, 'shouldApplyKeptFlagScope') && $model->shouldApplyKeptFlagScope()) {
+            $builder->where('is_kept', 1);
+        }
     }
 
     /**

src/Scopes/Classic/PublishedAtScope.php

@@ -42,11 +42,9 @@ final class PublishedAtScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (method_exists($model, 'shouldApplyPublishedAtScope') && !$model->shouldApplyPublishedAtScope()) {
-            return;
+        if (method_exists($model, 'shouldApplyPublishedAtScope') && $model->shouldApplyPublishedAtScope()) {
+            $builder->whereNotNull('published_at');
         }
-
-        $builder->whereNotNull('published_at');
     }
 
     /**