diff --git a/src/AclServiceProvider.php b/src/AclServiceProvider.php index 2db5088..19329d6 100644 --- a/src/AclServiceProvider.php +++ b/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) ); }); } diff --git a/src/RegisterMappedEventSubscribers.php b/src/RegisterMappedEventSubscribers.php index a91e8ec..5c76dc2 100644 --- a/src/RegisterMappedEventSubscribers.php +++ b/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') ) ); }