Remove null checks and allow it to be queried (#608)

src/Database/Scope/Scope.php

@@ -109,7 +109,7 @@ public function applyToModel(Model $model)
      */
     public function applyToModelQuery($query, $table = null)
     {
-        if (is_null($this->scope) || $this->onlyScopeRelations) {
+        if ($this->onlyScopeRelations) {
             return $query;
         }
 
@@ -129,10 +129,6 @@ public function applyToModelQuery($query, $table = null)
      */
     public function applyToRelationQuery($query, $table)
     {
-        if (is_null($this->scope)) {
-            return $query;
-        }
-
         return $this->applyToQuery($query, $table);
     }
 
@@ -166,8 +162,11 @@ public function applyToRelation(BelongsToMany $relation)
     protected function applyToQuery($query, $table)
     {
         return $query->where(function ($query) use ($table) {
-            $query->where("{$table}.scope", $this->scope)
-                  ->orWhereNull("{$table}.scope");
+            $query->whereNull("{$table}.scope");
+
+            if (! is_null($this->scope)) {
+                $query->orWhere("{$table}.scope", $this->scope);
+            }
         });
     }
 

tests/MultiTenancyTest.php

@@ -136,6 +136,26 @@ function syncing_abilities_is_properly_scoped($provider)
         $this->assertEquals(1, $user->abilities()->count());
     }
 
+    /**
+     * @test
+     * @dataProvider bouncerProvider
+     */
+    function scoped_abilities_do_not_work_when_unscoped($provider)
+    {
+        list($bouncer, $user) = $provider();
+
+        $bouncer->scope()->to(1);
+        $bouncer->allow($user)->to(['write', 'read']);
+
+        $this->assertTrue($bouncer->can('write'));
+        $this->assertTrue($bouncer->can('read'));
+        $this->assertEquals(2, $user->abilities()->count());
+
+        $bouncer->scope()->to(null);
+        $this->assertFalse($bouncer->can('write'));
+        $this->assertFalse($bouncer->can('read'));
+    }
+
     /**
      * @test
      * @dataProvider bouncerProvider
@@ -326,6 +346,9 @@ function assigning_and_retracting_roles_scopes_them_properly($provider)
 
         $bouncer->scope()->to(2);
         $this->assertFalse($bouncer->is($user)->an('admin'));
+
+        $bouncer->scope()->to(null);
+        $this->assertFalse($bouncer->is($user)->an('admin'));
     }
 
     /**