Merge pull request #104 from artesaos/hotfix/bind-interfaces-to-config-models

Permission and Role interfaces are binded now to the config implementations

Author: mauri870

src/Defender/Providers/DefenderServiceProvider.php

@@ -77,23 +77,23 @@ public function provides()
      */
     protected function registerRepositoryInterfaces()
     {
-        $this->app->bind('Artesaos\Defender\Contracts\Permission', 'Artesaos\Defender\Permission');
-        $this->app->bind('Artesaos\Defender\Contracts\Role', 'Artesaos\Defender\Role');
+        $this->app->bind('Artesaos\Defender\Contracts\Permission', function ($app) {
+            return $app->make($this->app['config']->get('defender.permission_model'));
+        });
+        $this->app->bind('Artesaos\Defender\Contracts\Role', function ($app) {
+            return $app->make($this->app['config']->get('defender.role_model'));
+        });
 
         $this->app->singleton('defender.role', function ($app) {
-            $roleModel = $app['config']->get('defender.role_model');
-
-            return new EloquentRoleRepository($app, $app->make($roleModel));
+            return new EloquentRoleRepository($app, $app->make(\Artesaos\Defender\Contracts\Role::class));
         });
 
         $this->app->singleton('Artesaos\Defender\Contracts\Repositories\RoleRepository', function ($app) {
             return $app['defender.role'];
         });
 
         $this->app->singleton('defender.permission', function ($app) {
-            $permissionModel = $app['config']->get('defender.permission_model');
-
-            return new EloquentPermissionRepository($app, $app->make($permissionModel));
+            return new EloquentPermissionRepository($app, $app->make(\Artesaos\Defender\Contracts\Permission::class));
         });
 
         $this->app->singleton('Artesaos\Defender\Contracts\Repositories\PermissionRepository', function ($app) {

tests/Defender/AbstractTestCase.php

@@ -135,6 +135,8 @@ protected function getEnvironmentSetUp($app)
         ]);
 
         $app['config']->set('defender.user_model', 'Artesaos\Defender\Testing\User');
+        $app['config']->set('defender.role_model', 'Artesaos\Defender\Role');
+        $app['config']->set('defender.permission_model', 'Artesaos\Defender\Permission');
         $app['config']->set('auth.model', $app['config']->get('defender.user_model'));
     }
 

tests/Defender/DefenderServiceProviderTest.php

@@ -26,6 +26,13 @@ class DefenderServiceProviderTest extends AbstractTestCase
         'testShouldNotLoadHelpers',
     ];
 
+    public function testModelBindings()
+    {
+        $this->assertInstanceOf('Artesaos\Defender\Role', $this->app->make('Artesaos\Defender\Contracts\Role'));
+
+        $this->assertInstanceOf('Artesaos\Defender\Permission', $this->app->make('Artesaos\Defender\Contracts\Permission'));
+    }
+
     /**
      * Verify if all services are in service container.
      */
@@ -143,8 +150,6 @@ public function testShouldNotLoadHelpers()
      */
     public function testShouldPublishConfigAndMigrations()
     {
-        //dd(config_path());
-
         $this->artisan('vendor:publish');
 
         $resourcesPath = __DIR__.'/../../src/resources';