Merge pull request #42 from mxkh/1.0

Fixes #25

Author: eigan

src/AclServiceProvider.php

@@ -25,8 +25,8 @@ public function boot()
 
         $this->app->make(DoctrineManager::class)->onResolve(function () {
             $this->definePermissions(
-                $this->app->make(Gate::class),
-                $this->app->make(PermissionManager::class)
+                app(Gate::class),
+                app(PermissionManager::class)
             );
         });
     }

src/RegisterMappedEventSubscribers.php

@@ -5,7 +5,6 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
-use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\ACL\Mappings\Subscribers\BelongsToOrganisationsSubscriber;
 use LaravelDoctrine\ACL\Mappings\Subscribers\BelongsToOrganisationSubscriber;
 use LaravelDoctrine\ACL\Mappings\Subscribers\HasPermissionsSubscriber;
@@ -24,19 +23,6 @@ class RegisterMappedEventSubscribers implements DoctrineExtender
         HasPermissionsSubscriber::class,
     ];
 
-    /**
-     * @var Container
-     */
-    protected $container;
-
-    /**
-     * @param Container $container
-     */
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
-    }
-
     /**
      * @param Configuration $configuration
      * @param Connection    $connection
@@ -48,7 +34,7 @@ public function extend(Configuration $configuration, Connection $connection, Eve
             $eventManager->addEventSubscriber(
                 new $subscriber(
                     $configuration->getMetadataDriverImpl()->getReader(),
-                    $this->container['config']
+                    app('config')
                 )
             );
         }