hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-02-19 12:08:11 +01:00
parent ffc0efdb57
commit 7fb44d2b43
37 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
View File

@@ -194,7 +194,7 @@ class Publications implements ControllerProviderInterface
try { try {
$request = $app['request']; $request = $app['request'];
$user = $app['manipulator.user']->getRepository()->find($request->request->get('usr_id')); $user = $app['manipulator.user']->getRepository()->find($request->request->get('usr_id'));
$feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id); $feed = $app["EM"]->find('Phraseanet:Feed', $id);
$publisher = new FeedPublisher(); $publisher = new FeedPublisher();
$publisher->setUser($user); $publisher->setUser($user);

2
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
View File

@@ -49,7 +49,7 @@ class Feed implements ControllerProviderInterface
$app->abort(404, "Feed not found"); $app->abort(404, "Feed not found");
} }
$publisher = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedPublisher')->findOneBy(['feed' => $feed, 'user' => $app['authentication']->getUser()]); $publisher = $app['EM']->getRepository('Phraseanet:FeedPublisher')->findOneBy(['feed' => $feed, 'user' => $app['authentication']->getUser()]);
if ('' === $title = trim($request->request->get('title', ''))) { if ('' === $title = trim($request->request->get('title', ''))) {
$app->abort(400, "Bad request"); $app->abort(400, "Bad request");

2
lib/Alchemy/Phrasea/Controller/Prod/Order.php
View File

@@ -237,7 +237,7 @@ class Order implements ControllerProviderInterface
public function sendOrder(Application $app, Request $request, $order_id) public function sendOrder(Application $app, Request $request, $order_id)
{ {
$success = false; $success = false;
if (null === $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id)) { if (null === $order = $app['EM']->getRepository('Phraseanet:Order')->find($order_id)) {
throw new NotFoundHttpException('Order not found'); throw new NotFoundHttpException('Order not found');
} }
$basket = $order->getBasket(); $basket = $order->getBasket();

2
lib/Alchemy/Phrasea/Controller/Root/Account.php
View File

@@ -261,7 +261,7 @@ class Account implements ControllerProviderInterface
*/ */
public function accountSessionsAccess(Application $app, Request $request) public function accountSessionsAccess(Application $app, Request $request)
{ {
$dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s $dql = 'SELECT s FROM Phraseanet:Session s
WHERE s.user = :usr_id WHERE s.user = :usr_id
ORDER BY s.created DESC'; ORDER BY s.created DESC';

2
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
View File

@@ -62,7 +62,7 @@ class RSSFeeds implements ControllerProviderInterface
->assert('format', '(rss|atom)'); ->assert('format', '(rss|atom)');
$controllers->get('/userfeed/aggregated/{token}/{format}/', function (Application $app, $token, $format) { $controllers->get('/userfeed/aggregated/{token}/{format}/', function (Application $app, $token, $format) {
$token = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(["value" => $token]); $token = $app['EM']->getRepository('Phraseanet:AggregateToken')->findOneBy(["value" => $token]);
$user = $token->getUser(); $user = $token->getUser();

6
lib/Alchemy/Phrasea/Feed/Aggregate.php
View File

@@ -78,8 +78,8 @@ class Aggregate implements FeedInterface
*/ */
public static function createFromUser(Application $app, User $user) public static function createFromUser(Application $app, User $user)
{ {
$feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($user)); $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($user));
$token = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(['user' => $user]); $token = $app['EM']->getRepository('Phraseanet:AggregateToken')->findOneBy(['user' => $user]);
return new static($app['EM'], $feeds, $token); return new static($app['EM'], $feeds, $token);
} }
@@ -239,6 +239,6 @@ class Aggregate implements FeedInterface
*/ */
public static function getPublic(Application $app) public static function getPublic(Application $app)
{ {
return new static($app['EM'], $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(['public' => true], ['updatedOn' => 'DESC'])); return new static($app['EM'], $app['EM']->getRepository('Phraseanet:Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']));
} }
} }

2
lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
View File

@@ -131,7 +131,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
private function getAggregateToken(User $user, $renew = false) private function getAggregateToken(User $user, $renew = false)
{ {
$token = $this->em $token = $this->em
->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken') ->getRepository('Phraseanet:AggregateToken')
->findOneBy(['user' => $user]); ->findOneBy(['user' => $user]);
if (null === $token || true === $renew) { if (null === $token || true === $renew) {

2
lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
View File

@@ -139,7 +139,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
private function getFeedToken(Feed $feed, User $user, $renew = false) private function getFeedToken(Feed $feed, User $user, $renew = false)
{ {
$token = $this->em $token = $this->em
->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken') ->getRepository('Phraseanet:FeedToken')
->findOneBy(['user' => $user, 'feed' => $feed]); ->findOneBy(['user' => $user, 'feed' => $feed]);
if (null === $token || true === $renew) { if (null === $token || true === $renew) {

2
lib/Alchemy/Phrasea/Form/TaskForm.php
View File

@@ -49,7 +49,7 @@ class TaskForm extends AbstractType
public function setDefaultOptions(OptionsResolverInterface $resolver) public function setDefaultOptions(OptionsResolverInterface $resolver)
{ {
$resolver->setDefaults([ $resolver->setDefaults([
'data_class' => 'Alchemy\Phrasea\Model\Entities\Task', 'data_class' => 'Phraseanet:Task',
]); ]);
} }

8
lib/Alchemy/Phrasea/Model/Manager/UserManager.php
View File

@@ -137,7 +137,7 @@ class UserManager
*/ */
private function cleanFtpExports(User $user) private function cleanFtpExports(User $user)
{ {
$elements = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport') $elements = $this->objectManager->getRepository('Phraseanet:FtpExport')
->findBy(['user' => $user]); ->findBy(['user' => $user]);
foreach ($elements as $element) { foreach ($elements as $element) {
@@ -152,7 +152,7 @@ class UserManager
*/ */
private function cleanOrders(User $user) private function cleanOrders(User $user)
{ {
$orders = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Order') $orders = $this->objectManager->getRepository('Phraseanet:Order')
->findBy(['user' => $user]); ->findBy(['user' => $user]);
foreach ($orders as $order) { foreach ($orders as $order) {
@@ -167,7 +167,7 @@ class UserManager
*/ */
private function cleanUserSessions(User $user) private function cleanUserSessions(User $user)
{ {
$sessions = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Session') $sessions = $this->objectManager->getRepository('Phraseanet:Session')
->findByUser(['user' => $user]); ->findByUser(['user' => $user]);
foreach ($sessions as $session) { foreach ($sessions as $session) {
@@ -182,7 +182,7 @@ class UserManager
*/ */
private function cleanAuthProvider(User $user) private function cleanAuthProvider(User $user)
{ {
$providers = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider') $providers = $this->objectManager->getRepository('Phraseanet:UsrAuthProvider')
->findBy(['user' => $user]); ->findBy(['user' => $user]);
foreach ($providers as $provider) { foreach ($providers as $provider) {

2
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
View File

@@ -127,7 +127,7 @@ class BasketRepository extends EntityRepository
public function findUserBasket($basket_id, User $user, $requireOwner) public function findUserBasket($basket_id, User $user, $requireOwner)
{ {
$dql = 'SELECT b $dql = 'SELECT b
FROM Alchemy\Phrasea\Model\Entities\Basket b FROM Phraseanet:Basket b
LEFT JOIN b.elements e LEFT JOIN b.elements e
WHERE b.id = :basket_id'; WHERE b.id = :basket_id';

4
lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
View File

@@ -28,7 +28,7 @@ class StoryWZRepository extends EntityRepository
public function findByUser(Application $app, User $user, $sort) public function findByUser(Application $app, User $user, $sort)
{ {
$dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.user = :user '; $dql = 'SELECT s FROM Phraseanet:StoryWZ s WHERE s.user = :user ';
if ($sort == 'date') { if ($sort == 'date') {
$dql .= ' ORDER BY s.created DESC'; $dql .= ' ORDER BY s.created DESC';
@@ -117,7 +117,7 @@ class StoryWZRepository extends EntityRepository
public function findByRecord(Application $app, \record_adapter $Story) public function findByRecord(Application $app, \record_adapter $Story)
{ {
$dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s $dql = 'SELECT s FROM Phraseanet:StoryWZ s
WHERE s.sbas_id = :sbas_id WHERE s.sbas_id = :sbas_id
AND s.record_id = :record_id'; AND s.record_id = :record_id';

2
lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
View File

@@ -25,7 +25,7 @@ class UsrAuthProviderRepository extends EntityRepository
public function findByUser(User $user) public function findByUser(User $user)
{ {
$dql = 'SELECT u $dql = 'SELECT u
FROM Alchemy\Phrasea\Model\Entities\UsrAuthProvider u FROM Phraseanet:UsrAuthProvider u
WHERE u.user = :usrId'; WHERE u.user = :usrId';
$params = ['usrId' => $user->getId()]; $params = ['usrId' => $user->getId()];

2
lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
View File

@@ -36,7 +36,7 @@ class UsrListEntryRepository extends EntityRepository
*/ */
public function findUserList(User $user) public function findUserList(User $user)
{ {
$dql = 'SELECT e FROM Alchemy\Phrasea\Model\Entities\UsrListEntry e $dql = 'SELECT e FROM Phraseanet:UsrListEntry e
WHERE e.user = :usr_id'; WHERE e.user = :usr_id';
$params = [ $params = [

2
lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php
View File

@@ -42,7 +42,7 @@ class Upgrade39 implements PreSchemaUpgradeInterface
*/ */
public static function getUserReferences(EntityManager $em, $id) public static function getUserReferences(EntityManager $em, $id)
{ {
$q = $em->createQuery('SELECT PARTIAL u.{id,login} FROM Alchemy\Phrasea\Model\Entities\User u WHERE u.id = :id'); $q = $em->createQuery('SELECT PARTIAL u.{id,login} FROM Phraseanet:User u WHERE u.id = :id');
$q->setParameters(['id' => $id]); $q->setParameters(['id' => $id]);
$q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);

2
lib/classes/eventsmanager/notify/orderdeliver.php
View File

@@ -151,7 +151,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$sender = $user->getDisplayName(); $sender = $user->getDisplayName();
try { try {
$repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket'); $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
$basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false); $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
} catch (Exception $e) { } catch (Exception $e) {

2
lib/classes/eventsmanager/notify/validationdone.php
View File

@@ -138,7 +138,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
$sender = $registered_user->getDisplayName(); $sender = $registered_user->getDisplayName();
try { try {
$repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket'); $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
$basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false); $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
} catch (Exception $e) { } catch (Exception $e) {

2
lib/classes/patch/320alpha2a.php
View File

@@ -57,7 +57,7 @@ class patch_320alpha2a implements patchInterface
*/ */
public function apply(base $appbox, Application $app) public function apply(base $appbox, Application $app)
{ {
$dql = 'SELECT u FROM Alchemy\Phrasea\Model\Entities\User u WHERE u.nonce IS NULL'; $dql = 'SELECT u FROM Phraseanet:User u WHERE u.nonce IS NULL';
$q = $app['EM']->createQuery($dql); $q = $app['EM']->createQuery($dql);
$q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
$users = $q->getResult(); $users = $q->getResult();

2
lib/classes/patch/320alpha4b.php
View File

@@ -87,7 +87,7 @@ class patch_320alpha4b implements patchInterface
$app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener()); $app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
foreach ($rs as $row) { foreach ($rs as $row) {
$user = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $app['EM']->getPartialReference('Phraseanet:User', $row['usr_id']);
$feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app); $feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app);

2
lib/classes/patch/370alpha7a.php
View File

@@ -110,7 +110,7 @@ class patch_370alpha7a implements patchInterface
$borderFile = new \Alchemy\Phrasea\Border\File($app, $media, $collection); $borderFile = new \Alchemy\Phrasea\Border\File($app, $media, $collection);
$user = $user = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $user = $app['EM']->getPartialReference('Phraseanet:User', $row['usr_id']);
$lazaretSession = new LazaretSession(); $lazaretSession = new LazaretSession();
$lazaretSession->setUser($user); $lazaretSession->setUser($user);

2
lib/classes/patch/380alpha11a.php
View File

@@ -81,7 +81,7 @@ class patch_380alpha11a implements patchInterface
$updated = \DateTime::createFromFormat('Y-m-d H:i:s', $row['lastaccess']); $updated = \DateTime::createFromFormat('Y-m-d H:i:s', $row['lastaccess']);
} }
$user = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $app['EM']->getPartialReference('Phraseanet:User', $row['usr_id']);
$session = new Session(); $session = new Session();
$session $session

2
lib/classes/patch/383alpha2a.php
View File

@@ -64,7 +64,7 @@ class patch_383alpha2a implements patchInterface
$stmt->closeCursor(); $stmt->closeCursor();
foreach ($rows as $row) { foreach ($rows as $row) {
if (null !== $vsession = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\ValidationSession', $row['validation_session_id'])) { if (null !== $vsession = $app['EM']->getPartialReference('Phraseanet:ValidationSession', $row['validation_session_id'])) {
$app['EM']->remove($vsession); $app['EM']->remove($vsession);
} }
} }

2
lib/classes/patch/390alpha1a.php
View File

@@ -71,7 +71,7 @@ class patch_390alpha1a implements patchInterface
$em = $app['EM']; $em = $app['EM'];
foreach ($rs as $row) { foreach ($rs as $row) {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
$credential = new FtpCredential(); $credential = new FtpCredential();
$credential->setActive($row['activeFTP']); $credential->setActive($row['activeFTP']);
$credential->setAddress($row['addrFTP']); $credential->setAddress($row['addrFTP']);

6
lib/classes/patch/390alpha1b.php
View File

@@ -92,7 +92,7 @@ class patch_390alpha1b implements patchInterface
$todo = $stmt->fetch(\PDO::FETCH_ASSOC); $todo = $stmt->fetch(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
$order = new Order(); $order = new Order();
$order->setUser($user) $order->setUser($user)
@@ -100,7 +100,7 @@ class patch_390alpha1b implements patchInterface
->setOrderUsage($row['usage']) ->setOrderUsage($row['usage'])
->setDeadline(new \DateTime($row['deadline'])) ->setDeadline(new \DateTime($row['deadline']))
->setCreatedOn(new \DateTime($row['created_on'])) ->setCreatedOn(new \DateTime($row['created_on']))
->setBasket($em->getPartialReference('Alchemy\Phrasea\Model\Entities\Basket', $row['ssel_id'])); ->setBasket($em->getPartialReference('Phraseanet:Basket', $row['ssel_id']));
$em->persist($order); $em->persist($order);
@@ -118,7 +118,7 @@ class patch_390alpha1b implements patchInterface
$orderElement->setBaseId($element['base_id']) $orderElement->setBaseId($element['base_id'])
->setDeny($element['deny'] === null ? null : (Boolean) $element['deny']) ->setDeny($element['deny'] === null ? null : (Boolean) $element['deny'])
->setOrder($order) ->setOrder($order)
->setOrderMaster($em->getPartialReference('Alchemy\Phrasea\Model\Entities\User',$element['order_master_id'])) ->setOrderMaster($em->getPartialReference('Phraseanet:User',$element['order_master_id']))
->setRecordId($element['record_id']); ->setRecordId($element['record_id']);
$order->addElement($orderElement); $order->addElement($orderElement);

2
lib/classes/patch/390alpha3a.php
View File

@@ -74,7 +74,7 @@ class patch_390alpha3a implements patchInterface
$em = $app['EM']; $em = $app['EM'];
foreach ($rs as $row) { foreach ($rs as $row) {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
$userQuery = new UserQuery(); $userQuery = new UserQuery();
$userQuery->setQuery($row['query']); $userQuery->setQuery($row['query']);

2
lib/classes/patch/390alpha4a.php
View File

@@ -78,7 +78,7 @@ class patch_390alpha4a implements patchInterface
continue; continue;
} }
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
$userSetting = new UserSetting(); $userSetting = new UserSetting();
$userSetting->setName($row['prop']); $userSetting->setName($row['prop']);

2
lib/classes/patch/390alpha5a.php
View File

@@ -75,7 +75,7 @@ class patch_390alpha5a implements patchInterface
$em = $app['EM']; $em = $app['EM'];
foreach ($rs as $row) { foreach ($rs as $row) {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
$userSetting = new UserNotificationSetting(); $userSetting = new UserNotificationSetting();
$userSetting->setName($row['prop']); $userSetting->setName($row['prop']);

2
lib/classes/patch/390alpha6a.php
View File

@@ -96,7 +96,7 @@ class patch_390alpha6a implements patchInterface
foreach ($rs as $row) { foreach ($rs as $row) {
try { try {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
} catch (NoResultException $e) { } catch (NoResultException $e) {
continue; continue;
} }

6
lib/classes/patch/390alpha7a.php
View File

@@ -134,7 +134,7 @@ class patch_390alpha7a implements patchInterface
$fpRes = $fpStmt->fetchAll(\PDO::FETCH_ASSOC); $fpRes = $fpStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($fpRes as $fpRow) { foreach ($fpRes as $fpRow) {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $fpRow['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $fpRow['usr_id']);
$feedPublisher = new FeedPublisher(); $feedPublisher = new FeedPublisher();
$feedPublisher->setFeed($feed); $feedPublisher->setFeed($feed);
@@ -180,7 +180,7 @@ class patch_390alpha7a implements patchInterface
$ftRes = $ftStmt->fetchAll(\PDO::FETCH_ASSOC); $ftRes = $ftStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($ftRes as $ftRow) { foreach ($ftRes as $ftRow) {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $ftRow['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $ftRow['usr_id']);
$token = new FeedToken(); $token = new FeedToken();
$token->setFeed($feed); $token->setFeed($feed);
@@ -209,7 +209,7 @@ class patch_390alpha7a implements patchInterface
$faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC); $faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($faRes as $faRow) { foreach ($faRes as $faRow) {
$user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $faRow['usr_id']); $user = $em->getPartialReference('Phraseanet:User', $faRow['usr_id']);
$token = new AggregateToken(); $token = new AggregateToken();
$token->setUser($user); $token->setUser($user);

2
lib/classes/queries.php
View File

@@ -189,7 +189,7 @@ class queries
$history = '<ul>'; $history = '<ul>';
$queries = $app['EM'] $queries = $app['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\UserQuery') ->getRepository('Phraseanet:UserQuery')
->findBy(['user' => $usrId], ['created' => 'ASC'], 25, 0); ->findBy(['user' => $usrId], ['created' => 'ASC'], 25, 0);
foreach ($queries as $query) { foreach ($queries as $query) {

2
lib/classes/set/export.php
View File

@@ -54,7 +54,7 @@ class set_export extends set_abstract
} }
if ($sstid != "") { if ($sstid != "") {
$repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket'); $repository = $app['EM']->getRepository('Phraseanet:Basket');
/* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */ /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
$Basket = $repository->findUserBasket($sstid, $app['authentication']->getUser(), false); $Basket = $repository->findUserBasket($sstid, $app['authentication']->getUser(), false);

2
tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
View File

@@ -48,7 +48,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
{ {
$this->logout(self::$DI['app']); $this->logout(self::$DI['app']);
$Basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1); $Basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
$token = self::$DI['app']['tokens']->getUrlToken(\random::TYPE_VIEW, self::$DI['user_alt2']->getId(), null, $Basket->getId()); $token = self::$DI['app']['tokens']->getUrlToken(\random::TYPE_VIEW, self::$DI['user_alt2']->getId(), null, $Basket->getId());
self::$DI['client']->request('GET', '/lightbox/?LOG='.$token); self::$DI['client']->request('GET', '/lightbox/?LOG='.$token);

4
tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
View File

@@ -324,7 +324,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
public function testAddElementToValidationPost() public function testAddElementToValidationPost()
{ {
$countData = count(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll()); $countData = count(self::$DI['app']['EM']->getRepository('Phraseanet:ValidationData')->findAll());
$basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4); $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
$this->assertCount(2, $basket->getElements()); $this->assertCount(2, $basket->getElements());
@@ -347,7 +347,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
$this->assertEquals(302, $response->getStatusCode()); $this->assertEquals(302, $response->getStatusCode());
$this->assertCount(4, $basket->getElements()); $this->assertCount(4, $basket->getElements());
$datas = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll(); $datas = self::$DI['app']['EM']->getRepository('Phraseanet:ValidationData')->findAll();
$this->assertTrue($countData < count($datas), 'assert that ' . count($datas) . ' > ' . $countData); $this->assertTrue($countData < count($datas), 'assert that ' . count($datas) . ' > ' . $countData);
} }

8
tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
View File

@@ -67,10 +67,10 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
$this->assertNotEquals($tokenValue, $capture['token']); $this->assertNotEquals($tokenValue, $capture['token']);
$this->assertCount(0, self::$DI['app']['EM'] $this->assertCount(0, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken') ->getRepository('Phraseanet:AggregateToken')
->findBy(['value' => $tokenValue])); ->findBy(['value' => $tokenValue]));
$this->assertCount(1, self::$DI['app']['EM'] $this->assertCount(1, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken') ->getRepository('Phraseanet:AggregateToken')
->findBy(['value' => $capture['token']])); ->findBy(['value' => $capture['token']]));
} else { } else {
$expectedParams = [ $expectedParams = [
@@ -85,7 +85,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
$this->assertEquals($expectedParams, $capture); $this->assertEquals($expectedParams, $capture);
$this->assertCount(1, self::$DI['app']['EM'] $this->assertCount(1, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken') ->getRepository('Phraseanet:AggregateToken')
->findBy(['value' => $tokenValue])); ->findBy(['value' => $tokenValue]));
} }
} else { } else {
@@ -96,7 +96,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
$this->assertEquals(12, strlen($capture['token'])); $this->assertEquals(12, strlen($capture['token']));
$this->assertCount(1, self::$DI['app']['EM'] $this->assertCount(1, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken') ->getRepository('Phraseanet:AggregateToken')
->findBy(['value' => $capture['token']])); ->findBy(['value' => $capture['token']]));
} }
} }

8
tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
View File

@@ -59,10 +59,10 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
} }
$this->assertCount(0, self::$DI['app']['EM'] $this->assertCount(0, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken') ->getRepository('Phraseanet:FeedToken')
->findBy(['value' => $tokenValue])); ->findBy(['value' => $tokenValue]));
$this->assertCount(1, self::$DI['app']['EM'] $this->assertCount(1, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken') ->getRepository('Phraseanet:FeedToken')
->findBy(['value' => $capture['token']])); ->findBy(['value' => $capture['token']]));
} else { } else {
$expectedParams = [ $expectedParams = [
@@ -78,7 +78,7 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
$this->assertEquals($expectedParams, $capture); $this->assertEquals($expectedParams, $capture);
$this->assertCount(1, self::$DI['app']['EM'] $this->assertCount(1, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken') ->getRepository('Phraseanet:FeedToken')
->findBy(['value' => $tokenValue])); ->findBy(['value' => $tokenValue]));
} }
} else { } else {
@@ -90,7 +90,7 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
$this->assertEquals(12, strlen($capture['token'])); $this->assertEquals(12, strlen($capture['token']));
$this->assertCount(1, self::$DI['app']['EM'] $this->assertCount(1, self::$DI['app']['EM']
->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken') ->getRepository('Phraseanet:FeedToken')
->findBy(['value' => $capture['token']])); ->findBy(['value' => $capture['token']]));
} }
} }

2
tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
View File

@@ -8,7 +8,7 @@ class UserRepositoryTest extends \PhraseanetTestCase
{ {
public function testFindAdminsWithNoAdmins() public function testFindAdminsWithNoAdmins()
{ {
$users = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findAdmins(); $users = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findAdmins();
$this->assertEquals(2, count($users)); $this->assertEquals(2, count($users));
} }

2
tests/classes/userTest.php
View File

@@ -33,7 +33,7 @@ class userTest extends \PhraseanetTestCase
self::$DI['app']['model.user-manager']->delete($user); self::$DI['app']['model.user-manager']->delete($user);
$this->assertNull(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')->findWithProviderAndId('custom-one', 12345)); $this->assertNull(self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider')->findWithProviderAndId('custom-one', 12345));
} }
public function testDeleteSetMailToNullAndRemovesSessions() public function testDeleteSetMailToNullAndRemovesSessions()