diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php index a92b9ddc91..ea3dda739a 100644 --- a/lib/Alchemy/Phrasea/Controller/Lightbox.php +++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php @@ -103,8 +103,7 @@ class Lightbox implements ControllerProviderInterface return new Response(''); } - $basketElement = $app['EM'] - ->getRepository('Phraseanet:BasketElement') + $basketElement = $app['repo.basket-elements'] ->findUserElement($sselcont_id, $app['authentication']->getUser()); $parameters = [ diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index fc98c6b2df..5cd57b1e6c 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -305,8 +305,7 @@ class Login implements ControllerProviderInterface return $app->redirectPath('login_register'); } - $userAuthProvider = $app['EM'] - ->getRepository('Phraseanet:UsrAuthProvider') + $userAuthProvider = $app['repo.usr-auth-providers'] ->findWithProviderAndId($token->getProvider()->getId(), $token->getId()); if (null !== $userAuthProvider) { @@ -827,8 +826,7 @@ class Login implements ControllerProviderInterface { $date = new \DateTime('+' . (int) $app['conf']->get(['registry', 'actions', 'validation-reminder-days']) . ' days'); - foreach ($app['EM'] - ->getRepository('Phraseanet:ValidationParticipant') + foreach ($app['repo.validation-participants'] ->findNotConfirmedAndNotRemindedParticipantsByExpireDate($date) as $participant) { /* @var $participant ValidationParticipant */ @@ -900,8 +898,7 @@ class Login implements ControllerProviderInterface return $app->redirectPath('homepage'); } - $userAuthProvider = $app['EM'] - ->getRepository('Phraseanet:UsrAuthProvider') + $userAuthProvider = $app['repo.usr-auth-providers'] ->findWithProviderAndId($token->getProvider()->getId(), $token->getId()); if (null !== $userAuthProvider) { diff --git a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php index 8e92467ef0..78efa7ee71 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php @@ -199,6 +199,9 @@ class ORMServiceProvider implements ServiceProviderInterface $app['repo.basket-elements'] = $app->share(function (PhraseaApplication $app) { return $app['EM']->getRepository('Phraseanet:BasketElement'); }); + $app['repo.validation-participants'] = $app->share(function (PhraseaApplication $app) { + return $app['EM']->getRepository('Phraseanet:ValidationParticipant'); + }); $app['repo.story-wz'] = $app->share(function (PhraseaApplication $app) { return $app['EM']->getRepository('Phraseanet:StoryWZ'); }); @@ -235,6 +238,15 @@ class ORMServiceProvider implements ServiceProviderInterface $app['repo.lazaret-files'] = $app->share(function (PhraseaApplication $app) { return $app['EM']->getRepository('Phraseanet:LazaretFile'); }); + $app['repo.usr-auth-providers'] = $app->share(function (PhraseaApplication $app) { + return $app['EM']->getRepository('Phraseanet:UsrAuthProvider'); + }); + $app['repo.ftp-exports'] = $app->share(function (PhraseaApplication $app) { + return $app['EM']->getRepository('Phraseanet:FtpExport'); + }); + $app['repo.user-queries'] = $app->share(function (PhraseaApplication $app) { + return $app['EM']->getRepository('Phraseanet:UserQuery'); + }); } public function boot(Application $app) diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php index 8735605029..6876c478da 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php +++ b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php @@ -73,8 +73,7 @@ class FtpJob extends AbstractJob private function removeDeadExports(Application $app) { - foreach ($app['EM'] - ->getRepository('Phraseanet:FtpExport') + foreach ($app['repo.ftp-exports'] ->findCrashedExports(new \DateTime('-1 month')) as $export) { $app['EM']->remove($export); } @@ -83,8 +82,7 @@ class FtpJob extends AbstractJob private function retrieveExports(Application $app) { - return $app['EM'] - ->getRepository('Phraseanet:FtpExport') + return $app['repo.ftp-exports'] ->findDoableExports(); } diff --git a/lib/classes/eventsmanager/notify/validate.php b/lib/classes/eventsmanager/notify/validate.php index 2b1c072a3d..1dc5d08b31 100644 --- a/lib/classes/eventsmanager/notify/validate.php +++ b/lib/classes/eventsmanager/notify/validate.php @@ -96,8 +96,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract $user_from = $this->app['repo.users']->find($params['from']); $user_to = $this->app['repo.users']->find($params['to']); - $basket = $this->app['EM'] - ->getRepository('Phraseanet:Basket') + $basket = $this->app['repo.baskets'] ->find($params['ssel_id']); $title = $basket->getName(); diff --git a/lib/classes/eventsmanager/notify/validationdone.php b/lib/classes/eventsmanager/notify/validationdone.php index 72cecf8a18..6f8a3906fe 100644 --- a/lib/classes/eventsmanager/notify/validationdone.php +++ b/lib/classes/eventsmanager/notify/validationdone.php @@ -91,8 +91,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract $user_from = $this->app['repo.users']->find($params['from']); $user_to = $this->app['repo.users']->find($params['to']); - $basket = $this->app['EM'] - ->getRepository('Phraseanet:Basket') + $basket = $this->app['repo.baskets'] ->find($params['ssel_id']); $title = $basket->getName(); diff --git a/lib/classes/eventsmanager/notify/validationreminder.php b/lib/classes/eventsmanager/notify/validationreminder.php index 100fc04f42..514b9b5868 100644 --- a/lib/classes/eventsmanager/notify/validationreminder.php +++ b/lib/classes/eventsmanager/notify/validationreminder.php @@ -97,8 +97,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra $readyToSend = false; try { - $basket = $this->app['EM'] - ->getRepository('Phraseanet:Basket') + $basket = $this->app['repo.baskets'] ->find($params['ssel_id']); $title = $basket->getName(); diff --git a/lib/classes/queries.php b/lib/classes/queries.php index fed56676f8..5927b1ddd2 100644 --- a/lib/classes/queries.php +++ b/lib/classes/queries.php @@ -188,9 +188,7 @@ class queries { $history = '