Skip to content
This repository was archived by the owner on Jul 6, 2019. It is now read-only.

Removed afterResolving closure. #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed afterResolving closure. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 19 additions & 22 deletions src/BehavioursServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,29 +78,26 @@ protected function mergeConfig()
*/
protected function registerRepositories(Repository $config)
{
$this->app->afterResolving('registry', function (ManagerRegistry $registry, Container $container) use ($config) {
foreach ($config->get('doctrine_repositories.repositories', []) as $details) {
if (!isset($details['repository']) && !isset($details['entity'])) {
throw new \InvalidArgumentException(
sprintf('Failed to process repository data: missing repository/entity from definition')
);
}

$this->app->singleton($details['repository'], function ($app) use ($details, $registry) {
$class = $details['repository'];
$em = isset($details['em']) ? $registry->getManager($details['em']) : $registry->getManager();

return new $class($em, $em->getClassMetaData($details['entity']));
});

if (isset($details['alias'])) {
$this->app->alias($details['repository'], $details['alias']);
}
if (isset($details['tags'])) {
$this->app->tag($details['repository'], $details['tags']);
}
foreach ($config->get('doctrine_repositories.repositories', []) as $details) {
if (!isset($details['repository']) && !isset($details['entity'])) {
throw new \InvalidArgumentException(
sprintf('Failed to process repository data: missing repository/entity from definition')
);
}
});
$this->app->bind($details['repository'], function ($app) use ($details) {
$class = $details['repository'];
$em = $app['em'];
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes will prevent multiple entity manager definitions being bound as $app['em'] is the default. That is why afterResolving was used so that the DoctrineRegistry was available to be able to bind the correct repository. I have a feeling that more changes will be necessary to support >5.5.


return new $class($em, $em->getClassMetaData($details['entity']));
});

if (isset($details['alias'])) {
$this->app->alias($details['repository'], $details['alias']);
}
if (isset($details['tags'])) {
$this->app->tag($details['repository'], $details['tags']);
}
}
}

/**
Expand Down