Remove the getClipboardInstance() methods (#505)

src/Database/Concerns/Authorizable.php

@@ -16,7 +16,9 @@ trait Authorizable
      */
     public function can($ability, $model = null)
     {
-        return $this->getClipboardInstance()->check($this, $ability, $model);
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->check($this, $ability, $model);
     }
 
     /**
@@ -42,16 +44,4 @@ public function cannot($ability, $model = null)
     {
         return $this->cant($ability, $model);
     }
-
-    /**
-     * Get an instance of the bouncer's clipboard.
-     *
-     * @return \Silber\Bouncer\Contracts\Clipboard
-     */
-    protected function getClipboardInstance()
-    {
-        $container = Container::getInstance() ?: new Container;
-
-        return $container->make(Clipboard::class);
-    }
 }

src/Database/Concerns/HasAbilities.php

@@ -49,7 +49,9 @@ public function abilities()
      */
     public function getAbilities()
     {
-        return $this->getClipboardInstance()->getAbilities($this);
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->getAbilities($this);
     }
 
     /**
@@ -59,7 +61,9 @@ public function getAbilities()
      */
     public function getForbiddenAbilities()
     {
-        return $this->getClipboardInstance()->getAbilities($this, false);
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->getAbilities($this, false);
     }
 
     /**
@@ -133,16 +137,4 @@ public function unforbid($ability = null, $model = null)
 
         return $this;
     }
-
-    /**
-     * Get an instance of the bouncer's clipboard.
-     *
-     * @return \Silber\Bouncer\Contracts\Clipboard
-     */
-    protected function getClipboardInstance()
-    {
-        $container = Container::getInstance() ?: new Container;
-
-        return $container->make(Clipboard::class);
-    }
 }

src/Database/Concerns/HasRoles.php

@@ -48,7 +48,9 @@ public function roles()
      */
     public function getRoles()
     {
-        return $this->getClipboardInstance()->getRoles($this);
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->getRoles($this);
     }
 
     /**
@@ -87,9 +89,9 @@ public function isAn($role)
     {
         $roles = func_get_args();
 
-        $clipboard = $this->getClipboardInstance();
-
-        return $clipboard->checkRole($this, $roles, 'or');
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->checkRole($this, $roles, 'or');
     }
 
     /**
@@ -115,9 +117,9 @@ public function isNotAn($role)
     {
         $roles = func_get_args();
 
-        $clipboard = $this->getClipboardInstance();
-
-        return $clipboard->checkRole($this, $roles, 'not');
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->checkRole($this, $roles, 'not');
     }
 
     /**
@@ -143,9 +145,9 @@ public function isAll($role)
     {
         $roles = func_get_args();
 
-        $clipboard = $this->getClipboardInstance();
-
-        return $clipboard->checkRole($this, $roles, 'and');
+        return Container::getInstance()
+            ->make(Clipboard::class)
+            ->checkRole($this, $roles, 'and');
     }
 
     /**
@@ -192,16 +194,4 @@ public function scopeWhereIsNot($query, $role)
             func_get_args()
         );
     }
-
-    /**
-     * Get an instance of the bouncer's clipboard.
-     *
-     * @return \Silber\Bouncer\Contracts\Clipboard
-     */
-    protected function getClipboardInstance()
-    {
-        $container = Container::getInstance() ?: new Container;
-
-        return $container->make(Clipboard::class);
-    }
 }

src/Database/Concerns/IsRole.php

@@ -16,9 +16,7 @@
 
 trait IsRole
 {
-    use HasAbilities, Authorizable {
-        HasAbilities::getClipboardInstance insteadof Authorizable;
-    }
+    use HasAbilities, Authorizable;
 
     /**
      * Boot the is role trait.

src/Database/HasRolesAndAbilities.php

@@ -7,7 +7,5 @@
 
 trait HasRolesAndAbilities
 {
-    use HasRoles, HasAbilities {
-        HasRoles::getClipboardInstance insteadof HasAbilities;
-    }
+    use HasRoles, HasAbilities;
 }

tests/BaseTestCase.php

@@ -202,9 +202,7 @@ protected function dispatcher()
 
 class User extends Eloquent
 {
-    use Authorizable, HasRolesAndAbilities {
-        Authorizable::getClipboardInstance insteadof HasRolesAndAbilities;
-    }
+    use Authorizable, HasRolesAndAbilities;
 
     protected $table = 'users';