Skip to content

Fixes laravel-doctrine/acl#25 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eigan merged 2 commits into from
Oct 3, 2019
Merged

Fixes laravel-doctrine/acl#25 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ea8b0f
Fixes https://github.com/laravel-doctrine/acl/issues/25 Target [Illum…
mxkh Dec 11, 2018
84e217f
Fixes PHPUnitTest Illuminate\Contracts\Container\BindingResolutionExc…
mxkh Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/AclServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
});
}
Expand Down
16 changes: 1 addition & 15 deletions src/RegisterMappedEventSubscribers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -48,7 +34,7 @@ public function extend(Configuration $configuration, Connection $connection, Eve
$eventManager->addEventSubscriber(
new $subscriber(
$configuration->getMetadataDriverImpl()->getReader(),
$this->container['config']
app('config')
)
);
}
Expand Down