Move entities to Phrasea namespace

lib/Alchemy/Phrasea/Application.php

@@ -30,7 +30,7 @@ use Alchemy\Phrasea\Controller\Admin\Users;
 use Alchemy\Phrasea\Controller\Client\Baskets as ClientBasket;
 use Alchemy\Phrasea\Controller\Client\Root as ClientRoot;
 use Alchemy\Phrasea\Controller\Minifier;
-use Alchemy\Phrasea\Controller\Prod\Basket;
+use Alchemy\Phrasea\Controller\Prod\BasketController;
 use Alchemy\Phrasea\Controller\Prod\Bridge;
 use Alchemy\Phrasea\Controller\Prod\Download;
 use Alchemy\Phrasea\Controller\Prod\DoDownload;
@@ -787,7 +787,7 @@ class Application extends SilexApplication
 
         $this->mount('/prod/query/', new Query());
         $this->mount('/prod/order/', new Order());
-        $this->mount('/prod/baskets', new Basket());
+        $this->mount('/prod/baskets', new BasketController());
         $this->mount('/prod/download', new Download());
         $this->mount('/prod/story', new Story());
         $this->mount('/prod/WorkZone', new WorkZone());

lib/Alchemy/Phrasea/Authentication/Authenticator.php

@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Browser;
 use Doctrine\ORM\EntityManager;
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -88,7 +88,7 @@ class Authenticator
 
     public function refreshAccount(Session $session)
     {
-        if (!$this->em->getRepository('Entities\Session')->findOneBy(array('id' => $session->getId()))) {
+        if (!$this->em->getRepository('Alchemy\Phrasea\Model\Entities\Session')->findOneBy(array('id' => $session->getId()))) {
             throw new RuntimeException('Unable to refresh the session, it does not exist anymore');
         }
 

lib/Alchemy/Phrasea/Authentication/Manager.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Authentication;
 
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 
 class Manager
 {

lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php

@@ -13,7 +13,7 @@ namespace Alchemy\Phrasea\Authentication\PersistentCookie;
 
 use Alchemy\Phrasea\Authentication\Phrasea\PasswordEncoder;
 use Doctrine\ORM\EntityManager;
-use Entities\Session;
+use Alchemy\Phrasea\Model\Entities\Session;
 
 class Manager
 {
@@ -38,7 +38,7 @@ class Manager
     public function getSession($cookieValue)
     {
         $session = $this->em
-            ->getRepository('Entities\Session')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Session')
             ->findOneBy(array('token' => $cookieValue));
 
         if (!$session) {

lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php

@@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Authentication\Phrasea;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Authentication\Exception\RequireCaptchaException;
 use Doctrine\ORM\EntityManager;
-use Entities\AuthFailure;
+use Alchemy\Phrasea\Model\Entities\AuthFailure;
 use Neutron\ReCaptcha\ReCaptcha;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -80,7 +80,7 @@ class FailureManager
     public function checkFailures($username, Request $request)
     {
         $failures = $this->em
-            ->getRepository('Entities\AuthFailure')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
             ->findLockedFailuresMatching($username, $request->getClientIp());
 
         if (0 === count($failures)) {
@@ -109,7 +109,7 @@ class FailureManager
     private function removeOldFailures()
     {
         $failures = $this->em
-            ->getRepository('Entities\AuthFailure')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
             ->findOldFailures('-2 months');
 
         if (0 < count($failures)) {

lib/Alchemy/Phrasea/Border/Manager.php

@@ -28,9 +28,10 @@ use Alchemy\Phrasea\Metadata\Tag\TfRecordid;
 use Alchemy\Phrasea\Metadata\Tag\TfSize;
 use Alchemy\Phrasea\Metadata\Tag\TfWidth;
 use Alchemy\Phrasea\Border\Attribute\Metadata as MetadataAttr;
-use Entities\LazaretAttribute;
+use Alchemy\Phrasea\Model\Entities\LazaretAttribute;
-use Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretCheck;
-use Entities\LazaretSession;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use MediaAlchemyst\Exception\ExceptionInterface as MediaAlchemystException;
 use MediaAlchemyst\Specification\Image as ImageSpec;
 use PHPExiftool\Driver\Metadata\Metadata;
@@ -428,7 +429,8 @@ class Manager
      * @param  Visa                  $visa    The visa related to the package file
      * @param  LazaretSession        $session The current LazaretSession
      * @param  Boolean               $forced  True if the file has been forced to quarantine
-     * @return \Entities\LazaretFile
+     *
+     * @return LazaretFile
      */
     protected function createLazaret(File $file, Visa $visa, LazaretSession $session, $forced)
     {
@@ -486,7 +488,7 @@ class Manager
         foreach ($visa->getResponses() as $response) {
             if ( ! $response->isOk()) {
 
-                $check = new \Entities\LazaretCheck();
+                $check = new LazaretCheck();
                 $check->setCheckClassname(get_class($response->getChecker()));
                 $check->setLazaretFile($lazaretFile);
 

lib/Alchemy/Phrasea/Command/RecordAdd.php

@@ -14,8 +14,8 @@ namespace Alchemy\Phrasea\Command;
 use Alchemy\Phrasea\Command\Command;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Manager;
-use Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
-use Entities\LazaretSession;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;

lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php

@@ -35,7 +35,7 @@ class ConnectedUsers implements ControllerProviderInterface
 
     public function listConnectedUsers(Application $app, Request $request)
     {
-        $dql = 'SELECT s FROM Entities\Session s
+        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s
             WHERE
                 s.updated > :date
             ORDER BY s.updated DESC';

lib/Alchemy/Phrasea/Controller/Admin/Publications.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
-use Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\Feed;
-use Entities\FeedPublisher;
+use Alchemy\Phrasea\Model\Entities\FeedPublisher;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -37,7 +37,7 @@ class Publications implements ControllerProviderInterface
         });
 
         $controllers->get('/list/', function(PhraseaApplication $app) {
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser(
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(
                 $app['authentication']->getUser()
             );
 
@@ -79,7 +79,7 @@ class Publications implements ControllerProviderInterface
         })->bind('admin_feeds_create');
 
         $controllers->get('/feed/{id}/', function(PhraseaApplication $app, Request $request, $id) {
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             return $app['twig']
                     ->render('admin/publications/fiche.html.twig', array('feed'  => $feed, 'error' => $app['request']->query->get('error')));
@@ -93,7 +93,7 @@ class Publications implements ControllerProviderInterface
                 $app->abort(400, "Bad request");
             }
 
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             try {
                 $collection = \collection::get_from_base_id($app, $request->request->get('base_id'));
@@ -109,7 +109,7 @@ class Publications implements ControllerProviderInterface
 
             return $app->redirectPath('admin_feeds_list');
         })->before(function(Request $request) use ($app) {
-            $feed = $app["EM"]->find('Entities\Feed', $request->attributes->get('id'));
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $request->attributes->get('id'));
 
             if (!$feed->isOwner($app['authentication']->getUser())) {
                 return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' =>  _('You are not the owner of this feed, you can not edit it')));
@@ -123,7 +123,7 @@ class Publications implements ControllerProviderInterface
                 'success' => false,
                 'message' => '',
             );
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             if (null === $feed) {
                 $app->abort(404, "Feed not found");
@@ -197,7 +197,7 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
                 $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app);
-                $feed = $app["EM"]->find('Entities\Feed', $id);
+                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
                 $publisher = new FeedPublisher();
                 $publisher->setUsrId($user->get_id());
@@ -222,9 +222,9 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
 
-                $feed = $app["EM"]->find('Entities\Feed', $id);
+                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
-                $publisher = $app["EM"]->find('Entities\FeedPublisher', $request->request->get('publisher_id'));
+                $publisher = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\FeedPublisher', $request->request->get('publisher_id'));
                 if (null === $publisher) {
                     $app->abort(404, "Feed Publisher not found");
                 }
@@ -246,7 +246,7 @@ class Publications implements ControllerProviderInterface
             ->assert('id', '\d+');
 
         $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) {
-            $feed = $app["EM"]->find('Entities\Feed', $id);
+            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
 
             if (null === $feed) {
                 $app->abort(404);

lib/Alchemy/Phrasea/Controller/Admin/Users.php

@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Helper\User as UserHelper;
-use Entities\FtpCredential;
+use Alchemy\Phrasea\Model\Entities\FtpCredential;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;

lib/Alchemy/Phrasea/Controller/Client/Baskets.php

@@ -11,8 +11,8 @@
 
 namespace Alchemy\Phrasea\Controller\Client;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
-use Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
 use Doctrine\Common\Collections\ArrayCollection;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
@@ -139,7 +139,7 @@ class Baskets implements ControllerProviderInterface
     public function deleteBasketElement(Application $app, Request $request)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
             $basketElement = $repository->findUserElement($request->request->get('p0'), $app['authentication']->getUser());
             $app['EM']->remove($basketElement);
             $app['EM']->flush();
@@ -162,7 +162,7 @@ class Baskets implements ControllerProviderInterface
     public function deleteBasket(Application $app, Request $request)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
             /* @var $repository \Repositories\BasketRepository */
             $basket = $repository->findUserBasket($app, $request->request->get('courChuId'), $app['authentication']->getUser(), true);
 
@@ -213,7 +213,7 @@ class Baskets implements ControllerProviderInterface
      */
     public function addElementToBasket(Application $app, Request $request)
     {
-        $repository = $app['EM']->getRepository('\Entities\Basket');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
         /* @var $repository \Repositories\BasketRepository */
         $basket = $repository->findUserBasket($app, $request->request->get('courChuId'), $app['authentication']->getUser(), true);
 
@@ -249,7 +249,7 @@ class Baskets implements ControllerProviderInterface
     public function getBaskets(Application $app, Request $request)
     {
         $selectedBasketId = trim($request->get('courChuId', ''));
-        $baskets = new ArrayCollection($app['EM']->getRepository('\Entities\Basket')->findActiveByUser($app['authentication']->getUser()));
+        $baskets = new ArrayCollection($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findActiveByUser($app['authentication']->getUser()));
         $selectedBasket = null;
 
         if ('' === $selectedBasketId && $baskets->count() > 0) {
@@ -257,7 +257,7 @@ class Baskets implements ControllerProviderInterface
         }
 
         if ('' !== $selectedBasketId) {
-            $selectedBasket = $app['EM']->getRepository('\Entities\Basket')->findUserBasket($app, $selectedBasketId, $app['authentication']->getUser(), true);
+            $selectedBasket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findUserBasket($app, $selectedBasketId, $app['authentication']->getUser(), true);
         }
 
         $basketCollections = $baskets->partition(function($key, $basket) {
@@ -283,7 +283,7 @@ class Baskets implements ControllerProviderInterface
     public function checkBaskets(Application $app, Request $request)
     {
         $noview = 0;
-        $repository = $app['EM']->getRepository('\Entities\Basket');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
         $baskets = $repository->findActiveByUser($app['authentication']->getUser());

lib/Alchemy/Phrasea/Controller/Client/Root.php

@@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Controller\Client;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Alchemy\Phrasea\Exception\SessionNotFound;
-use Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\Finder\Finder;

lib/Alchemy/Phrasea/Controller/Datafiles.php

@@ -85,7 +85,7 @@ class Datafiles extends AbstractDelivery
 
                 if ($watermark && !$all_access) {
 
-                    $repository = $app['EM']->getRepository('\Entities\BasketElement');
+                    $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
                     /* @var $repository \Repositories\BasketElementRepository */
 

lib/Alchemy/Phrasea/Controller/Lightbox.php

@@ -11,6 +11,8 @@
 
 namespace Alchemy\Phrasea\Controller;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
 use Alchemy\Phrasea\Exception\SessionNotFound;
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 use Silex\ControllerProviderInterface;
@@ -69,7 +71,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
 
@@ -99,7 +101,7 @@ class Lightbox implements ControllerProviderInterface
             }
 
             $basketElement = $app['EM']
-                ->getRepository('\Entities\BasketElement')
+                ->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')
                 ->findUserElement($sselcont_id, $app['authentication']->getUser());
 
             $parameters = array(
@@ -114,7 +116,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->get('/ajax/LOAD_BASKET_ELEMENT/{sselcont_id}/', function(SilexApplication $app, $sselcont_id) {
             /* @var $repository \Repositories\BasketElementRepository */
-            $repository = $app['EM']->getRepository('\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
             $BasketElement = $repository->findUserElement($sselcont_id, $app['authentication']->getUser());
 
@@ -160,7 +162,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function(SilexApplication $app, $entry_id, $item_id) {
 
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
             $item = $entry->getItem($item_id);
 
             if ($app['browser']->isMobile()) {
@@ -205,7 +207,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
@@ -259,7 +261,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
@@ -313,7 +315,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $feed_entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id);
+            $feed_entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
 
             $template = 'lightbox/feed.html.twig';
 
@@ -344,7 +346,7 @@ class Lightbox implements ControllerProviderInterface
 
             $template = 'lightbox/basket_content_report.html.twig';
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $repository \Repositories\BasketRepository */
             $basket = $repository->findUserBasket(
@@ -372,7 +374,7 @@ class Lightbox implements ControllerProviderInterface
             }
 
             /* @var $repository \Repositories\BasketElementRepository */
-            $repository = $app['EM']->getRepository('\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
             $basket_element = $repository->findUserElement($sselcont_id, $app['authentication']->getUser());
 
@@ -419,14 +421,14 @@ class Lightbox implements ControllerProviderInterface
                     'datas'      => _('Erreur lors de la mise a jour des donnes ')
                 );
 
-                $repository = $app['EM']->getRepository('\Entities\BasketElement');
+                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
                 /* @var $repository \Repositories\BasketElementRepository */
                 $basket_element = $repository->findUserElement(
                     $sselcont_id
                     , $app['authentication']->getUser()
                 );
-                /* @var $basket_element \Entities\BasketElement */
+                /* @var $basket_element BasketElement */
                 $validationDatas = $basket_element->getUserValidationDatas($app['authentication']->getUser(), $app);
 
                 if (!$basket_element->getBasket()
@@ -466,7 +468,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->post('/ajax/SET_RELEASE/{ssel_id}/', function(SilexApplication $app, $ssel_id) {
 
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $datas = array('error' => true, 'datas' => '');
 
@@ -487,7 +489,7 @@ class Lightbox implements ControllerProviderInterface
                 }
 
                 $agreed = false;
-                /* @var $basket \Entities\Basket */
+                /* @var $basket Basket */
                 foreach ($basket->getElements() as $element) {
                     if (null !== $element->getUserValidationDatas($app['authentication']->getUser(), $app)->getAgreement()) {
                         $agreed = true;
@@ -498,7 +500,7 @@ class Lightbox implements ControllerProviderInterface
                     throw new ControllerException(_('You have to give your feedback at least on one document to send a report'));
                 }
 
-                /* @var $basket \Entities\Basket */
+                /* @var $basket Basket */
                 $participant = $basket->getValidation()->getParticipant($app['authentication']->getUser(), $app);
 
                 $expires = new \DateTime('+10 days');

lib/Alchemy/Phrasea/Controller/Permalink.php

@@ -32,7 +32,7 @@ class Permalink extends AbstractDelivery
         $that = $this;
 
         $retrieveRecord = function ($app, $databox, $token, $record_id, $subdef) {
-            if (in_array($subdef, array(\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL)) && $app['EM']->getRepository('Entities\FeedItem')->isRecordInPublicFeed($app, $databox->get_sbas_id(), $record_id)) {
+            if (in_array($subdef, array(\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL)) && $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed($app, $databox->get_sbas_id(), $record_id)) {
                 $record = $databox->get_record($record_id);
             } else {
                 $record = \media_Permalink_Adapter::challenge_token($app, $databox, $token, $record_id, $subdef);
@@ -75,7 +75,7 @@ class Permalink extends AbstractDelivery
 
                 if ($watermark) {
 
-                    $repository = $app['EM']->getRepository('\Entities\BasketElement');
+                    $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
 
                     if (count($repository->findReceivedValidationElementsByRecord($record, $user)) > 0) {
                         $watermark = false;

lib/Alchemy/Phrasea/Controller/Prod/BasketController.php

@@ -12,9 +12,9 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Entities\Basket as BasketEntity;
+use Alchemy\Phrasea\Model\Entities\Basket as BasketEntity;
-use Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
-use Entities\ValidationData;
+use Alchemy\Phrasea\Model\Entities\ValidationData;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -26,7 +26,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-class Basket implements ControllerProviderInterface
+class BasketController implements ControllerProviderInterface
 {
 
     public function connect(Application $app)
@@ -139,7 +139,7 @@ class Basket implements ControllerProviderInterface
 
     public function displayBasket(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), false);
 
         if ($basket->getIsRead() === false) {
@@ -214,7 +214,7 @@ class Basket implements ControllerProviderInterface
 
     public function deleteBasket(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $app['EM']->remove($basket);
@@ -234,11 +234,11 @@ class Basket implements ControllerProviderInterface
 
     public function removeBasketElement(Application $app, Request $request, $basket_id, $basket_element_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         foreach ($basket->getElements() as $basket_element) {
-            /* @var $basket_element \Entities\BasketElement */
+            /* @var $basket_element BasketElement */
             if ($basket_element->getId() == $basket_element_id) {
                 $app['EM']->remove($basket_element);
             }
@@ -263,7 +263,7 @@ class Basket implements ControllerProviderInterface
         $success = false;
 
         try {
-            $basket = $app['EM']->getRepository('\Entities\Basket')
+            $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                 ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
             $basket->setName($request->request->get('name', ''));
@@ -298,7 +298,7 @@ class Basket implements ControllerProviderInterface
     public function displayUpdateForm(Application $app, $basket_id)
     {
         $basket = $app['EM']
-            ->getRepository('\Entities\Basket')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         return $app['twig']->render('prod/Baskets/Update.html.twig', array('basket' => $basket));
@@ -307,7 +307,7 @@ class Basket implements ControllerProviderInterface
     public function displayReorderForm(Application $app, $basket_id)
     {
         $basket = $app['EM']
-            ->getRepository('\Entities\Basket')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         return $app['twig']->render('prod/Baskets/Reorder.html.twig', array('basket' => $basket));
@@ -317,12 +317,12 @@ class Basket implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => _('An error occured'));
         try {
-            $basket = $app['EM']->getRepository('\Entities\Basket')
+            $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
                 ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
             $order = $app['request']->request->get('element');
 
-            /* @var $basket \Entities\Basket */
+            /* @var $basket BasketEntity */
             foreach ($basket->getElements() as $basketElement) {
                 if (isset($order[$basketElement->getId()])) {
                     $basketElement->setOrd($order[$basketElement->getId()]);
@@ -342,7 +342,7 @@ class Basket implements ControllerProviderInterface
 
     public function archiveBasket(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $archive_status = (Boolean) $request->query->get('archive');
@@ -373,7 +373,7 @@ class Basket implements ControllerProviderInterface
 
     public function addElements(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $n = 0;
@@ -424,14 +424,14 @@ class Basket implements ControllerProviderInterface
 
     public function stealElements(Application $app, Request $request, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
 
         $n = 0;
 
         foreach ($request->request->get('elements') as $bask_element_id) {
             try {
-                $basket_element = $app['EM']->getRepository('\Entities\BasketElement')
+                $basket_element = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')
                     ->findUserElement($bask_element_id, $app['authentication']->getUser());
             } catch (\Exception $e) {
                 continue;

lib/Alchemy/Phrasea/Controller/Prod/Feed.php

@@ -15,8 +15,8 @@ use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator;
 use Alchemy\Phrasea\Feed\Link\FeedLinkGenerator;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
-use Entities\FeedItem;
+use Alchemy\Phrasea\Model\Entities\FeedItem;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -43,7 +43,7 @@ class Feed implements ControllerProviderInterface
          * I got a selection of docs, which publications are available forthese docs ?
          */
         $controllers->post('/requestavailable/', function(Application $app, Request $request) {
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
             $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub'));
 
             return $app['twig']->render('prod/actions/publish/publish.html.twig', array('publishing' => $publishing, 'feeds' => $feeds));
@@ -53,13 +53,13 @@ class Feed implements ControllerProviderInterface
          * I've selected a publication for my docs, let's publish them
          */
         $controllers->post('/entry/create/', function(Application $app, Request $request) {
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($request->request->get('feed_id'));
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($request->request->get('feed_id'));
 
             if (null === $feed) {
                 $app->abort(404, "Feed not found");
             }
 
-            $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id()));
+            $publisher = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id()));
 
             if ('' === $title = trim($request->request->get('title', ''))) {
                 $app->abort(400, "Bad request");
@@ -105,13 +105,13 @@ class Feed implements ControllerProviderInterface
             });
 
         $controllers->get('/entry/{id}/edit/', function(Application $app, Request $request, $id) {
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
 
             if (!$entry->isPublisher($app['authentication']->getUser())) {
                 throw new AccessDeniedHttpException();
             }
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', array('entry' => $entry, 'feeds' => $feeds));
 
@@ -125,7 +125,7 @@ class Feed implements ControllerProviderInterface
 
         $controllers->post('/entry/{id}/update/', function(Application $app, Request $request, $id) {
             $datas = array('error' => true, 'message' => '', 'datas' => '');
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
 
             if (null === $entry) {
                 $app->abort(404, 'Entry not found');
@@ -146,7 +146,7 @@ class Feed implements ControllerProviderInterface
             $new_feed_id = $request->request->get('feed_id', $currentFeedId);
             if ($currentFeedId !== (int) $new_feed_id) {
 
-                $new_feed = $app['EM']->getRepository('Entities\Feed')->find($new_feed_id);
+                $new_feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($new_feed_id);
 
                 if ($new_feed === null) {
                     $app->abort(404, 'Feed not found');
@@ -165,7 +165,7 @@ class Feed implements ControllerProviderInterface
                 if (count($item_sort_datas) != 2) {
                     continue;
                 }
-                $item = $app['EM']->getRepository('Entities\FeedItem')->find($item_sort_datas[0]);
+                $item = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item_sort_datas[0]);
                 $item->setOrd($item_sort_datas[1]);
                 $app['EM']->persist($item);
             }
@@ -189,7 +189,7 @@ class Feed implements ControllerProviderInterface
         $controllers->post('/entry/{id}/delete/', function(Application $app, Request $request, $id) {
             $datas = array('error' => true, 'message' => '');
 
-            $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
 
             if (null === $entry) {
                 $app->abort(404, 'Entry not found');
@@ -213,7 +213,7 @@ class Feed implements ControllerProviderInterface
             $page = (int) $request->query->get('page');
             $page = $page > 0 ? $page : 1;
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array(
                 'feeds' => $feeds,
@@ -228,11 +228,11 @@ class Feed implements ControllerProviderInterface
             $page = (int) $request->query->get('page');
             $page = $page > 0 ? $page : 1;
 
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
             if (!$feed->isAccessible($app['authentication']->getUser(), $app)) {
                 $app->abort(404, 'Feed not found');
             }
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page));
 
@@ -244,7 +244,7 @@ class Feed implements ControllerProviderInterface
         $controllers->get('/subscribe/aggregated/', function(Application $app, Request $request) {
             $renew = ($request->query->get('renew') === 'true');
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
 
             $link = $app['feed.aggregate-link-generator']->generate(new Aggregate($app['EM'], $feeds),
                 $app['authentication']->getUser(),
@@ -265,7 +265,7 @@ class Feed implements ControllerProviderInterface
         $controllers->get('/subscribe/{id}/', function(Application $app, Request $request, $id) {
             $renew = ($request->query->get('renew') === 'true');
 
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
             if (!$feed->isAccessible($app['authentication']->getUser(), $app)) {
                 $app->abort(404, 'Feed not found');
             }

lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Entities\LazaretFile;
+use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Border;
 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
 use Alchemy\Phrasea\Http\DeliverDataInterface;
@@ -180,7 +180,7 @@ class Lazaret implements ControllerProviderInterface
         $lazaretFiles = null;
 
         if (count($baseIds) > 0) {
-            $lazaretRepository = $app['EM']->getRepository('Entities\LazaretFile');
+            $lazaretRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile');
 
             $lazaretFiles = $lazaretRepository->findPerPage(
                 $baseIds, $request->query->get('offset', 0), $request->query->get('limit', 10)
@@ -205,9 +205,9 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => '', 'result'  => array());
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -254,9 +254,9 @@ class Lazaret implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -363,8 +363,8 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => '', 'result'  => array());
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -410,7 +410,7 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = array('success' => false, 'message' => '', 'result'  => array());
 
-        $lazaretFiles = $app['EM']->getRepository('Entities\LazaretFile')->findAll();
+        $lazaretFiles = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile')->findAll();
 
         $app['EM']->beginTransaction();
 
@@ -448,9 +448,9 @@ class Lazaret implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = _('File is not present in quarantine anymore, please refresh');
 
@@ -519,9 +519,9 @@ class Lazaret implements ControllerProviderInterface
      */
     public function thumbnailElement(Application $app, Request $request, $file_id)
     {
-        $lazaretFile = $app['EM']->find('Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
 
-        /* @var $lazaretFile \Entities\LazaretFile */
+        /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             return new Response(null, 404);
         }

lib/Alchemy/Phrasea/Controller/Prod/Order.php

@@ -13,10 +13,10 @@ namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
-use Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
-use Entities\Order as OrderEntity;
+use Alchemy\Phrasea\Model\Entities\Order as OrderEntity;
-use Entities\OrderElement;
+use Alchemy\Phrasea\Model\Entities\OrderElement;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -261,8 +261,8 @@ class Order implements ControllerProviderInterface
 
         $baseIds = array_keys($app['authentication']->getUser()->ACL()->get_granted_base(array('order_master')));
 
-        $ordersList = $app['EM']->getRepository('Entities\Order')->listOrders($baseIds, $offsetStart, $perPage, $sort);
+        $ordersList = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->listOrders($baseIds, $offsetStart, $perPage, $sort);
-        $total = $app['EM']->getRepository('Entities\Order')->countTotalOrders($baseIds);
+        $total = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->countTotalOrders($baseIds);
 
         return $app['twig']->render('prod/orders/order_box.html.twig', array(
             'page'         => $page,
@@ -284,7 +284,7 @@ class Order implements ControllerProviderInterface
      */
     public function displayOneOrder(Application $app, Request $request, $order_id)
     {
-        $order = $app['EM']->getRepository('Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
@@ -305,7 +305,7 @@ class Order implements ControllerProviderInterface
     public function sendOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        $order = $app['EM']->getRepository('Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
@@ -392,7 +392,7 @@ class Order implements ControllerProviderInterface
     public function denyOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        $order = $app['EM']->getRepository('Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }

lib/Alchemy/Phrasea/Controller/Prod/Push.php

@@ -11,6 +11,13 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
+use Alchemy\Phrasea\Model\Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\BasketElement;
+use Alchemy\Phrasea\Model\Entities\UsrList;
+use Alchemy\Phrasea\Model\Entities\UsrListEntry;
+use Alchemy\Phrasea\Model\Entities\ValidationSession;
+use Alchemy\Phrasea\Model\Entities\ValidationData;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
@@ -48,11 +55,11 @@ class Push implements ControllerProviderInterface
     {
         $userFormatter = $this->getUserFormatter();
 
-        return function(\Entities\UsrList $List) use ($userFormatter, $app) {
+        return function(UsrList $List) use ($userFormatter, $app) {
             $entries = array();
 
             foreach ($List->getEntries() as $entry) {
-                /* @var $entry \Entities\UsrListEntry */
+                /* @var $entry UsrListEntry */
                 $entries[] = array(
                     'Id'   => $entry->getId(),
                     'User' => $userFormatter($entry->getUser($app))
@@ -113,7 +120,7 @@ class Push implements ControllerProviderInterface
         $controllers->post('/sendform/', function(Application $app) use ($userSelection) {
             $push = new RecordHelper\Push($app, $app['request']);
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $RecommendedUsers = $userSelection($push->get_elements());
 
@@ -131,7 +138,7 @@ class Push implements ControllerProviderInterface
         $controllers->post('/validateform/', function(Application $app) use ($userSelection) {
             $push = new RecordHelper\Push($app, $app['request']);
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $RecommendedUsers = $userSelection($push->get_elements());
 
@@ -177,7 +184,7 @@ class Push implements ControllerProviderInterface
                         throw new ControllerException(sprintf(_('Unknown user %d'), $receiver['usr_id']));
                     }
 
-                    $Basket = new \Entities\Basket();
+                    $Basket = new Basket();
                     $Basket->setName($push_name);
                     $Basket->setDescription($push_description);
                     $Basket->setOwner($user_receiver);
@@ -187,7 +194,7 @@ class Push implements ControllerProviderInterface
                     $app['EM']->persist($Basket);
 
                     foreach ($pusher->get_elements() as $element) {
-                        $BasketElement = new \Entities\BasketElement();
+                        $BasketElement = new BasketElement();
                         $BasketElement->setRecord($element);
                         $BasketElement->setBasket($Basket);
 
@@ -274,7 +281,7 @@ class Push implements ControllerProviderInterface
             try {
                 $pusher = new RecordHelper\Push($app, $app['request']);
 
-                $repository = $app['EM']->getRepository('\Entities\Basket');
+                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
                 $validation_name = $request->request->get('name', sprintf(_('Validation from %s'), $app['authentication']->getUser()->get_display_name()));
                 $validation_description = $request->request->get('validation_description');
@@ -292,7 +299,7 @@ class Push implements ControllerProviderInterface
                 if ($pusher->is_basket()) {
                     $Basket = $pusher->get_original_basket();
                 } else {
-                    $Basket = new \Entities\Basket();
+                    $Basket = new Basket();
                     $Basket->setName($validation_name);
                     $Basket->setDescription($validation_description);
                     $Basket->setOwner($app['authentication']->getUser());
@@ -301,7 +308,7 @@ class Push implements ControllerProviderInterface
                     $app['EM']->persist($Basket);
 
                     foreach ($pusher->get_elements() as $element) {
-                        $BasketElement = new \Entities\BasketElement();
+                        $BasketElement = new BasketElement();
                         $BasketElement->setRecord($element);
                         $BasketElement->setBasket($Basket);
 
@@ -315,7 +322,7 @@ class Push implements ControllerProviderInterface
                 $app['EM']->refresh($Basket);
 
                 if (!$Basket->getValidation()) {
-                    $Validation = new \Entities\ValidationSession();
+                    $Validation = new ValidationSession();
                     $Validation->setInitiator($app['authentication']->getUser());
                     $Validation->setBasket($Basket);
 
@@ -368,7 +375,7 @@ class Push implements ControllerProviderInterface
 
                     }
 
-                    $Participant = new \Entities\ValidationParticipant();
+                    $Participant = new ValidationParticipant();
                     $Participant->setUser($participant_user);
                     $Participant->setSession($Validation);
 
@@ -378,7 +385,7 @@ class Push implements ControllerProviderInterface
                     $app['EM']->persist($Participant);
 
                     foreach ($Basket->getElements() as $BasketElement) {
-                        $ValidationData = new \Entities\ValidationData();
+                        $ValidationData = new ValidationData();
                         $ValidationData->setParticipant($Participant);
                         $ValidationData->setBasketElement($BasketElement);
                         $BasketElement->addValidationData($ValidationData);
@@ -490,7 +497,7 @@ class Push implements ControllerProviderInterface
         $controllers->get('/list/{list_id}/', function(Application $app, $list_id) use ($listFormatter) {
             $datas = null;
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -590,7 +597,7 @@ class Push implements ControllerProviderInterface
                     ->limit(0, 50)
                     ->execute()->get_results();
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $lists = $repository->findUserListLike($app['authentication']->getUser(), $request->query->get('query'));
 
@@ -613,7 +620,7 @@ class Push implements ControllerProviderInterface
 
         $controllers->match('/edit-list/{list_id}/', function(Application $app, Request $request, $list_id) {
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 

lib/Alchemy/Phrasea/Controller/Prod/Query.php

@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
-use Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\UserQuery;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;

lib/Alchemy/Phrasea/Controller/Prod/Records.php

@@ -204,8 +204,8 @@ class Records implements ControllerProviderInterface
             'candeleterecord'
         ));
 
-        $basketElementsRepository = $app['EM']->getRepository('\Entities\BasketElement');
+        $basketElementsRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
-        $StoryWZRepository = $app['EM']->getRepository('\Entities\StoryWZ');
+        $StoryWZRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         $deleted = array();
 

lib/Alchemy/Phrasea/Controller/Prod/Root.php

@@ -73,7 +73,7 @@ class Root implements ControllerProviderInterface
                 $cssfile = '000000';
             }
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['authentication']->getUser());
             $aggregate = Aggregate::createFromUser($app['EM'], $app['authentication']->getUser());
 
             $thjslist = "";

lib/Alchemy/Phrasea/Controller/Prod/Story.php

@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 use Alchemy\Phrasea\Controller\RecordsRequest;
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -79,7 +80,7 @@ class Story implements ControllerProviderInterface
 
             $Story->set_metadatas($metadatas)->rebuild_subdefs();
 
-            $StoryWZ = new \Entities\StoryWZ();
+            $StoryWZ = new StoryWZ();
             $StoryWZ->setUser($app['authentication']->getUser());
             $StoryWZ->setRecord($Story);
 

lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php

@@ -80,7 +80,7 @@ class Tooltip implements ControllerProviderInterface
 
     public function displayBasket(Application $app, $basket_id)
     {
-        $basket = $app['EM']->getRepository('\Entities\Basket')
+        $basket = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), false);
 
         return $app['twig']->render('prod/Tooltip/Basket.html.twig', array('basket' => $basket));

lib/Alchemy/Phrasea/Controller/Prod/Upload.php

@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Attribute\Status;
 use DataURI\Parser;
 use DataURI\Exception\Exception as DataUriException;
-use Entities\LazaretSession;
+use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;

lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php

@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Entities\UsrList;
+use Alchemy\Phrasea\Model\Entities\UsrList;
-use Entities\UsrListEntry;
+use Alchemy\Phrasea\Model\Entities\UsrListEntry;
-use Entities\UsrListOwner;
+use Alchemy\Phrasea\Model\Entities\UsrListOwner;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
@@ -110,7 +110,7 @@ class UsrLists implements ControllerProviderInterface
         $lists = new ArrayCollection();
 
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $lists = $repository->findUserLists($app['authentication']->getUser());
 
@@ -142,7 +142,7 @@ class UsrLists implements ControllerProviderInterface
                     );
                 }
 
-                /* @var $list \Entities\UsrList */
+                /* @var $list UsrList */
                 $result[] = array(
                     'name'    => $list->getName(),
                     'created' => $list->getCreated()->format(DATE_ATOM),
@@ -223,7 +223,7 @@ class UsrLists implements ControllerProviderInterface
 
     public function displayList(Application $app, Request $request, $list_id)
     {
-        $repository = $app['EM']->getRepository('\Entities\UsrList');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
         $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -281,7 +281,7 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException(_('List name is required'));
             }
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -312,7 +312,7 @@ class UsrLists implements ControllerProviderInterface
     public function removeList(Application $app, $list_id)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -346,16 +346,16 @@ class UsrLists implements ControllerProviderInterface
     public function removeUser(Application $app, $list_id, $usr_id)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_EDITOR) {
                 throw new ControllerException(_('You are not authorized to do this'));
             }
 
-            $entry_repository = $app['EM']->getRepository('\Entities\UsrListEntry');
+            $entry_repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListEntry');
 
             $user_entry = $entry_repository->findEntryByListAndUsrId($list, $usr_id);
 
@@ -389,10 +389,10 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException('Invalid or missing parameter usr_ids');
             }
 
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_EDITOR) {
                 throw new ControllerException(_('You are not authorized to do this'));
@@ -453,10 +453,10 @@ class UsrLists implements ControllerProviderInterface
         $list = null;
 
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_ADMIN) {
                 $list = null;
@@ -483,10 +483,10 @@ class UsrLists implements ControllerProviderInterface
             throw new BadRequestHttpException('Role is invalid');
 
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_EDITOR) {
                 throw new ControllerException(_('You are not authorized to do this'));
@@ -539,16 +539,16 @@ class UsrLists implements ControllerProviderInterface
     public function unshareWithUser(Application $app, $list_id, $usr_id)
     {
         try {
-            $repository = $app['EM']->getRepository('\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
-            /* @var $list \Entities\UsrList */
+            /* @var $list UsrList */
 
             if ($list->getOwner($app['authentication']->getUser(), $app)->getRole() < UsrListOwner::ROLE_ADMIN) {
                 throw new \Exception(_('You are not authorized to do this'));
             }
 
-            $owners_repository = $app['EM']->getRepository('\Entities\UsrListOwner');
+            $owners_repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListOwner');
 
             $owner = $owners_repository->findByListAndUsrId($list, $usr_id);
 

lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Entities\StoryWZ;
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -80,7 +80,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $request = $app['request'];
 
-        $BasketRepo = $app['EM']->getRepository('\Entities\Basket');
+        $BasketRepo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         $Page = (int) $request->query->get('Page', 0);
 
@@ -115,7 +115,7 @@ class WorkZone implements ControllerProviderInterface
     public function browseBasket(Application $app, Request $request, $basket_id)
     {
         $basket = $app['EM']
-            ->getRepository('\Entities\Basket')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
             ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), false);
 
         return $app['twig']->render('prod/WorkZone/Browser/Basket.html.twig', array('Basket' => $basket));
@@ -127,7 +127,7 @@ class WorkZone implements ControllerProviderInterface
             throw new BadRequestHttpException('Missing parameters stories');
         }
 
-        $StoryWZRepo = $app['EM']->getRepository('\Entities\StoryWZ');
+        $StoryWZRepo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         $alreadyFixed = $done = 0;
 
@@ -202,7 +202,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $Story = new \record_adapter($app, $sbas_id, $record_id);
 
-        $repository = $app['EM']->getRepository('\Entities\StoryWZ');
+        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         /* @var $repository \Repositories\StoryWZRepository */
         $StoryWZ = $repository->findUserStory($app, $app['authentication']->getUser(), $Story);

lib/Alchemy/Phrasea/Controller/RecordsRequest.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Alchemy\Phrasea\Application;
 use Symfony\Component\HttpFoundation\Request;
@@ -206,7 +206,7 @@ class RecordsRequest extends ArrayCollection
         $basket = null;
 
         if ($request->get('ssel')) {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             $basket = $repository->findUserBasket($app, $request->get('ssel'), $app['authentication']->getUser(), false);
 
@@ -214,7 +214,7 @@ class RecordsRequest extends ArrayCollection
                 $received[$basket_element->getRecord($app)->get_serialize_key()] = $basket_element->getRecord($app);
             }
         } elseif ($request->get('story')) {
-            $repository = $app['EM']->getRepository('\Entities\StoryWZ');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
             $storyWZ = $repository->findByUserAndId(
                 $app, $app['authentication']->getUser()

lib/Alchemy/Phrasea/Controller/Root/Account.php

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

lib/Alchemy/Phrasea/Controller/Root/Login.php

@@ -23,6 +23,8 @@ use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Exception\FormProcessingException;
 use Alchemy\Phrasea\Exception\RuntimeException;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
+use Alchemy\Phrasea\Model\Entities\UsrAuthProvider;
 use Alchemy\Phrasea\Notification\Receiver;
 use Alchemy\Phrasea\Notification\Mail\MailRequestPasswordUpdate;
 use Alchemy\Phrasea\Notification\Mail\MailRequestEmailConfirmation;
@@ -35,7 +37,6 @@ use Alchemy\Phrasea\Form\Login\PhraseaForgotPasswordForm;
 use Alchemy\Phrasea\Form\Login\PhraseaRecoverPasswordForm;
 use Alchemy\Phrasea\Form\Login\PhraseaRegisterForm;
 use Doctrine\ORM\EntityManager;
-use Entities\UsrAuthProvider;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -51,7 +52,7 @@ class Login implements ControllerProviderInterface
     {
         $items = array();
 
-        foreach($app['EM']->getRepository('Entities\FeedItem')->loadLatest($app, 20) as $item) {
+        foreach($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest($app, 20) as $item) {
             $record = $item->getRecord($app);
             $preview = $record->get_subdef('preview');
             $permalink = $preview->get_permalink();
@@ -281,7 +282,7 @@ class Login implements ControllerProviderInterface
                 }
 
                 $userAuthProvider = $app['EM']
-                    ->getRepository('Entities\UsrAuthProvider')
+                    ->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
                     ->findWithProviderAndId($token->getProvider()->getId(), $token->getId());
 
                 if (null !== $userAuthProvider) {
@@ -739,7 +740,7 @@ class Login implements ControllerProviderInterface
             $app->addFlash('error', _('login::erreur: No available connection - Please contact sys-admin'));
         }
 
-        $feeds = $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
+        $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'));
 
         $form = $app->form(new PhraseaAuthenticationForm());
         $form->setData(array(
@@ -831,10 +832,10 @@ class Login implements ControllerProviderInterface
         $date = new \DateTime('+' . (int) $app['phraseanet.registry']->get('GV_validation_reminder') . ' days');
 
         foreach ($app['EM']
-            ->getRepository('Entities\ValidationParticipant')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\ValidationParticipant')
             ->findNotConfirmedAndNotRemindedParticipantsByExpireDate($date) as $participant) {
 
-            /* @var $participant \Entities\ValidationParticipant */
+            /* @var $participant ValidationParticipant */
 
             $validationSession = $participant->getSession();
             $participantId = $participant->getUsrId();
@@ -904,7 +905,7 @@ class Login implements ControllerProviderInterface
         }
 
         $userAuthProvider = $app['EM']
-            ->getRepository('Entities\UsrAuthProvider')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
             ->findWithProviderAndId($token->getProvider()->getId(), $token->getId());
 
         if (null !== $userAuthProvider) {
@@ -1037,7 +1038,7 @@ class Login implements ControllerProviderInterface
             if (!$user->is_guest() && $request->cookies->has('invite-usr_id')) {
                 if ($user->get_id() != $inviteUsrId = $request->cookies->get('invite-usr_id')) {
 
-                    $repo = $app['EM']->getRepository('Entities\Basket');
+                    $repo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
                     $baskets = $repo->findBy(array('usr_id' => $inviteUsrId));
 
                     foreach ($baskets as $basket) {

lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Root;
 
-use Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\Feed;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
@@ -29,7 +29,7 @@ class RSSFeeds implements ControllerProviderInterface
         $controllers = $app['controllers_factory'];
 
         $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) {
-            $feed = $app['EM']->getRepository('Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
 
             if (null === $feed) {
                 $app->abort(404, 'Feed not found');
@@ -51,7 +51,7 @@ class RSSFeeds implements ControllerProviderInterface
             ->assert('format', '(rss|atom)');
 
         $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) {
-            $token = $app["EM"]->find('Entities\FeedToken', $id);
+            $token = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\FeedToken', $id);
 
             $request = $app['request'];
 
@@ -66,11 +66,11 @@ class RSSFeeds implements ControllerProviderInterface
             ->assert('format', '(rss|atom)');
 
         $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) {
-            $token = $app['EM']->getRepository('Entities\AggregateToken')->findOneBy(array("value" => $token));
+            $token = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(array("value" => $token));
 
             $user = \User_Adapter::getInstance($token->getUsrId(), $app);
 
-            $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($user);
+            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($user);
 
             $aggregate = new Aggregate($app['EM'], $feeds, $token);
 

lib/Alchemy/Phrasea/Controller/Root/Session.php

@@ -11,6 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Root;
 
+use Alchemy\Phrasea\Model\Entities\SessionModule;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -92,11 +93,11 @@ class Session implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $session = $app['EM']->find('Entities\Session', $app['session']->get('session_id'));
+        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $app['session']->get('session_id'));
         $session->setUpdated(new \DateTime());
 
         if (!$session->hasModuleId($moduleId)) {
-            $module = new \Entities\SessionModule();
+            $module = new SessionModule();
             $module->setModuleId($moduleId);
             $module->setSession($session);
             $app['EM']->persist($module);
@@ -113,7 +114,7 @@ class Session implements ControllerProviderInterface
             'notifications' => $app['events-manager']->get_notifications()
         ));
 
-        $baskets = $app['EM']->getRepository('\Entities\Basket')->findUnreadActiveByUser($app['authentication']->getUser());
+        $baskets = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findUnreadActiveByUser($app['authentication']->getUser());
 
         foreach ($baskets as $basket) {
             $ret['changed'][] = $basket->getId();
@@ -143,7 +144,7 @@ class Session implements ControllerProviderInterface
      */
     public function deleteSession(Application $app, Request $request, $id)
     {
-        $session = $app['EM']->find('Entities\Session', $id);
+        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $id);
 
         if (null === $session) {
             $app->abort(404, 'Unknown session');

lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php

@@ -63,10 +63,10 @@ class ORMServiceProvider implements ServiceProviderInterface
 
             $annotationDriver = new AnnotationDriver(
                 $annotationReader,
-                array($app['root.path'].'/lib/Doctrine/Entities')
+                array($app['root.path'].'/lib/Alchemy/Phrasea/Model/Entities')
             );
 
-            $driverChain->addDriver($annotationDriver, 'Entities');
+            $driverChain->addDriver($annotationDriver, 'Alchemy\Phrasea\Model\Entities');
 
             return $driverChain;
         });

lib/Alchemy/Phrasea/Feed/Aggregate.php

@@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Feed;
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\LogicException;
 use Doctrine\ORM\EntityManager;
-use Entities\AggregateToken;
+use Alchemy\Phrasea\Model\Entities\AggregateToken;
 
 class Aggregate implements FeedInterface
 {
@@ -76,8 +76,8 @@ class Aggregate implements FeedInterface
      */
     public static function createFromUser(EntityManager $em, \User_Adapter $user)
     {
-        $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user);
+        $feeds = $em->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($user);
-        $token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usrId' => $user->get_id()));
+        $token = $em->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(array('usrId' => $user->get_id()));
 
         return new static($em, $feeds, $token);
     }
@@ -92,7 +92,7 @@ class Aggregate implements FeedInterface
      */
     public static function create(Application $app, array $feed_ids)
     {
-        $feeds = $this->em->getRepository('Entities\Feed')->findByIds($feed_ids);
+        $feeds = $this->em->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findByIds($feed_ids);
 
         return new static($app, $feeds);
     }
@@ -119,7 +119,7 @@ class Aggregate implements FeedInterface
             $feedIds[] = $feed->getId();
         }
 
-        return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
+        return $this->em->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
     }
 
     /**
@@ -205,7 +205,7 @@ class Aggregate implements FeedInterface
                 $feedIds[] = $feed->getId();
             }
 
-            return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds));
+            return count($this->em->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->findByFeeds($feedIds));
         }
 
         return 0;
@@ -237,6 +237,6 @@ class Aggregate implements FeedInterface
      */
     public static function getPublic(Application $app)
     {
-        return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')));
+        return new static($app['EM'], $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')));
     }
 }

lib/Alchemy/Phrasea/Feed/AggregateToken.php

@@ -12,6 +12,7 @@
 namespace Alchemy\Phrasea\Feed;
 
 use Alchemy\Phrasea\Feed\Aggregate;
+use Alchemy\Phrasea\Model\Entities\Feed;
 
 /**
  * AggregateToken
@@ -63,10 +64,10 @@ class AggregateToken
     /**
      * Set feed
      *
-     * @param  Aggregate      $feed
+     * @param  Feed           $feed
      * @return AggregateToken
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->aggregatedFeed = $feed;
 

lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php

@@ -6,7 +6,7 @@ use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\Feed\FeedInterface;
 use Alchemy\Phrasea\Feed\Link\FeedLink;
-use Entities\AggregateToken;
+use Alchemy\Phrasea\Model\Entities\AggregateToken;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
@@ -122,7 +122,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
     private function getAggregateToken(\User_Adapter $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Entities\AggregateToken')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
             ->findOneBy(array('usrId' => $user->get_id()));
 
         if (null === $token || true === $renew) {

lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php

@@ -14,8 +14,8 @@ namespace Alchemy\Phrasea\Feed\Link;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Feed\FeedInterface;
 use Doctrine\ORM\EntityManager;
-use Entities\Feed;
+use Alchemy\Phrasea\Model\Entities\Feed;
-use Entities\FeedToken;
+use Alchemy\Phrasea\Model\Entities\FeedToken;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
 class FeedLinkGenerator implements LinkGeneratorInterface
@@ -138,7 +138,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
     private function getFeedToken(Feed $feed, \User_Adapter $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Entities\FeedToken')
+            ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
             ->findOneBy(array('usrId' => $user->get_id(), 'feed' => $feed->getId()));
 
         if (null === $token || true === $renew) {

lib/Alchemy/Phrasea/Helper/Record/Helper.php

@@ -12,6 +12,7 @@
 namespace Alchemy\Phrasea\Helper\Record;
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -94,8 +95,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
     protected $is_basket = false;
 
     /**
-     *
+     * @var Basket
-     * @var \Entities\Basket
      */
     protected $original_basket;
 
@@ -113,7 +113,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
         $this->selection = new \set_selection($app);
 
         if (trim($Request->get('ssel')) !== '') {
-            $repository = $app['EM']->getRepository('\Entities\Basket');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
             /* @var $$repository \Repositories\BasketRepository */
             $Basket = $repository->findUserBasket($this->app, $Request->get('ssel'), $app['authentication']->getUser(), false);
@@ -123,7 +123,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
             $this->is_basket = true;
             $this->original_basket = $Basket;
         } elseif (trim($Request->get('story')) !== '') {
-            $repository = $app['EM']->getRepository('\Entities\StoryWZ');
+            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
             $storyWZ = $repository->findByUserAndId($app, $app['authentication']->getUser(), $Request->get('story'));
 
@@ -154,7 +154,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
     /**
      * If the original selection was a basket, returns the basket object
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function get_original_basket()
     {

lib/Alchemy/Phrasea/Helper/WorkZone.php

@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Helper;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\Basket as BasketEntity;
+use Alchemy\Phrasea\Model\Entities\Basket as BasketEntity;
 
 /**
  *
@@ -42,7 +42,7 @@ class WorkZone extends Helper
     public function getContent($sort)
     {
         /* @var $repo_baskets \Doctrine\Repositories\BasketRepository */
-        $repo_baskets = $this->app['EM']->getRepository('Entities\Basket');
+        $repo_baskets = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
 
         $sort = in_array($sort, array('date', 'name')) ? $sort : 'name';
 
@@ -65,7 +65,7 @@ class WorkZone extends Helper
         $validations = $repo_baskets->findActiveValidationByUser($this->app['authentication']->getUser(), $sort);
 
         /* @var $repo_stories \Doctrine\Repositories\StoryWZRepository */
-        $repo_stories = $this->app['EM']->getRepository('Entities\StoryWZ');
+        $repo_stories = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
 
         $stories = $repo_stories->findByUser($this->app, $this->app['authentication']->getUser(), $sort);
 

lib/Alchemy/Phrasea/Model/Entities/AggregateToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

lib/Alchemy/Phrasea/Model/Entities/Basket.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -319,10 +319,10 @@ class Basket
     /**
      * Set validation
      *
-     * @param  \Entities\ValidationSession $validation
+     * @param  ValidationSession $validation
      * @return Basket
      */
-    public function setValidation(\Entities\ValidationSession $validation = null)
+    public function setValidation(ValidationSession $validation = null)
     {
         $this->validation = $validation;
 
@@ -332,7 +332,7 @@ class Basket
     /**
      * Get validation
      *
-     * @return \Entities\ValidationSession
+     * @return ValidationSession
      */
     public function getValidation()
     {
@@ -342,10 +342,10 @@ class Basket
     /**
      * Add elements
      *
-     * @param  \Entities\BasketElement $elements
+     * @param  BasketElement $elements
      * @return Basket
      */
-    public function addElement(\Entities\BasketElement $elements)
+    public function addElement(BasketElement $elements)
     {
         $this->elements[] = $elements;
 
@@ -355,9 +355,9 @@ class Basket
     /**
      * Remove elements
      *
-     * @param \Entities\BasketElement $elements
+     * @param BasketElement $elements
      */
-    public function removeElement(\Entities\BasketElement $elements)
+    public function removeElement(BasketElement $elements)
     {
         $this->elements->removeElement($elements);
     }
@@ -365,10 +365,10 @@ class Basket
     /**
      * Set order
      *
-     * @param  \Entities\Order $order
+     * @param  Order $order
      * @return Basket
      */
-    public function setOrder(\Entities\Order $order = null)
+    public function setOrder(Order $order = null)
     {
         $this->order = $order;
 
@@ -378,7 +378,7 @@ class Basket
     /**
      * Get order
      *
-     * @return \Entities\Order
+     * @return Order
      */
     public function getOrder()
     {

lib/Alchemy/Phrasea/Model/Entities/BasketElement.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -214,10 +214,10 @@ class BasketElement
     /**
      * Add validation_datas
      *
-     * @param  \Entities\ValidationData $validationDatas
+     * @param  ValidationData $validationDatas
      * @return BasketElement
      */
-    public function addValidationData(\Entities\ValidationData $validationDatas)
+    public function addValidationData(ValidationData $validationDatas)
     {
         $this->validation_datas[] = $validationDatas;
 
@@ -227,9 +227,9 @@ class BasketElement
     /**
      * Remove validation_datas
      *
-     * @param \Entities\ValidationData $validationDatas
+     * @param ValidationData $validationDatas
      */
-    public function removeValidationData(\Entities\ValidationData $validationDatas)
+    public function removeValidationData(ValidationData $validationDatas)
     {
         $this->validation_datas->removeElement($validationDatas);
     }
@@ -247,10 +247,10 @@ class BasketElement
     /**
      * Set basket
      *
-     * @param  \Entities\Basket $basket
+     * @param  Basket $basket
      * @return BasketElement
      */
-    public function setBasket(\Entities\Basket $basket = null)
+    public function setBasket(Basket $basket = null)
     {
         $this->basket = $basket;
 
@@ -260,7 +260,7 @@ class BasketElement
     /**
      * Get basket
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function getBasket()
     {
@@ -278,7 +278,7 @@ class BasketElement
     /**
      *
      * @param  \User_Adapter            $user
-     * @return \Entities\ValidationData
+     * @return ValidationData
      */
     public function getUserValidationDatas(\User_Adapter $user, Application $app)
     {

lib/Alchemy/Phrasea/Model/Entities/Feed.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Feed\FeedInterface;
@@ -196,10 +196,10 @@ class Feed implements FeedInterface
     /**
      * Add publishers
      *
-     * @param  \Entities\FeedPublisher $publishers
+     * @param  FeedPublisher $publishers
      * @return Feed
      */
-    public function addPublisher(\Entities\FeedPublisher $publishers)
+    public function addPublisher(FeedPublisher $publishers)
     {
         $this->publishers[] = $publishers;
 
@@ -209,9 +209,9 @@ class Feed implements FeedInterface
     /**
      * Remove publishers
      *
-     * @param \Entities\FeedPublisher $publishers
+     * @param FeedPublisher $publishers
      */
-    public function removePublisher(\Entities\FeedPublisher $publishers)
+    public function removePublisher(FeedPublisher $publishers)
     {
         $this->publishers->removeElement($publishers);
     }
@@ -229,10 +229,10 @@ class Feed implements FeedInterface
     /**
      * Add entries
      *
-     * @param  \Entities\FeedEntry $entries
+     * @param  FeedEntry $entries
      * @return Feed
      */
-    public function addEntry(\Entities\FeedEntry $entries)
+    public function addEntry(FeedEntry $entries)
     {
         $this->entries[] = $entries;
 
@@ -242,9 +242,9 @@ class Feed implements FeedInterface
     /**
      * Remove entries
      *
-     * @param \Entities\FeedEntry $entries
+     * @param FeedEntry $entries
      */
-    public function removeEntry(\Entities\FeedEntry $entries)
+    public function removeEntry(FeedEntry $entries)
     {
         $this->entries->removeElement($entries);
     }
@@ -470,10 +470,10 @@ class Feed implements FeedInterface
     /**
      * Add tokens
      *
-     * @param  \Entities\FeedToken $tokens
+     * @param  FeedToken $tokens
      * @return Feed
      */
-    public function addToken(\Entities\FeedToken $tokens)
+    public function addToken(FeedToken $tokens)
     {
         $this->tokens[] = $tokens;
 
@@ -483,9 +483,9 @@ class Feed implements FeedInterface
     /**
      * Remove tokens
      *
-     * @param \Entities\FeedToken $tokens
+     * @param FeedToken $tokens
      */
-    public function removeToken(\Entities\FeedToken $tokens)
+    public function removeToken(FeedToken $tokens)
     {
         $this->tokens->removeElement($tokens);
     }
@@ -503,10 +503,10 @@ class Feed implements FeedInterface
     /**
      * Add entries
      *
-     * @param  \Entities\FeedEntry $entries
+     * @param  FeedEntry $entries
      * @return Feed
      */
-    public function addEntrie(\Entities\FeedEntry $entries)
+    public function addEntrie(FeedEntry $entries)
     {
         $this->entries[] = $entries;
 
@@ -516,9 +516,9 @@ class Feed implements FeedInterface
     /**
      * Remove entries
      *
-     * @param \Entities\FeedEntry $entries
+     * @param FeedEntry $entries
      */
-    public function removeEntrie(\Entities\FeedEntry $entries)
+    public function removeEntrie(FeedEntry $entries)
     {
         $this->entries->removeElement($entries);
     }

lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -236,10 +236,10 @@ class FeedEntry
     /**
      * Add items
      *
-     * @param  \Entities\FeedItem $items
+     * @param  FeedItem $items
      * @return FeedEntry
      */
-    public function addItem(\Entities\FeedItem $items)
+    public function addItem(FeedItem $items)
     {
         $this->items[] = $items;
 
@@ -249,9 +249,9 @@ class FeedEntry
     /**
      * Remove items
      *
-     * @param \Entities\FeedItem $items
+     * @param FeedItem $items
      */
-    public function removeItem(\Entities\FeedItem $items)
+    public function removeItem(FeedItem $items)
     {
         $this->items->removeElement($items);
     }
@@ -269,10 +269,10 @@ class FeedEntry
     /**
      * Set publisher
      *
-     * @param  \Entities\FeedPublisher $publisher
+     * @param  FeedPublisher $publisher
      * @return FeedEntry
      */
-    public function setPublisher(\Entities\FeedPublisher $publisher = null)
+    public function setPublisher(FeedPublisher $publisher = null)
     {
         $this->publisher = $publisher;
 
@@ -282,7 +282,7 @@ class FeedEntry
     /**
      * Get publisher
      *
-     * @return \Entities\FeedPublisher
+     * @return FeedPublisher
      */
     public function getPublisher()
     {
@@ -292,10 +292,10 @@ class FeedEntry
     /**
      * Set feed
      *
-     * @param  \Entities\Feed $feed
+     * @param  Feed $feed
      * @return FeedEntry
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->feed = $feed;
 
@@ -305,7 +305,7 @@ class FeedEntry
     /**
      * Get feed
      *
-     * @return \Entities\Feed
+     * @return Feed
      */
     public function getFeed()
     {

lib/Alchemy/Phrasea/Model/Entities/FeedItem.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 
@@ -122,10 +122,10 @@ class FeedItem
     /**
      * Set entry
      *
-     * @param  \Entities\FeedEntry $entry
+     * @param  FeedEntry $entry
      * @return FeedItem
      */
-    public function setEntry(\Entities\FeedEntry $entry = null)
+    public function setEntry(FeedEntry $entry = null)
     {
         $this->entry = $entry;
 
@@ -135,7 +135,7 @@ class FeedItem
     /**
      * Get entry
      *
-     * @return \Entities\FeedEntry
+     * @return FeedEntry
      */
     public function getEntry()
     {

lib/Alchemy/Phrasea/Model/Entities/FeedPublisher.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -109,10 +109,10 @@ class FeedPublisher
     /**
      * Set feed
      *
-     * @param  \Entities\Feed $feed
+     * @param  Feed $feed
      * @return FeedPublisher
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->feed = $feed;
 
@@ -122,7 +122,7 @@ class FeedPublisher
     /**
      * Get feed
      *
-     * @return \Entities\Feed
+     * @return Feed
      */
     public function getFeed()
     {

lib/Alchemy/Phrasea/Model/Entities/FeedToken.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -79,10 +79,10 @@ class FeedToken
     /**
      * Set feed
      *
-     * @param  \Entities\Feed $feed
+     * @param  Feed $feed
      * @return FeedToken
      */
-    public function setFeed(\Entities\Feed $feed = null)
+    public function setFeed(Feed $feed = null)
     {
         $this->feed = $feed;
 
@@ -92,7 +92,7 @@ class FeedToken
     /**
      * Get feed
      *
-     * @return \Entities\Feed
+     * @return Feed
      */
     public function getFeed()
     {

lib/Alchemy/Phrasea/Model/Entities/FtpCredential.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

lib/Alchemy/Phrasea/Model/Entities/FtpExport.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\Common\Collections\ArrayCollection;

lib/Alchemy/Phrasea/Model/Entities/FtpExportElement.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -160,10 +160,10 @@ class LazaretAttribute
     /**
      * Set lazaretFile
      *
-     * @param  \Entities\LazaretFile $lazaretFile
+     * @param  LazaretFile $lazaretFile
      * @return LazaretAttribute
      */
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
+    public function setLazaretFile(LazaretFile $lazaretFile = null)
     {
         $this->lazaretFile = $lazaretFile;
 
@@ -173,7 +173,7 @@ class LazaretAttribute
     /**
      * Get lazaretFile
      *
-     * @return \Entities\LazaretFile
+     * @return LazaretFile
      */
     public function getLazaretFile()
     {

lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -73,10 +73,10 @@ class LazaretCheck
     /**
      * Set lazaretFile
      *
-     * @param  \Entities\LazaretFile $lazaretFile
+     * @param  LazaretFile $lazaretFile
      * @return LazaretCheck
      */
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
+    public function setLazaretFile(LazaretFile $lazaretFile = null)
     {
         $this->lazaretFile = $lazaretFile;
 
@@ -86,7 +86,7 @@ class LazaretCheck
     /**
      * Get lazaretFile
      *
-     * @return \Entities\LazaretFile
+     * @return LazaretFile
      */
     public function getLazaretFile()
     {

lib/Alchemy/Phrasea/Model/Entities/LazaretFile.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -332,10 +332,10 @@ class LazaretFile
     /**
      * Add attributes
      *
-     * @param  \Entities\LazaretAttribute $attributes
+     * @param  LazaretAttribute $attributes
      * @return LazaretFile
      */
-    public function addAttribute(\Entities\LazaretAttribute $attributes)
+    public function addAttribute(LazaretAttribute $attributes)
     {
         $this->attributes[] = $attributes;
 
@@ -345,9 +345,9 @@ class LazaretFile
     /**
      * Remove attributes
      *
-     * @param \Entities\LazaretAttribute $attributes
+     * @param LazaretAttribute $attributes
      */
-    public function removeAttribute(\Entities\LazaretAttribute $attributes)
+    public function removeAttribute(LazaretAttribute $attributes)
     {
         $this->attributes->removeElement($attributes);
     }
@@ -365,10 +365,10 @@ class LazaretFile
     /**
      * Add checks
      *
-     * @param  \Entities\LazaretCheck $checks
+     * @param  LazaretCheck $checks
      * @return LazaretFile
      */
-    public function addCheck(\Entities\LazaretCheck $checks)
+    public function addCheck(LazaretCheck $checks)
     {
         $this->checks[] = $checks;
 
@@ -378,9 +378,9 @@ class LazaretFile
     /**
      * Remove checks
      *
-     * @param \Entities\LazaretCheck $checks
+     * @param LazaretCheck $checks
      */
-    public function removeCheck(\Entities\LazaretCheck $checks)
+    public function removeCheck(LazaretCheck $checks)
     {
         $this->checks->removeElement($checks);
     }
@@ -398,10 +398,10 @@ class LazaretFile
     /**
      * Set session
      *
-     * @param  \Entities\LazaretSession $session
+     * @param  LazaretSession $session
      * @return LazaretFile
      */
-    public function setSession(\Entities\LazaretSession $session = null)
+    public function setSession(LazaretSession $session = null)
     {
         $this->session = $session;
 
@@ -411,7 +411,7 @@ class LazaretFile
     /**
      * Get session
      *
-     * @return \Entities\LazaretSession
+     * @return LazaretSession
      */
     public function getSession()
     {

lib/Alchemy/Phrasea/Model/Entities/LazaretSession.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -159,10 +159,10 @@ class LazaretSession
     /**
      * Add files
      *
-     * @param  \Entities\LazaretFile $files
+     * @param  LazaretFile $files
      * @return LazaretSession
      */
-    public function addFile(\Entities\LazaretFile $files)
+    public function addFile(LazaretFile $files)
     {
         $this->files[] = $files;
 
@@ -172,9 +172,9 @@ class LazaretSession
     /**
      * Remove files
      *
-     * @param \Entities\LazaretFile $files
+     * @param LazaretFile $files
      */
-    public function removeFile(\Entities\LazaretFile $files)
+    public function removeFile(LazaretFile $files)
     {
         $this->files->removeElement($files);
     }

lib/Alchemy/Phrasea/Model/Entities/Order.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -145,10 +145,10 @@ class Order
     /**
      * Add elements
      *
-     * @param  \Entities\OrderElement $elements
+     * @param  OrderElement $elements
      * @return Order
      */
-    public function addElement(\Entities\OrderElement $elements)
+    public function addElement(OrderElement $elements)
     {
         $this->elements[] = $elements;
 
@@ -158,9 +158,9 @@ class Order
     /**
      * Remove elements
      *
-     * @param \Entities\OrderElement $elements
+     * @param OrderElement $elements
      */
-    public function removeElement(\Entities\OrderElement $elements)
+    public function removeElement(OrderElement $elements)
     {
         $this->elements->removeElement($elements);
     }
@@ -248,10 +248,10 @@ class Order
     /**
      * Set basket
      *
-     * @param  \Entities\Basket $basket
+     * @param  Basket $basket
      * @return Order
      */
-    public function setBasket(\Entities\Basket $basket = null)
+    public function setBasket(Basket $basket = null)
     {
         $this->basket = $basket;
 
@@ -261,7 +261,7 @@ class Order
     /**
      * Get basket
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function getBasket()
     {

lib/Alchemy/Phrasea/Model/Entities/OrderElement.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
-use Entities\Order;
+use Alchemy\Phrasea\Model\Entities\Order;
 
 /**
  * @ORM\Table(name="OrderElements", uniqueConstraints={@ORM\UniqueConstraint(name="unique_ordercle", columns={"base_id","record_id","order_id"})})

lib/Alchemy/Phrasea/Model/Entities/Session.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -405,10 +405,10 @@ class Session
     /**
      * Add modules
      *
-     * @param  \Entities\SessionModule $modules
+     * @param  SessionModule $modules
      * @return Session
      */
-    public function addModule(\Entities\SessionModule $modules)
+    public function addModule(SessionModule $modules)
     {
         $this->modules[] = $modules;
 
@@ -418,9 +418,9 @@ class Session
     /**
      * Remove modules
      *
-     * @param \Entities\SessionModule $modules
+     * @param SessionModule $modules
      */
-    public function removeModule(\Entities\SessionModule $modules)
+    public function removeModule(SessionModule $modules)
     {
         $this->modules->removeElement($modules);
     }
@@ -439,7 +439,7 @@ class Session
      * Get a module by its identifier
      *
      * @param  integer                     $moduleId
-     * @return Entities\SessionModule|null
+     * @return Alchemy\Phrasea\Model\Entities\SessionModule|null
      */
     public function getModuleById($moduleId)
     {

lib/Alchemy/Phrasea/Model/Entities/SessionModule.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -132,10 +132,10 @@ class SessionModule
     /**
      * Set session
      *
-     * @param  \Entities\Session $session
+     * @param  Session $session
      * @return SessionModule
      */
-    public function setSession(\Entities\Session $session = null)
+    public function setSession(Session $session = null)
     {
         $this->session = $session;
 
@@ -145,7 +145,7 @@ class SessionModule
     /**
      * Get session
      *
-     * @return \Entities\Session
+     * @return Session
      */
     public function getSession()
     {

lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 

lib/Alchemy/Phrasea/Model/Entities/User.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;

lib/Alchemy/Phrasea/Model/Entities/UserNotificationSetting.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;

lib/Alchemy/Phrasea/Model/Entities/UserQuery.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;

lib/Alchemy/Phrasea/Model/Entities/UserSetting.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;

lib/Alchemy/Phrasea/Model/Entities/UsrAuthProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;

lib/Alchemy/Phrasea/Model/Entities/UsrList.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -146,10 +146,10 @@ class UsrList
     /**
      * Add owners
      *
-     * @param  \Entities\UsrListOwner $owners
+     * @param  UsrListOwner $owners
      * @return UsrList
      */
-    public function addOwner(\Entities\UsrListOwner $owners)
+    public function addOwner(UsrListOwner $owners)
     {
         $this->owners[] = $owners;
 
@@ -159,9 +159,9 @@ class UsrList
     /**
      * Remove owners
      *
-     * @param \Entities\UsrListOwner $owners
+     * @param UsrListOwner $owners
      */
-    public function removeOwner(\Entities\UsrListOwner $owners)
+    public function removeOwner(UsrListOwner $owners)
     {
         $this->owners->removeElement($owners);
     }
@@ -179,10 +179,10 @@ class UsrList
     /**
      * Add entries
      *
-     * @param  \Entities\UsrListEntry $entries
+     * @param  UsrListEntry $entries
      * @return UsrList
      */
-    public function addEntrie(\Entities\UsrListEntry $entries)
+    public function addEntrie(UsrListEntry $entries)
     {
         $this->entries[] = $entries;
 
@@ -192,9 +192,9 @@ class UsrList
     /**
      * Remove entries
      *
-     * @param \Entities\UsrListEntry $entries
+     * @param UsrListEntry $entries
      */
-    public function removeEntrie(\Entities\UsrListEntry $entries)
+    public function removeEntrie(UsrListEntry $entries)
     {
         $this->entries->removeElement($entries);
     }
@@ -223,7 +223,7 @@ class UsrList
     /**
      *
      * @param  \User_Adapter          $user
-     * @return \Entities\UsrListOwner
+     * @return UsrListOwner
      */
     public function getOwner(\User_Adapter $user, Application $app)
     {

lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -143,10 +143,10 @@ class UsrListEntry
     /**
      * Set list
      *
-     * @param  \Entities\UsrList $list
+     * @param  UsrList $list
      * @return UsrListEntry
      */
-    public function setList(\Entities\UsrList $list = null)
+    public function setList(UsrList $list = null)
     {
         $this->list = $list;
 
@@ -156,7 +156,7 @@ class UsrListEntry
     /**
      * Get list
      *
-     * @return \Entities\UsrList
+     * @return UsrList
      */
     public function getList()
     {

lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -178,10 +178,10 @@ class UsrListOwner
     /**
      * Set list
      *
-     * @param  \Entities\UsrList $list
+     * @param  UsrList $list
      * @return UsrListOwner
      */
-    public function setList(\Entities\UsrList $list = null)
+    public function setList(UsrList $list = null)
     {
         $this->list = $list;
 
@@ -191,7 +191,7 @@ class UsrListOwner
     /**
      * Get list
      *
-     * @return \Entities\UsrList
+     * @return UsrList
      */
     public function getList()
     {

lib/Alchemy/Phrasea/Model/Entities/ValidationData.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -137,10 +137,10 @@ class ValidationData
     /**
      * Set participant
      *
-     * @param  \Entities\ValidationParticipant $participant
+     * @param  ValidationParticipant $participant
      * @return ValidationData
      */
-    public function setParticipant(\Entities\ValidationParticipant $participant = null)
+    public function setParticipant(ValidationParticipant $participant = null)
     {
         $this->participant = $participant;
 
@@ -150,7 +150,7 @@ class ValidationData
     /**
      * Get participant
      *
-     * @return \Entities\ValidationParticipant
+     * @return ValidationParticipant
      */
     public function getParticipant()
     {
@@ -160,10 +160,10 @@ class ValidationData
     /**
      * Set basket_element
      *
-     * @param  \Entities\BasketElement $basketElement
+     * @param  BasketElement $basketElement
      * @return ValidationData
      */
-    public function setBasketElement(\Entities\BasketElement $basketElement = null)
+    public function setBasketElement(BasketElement $basketElement = null)
     {
         $this->basket_element = $basketElement;
 
@@ -173,7 +173,7 @@ class ValidationData
     /**
      * Get basket_element
      *
-     * @return \Entities\BasketElement
+     * @return BasketElement
      */
     public function getBasketElement()
     {

lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -244,10 +244,10 @@ class ValidationParticipant
     /**
      * Add datas
      *
-     * @param  \Entities\ValidationData $datas
+     * @param  ValidationData $datas
      * @return ValidationParticipant
      */
-    public function addData(\Entities\ValidationData $datas)
+    public function addData(ValidationData $datas)
     {
         $this->datas[] = $datas;
 
@@ -257,9 +257,9 @@ class ValidationParticipant
     /**
      * Remove datas
      *
-     * @param \Entities\ValidationData $datas
+     * @param ValidationData $datas
      */
-    public function removeData(\Entities\ValidationData $datas)
+    public function removeData(ValidationData $datas)
     {
         $this->datas->removeElement($datas);
     }
@@ -277,10 +277,10 @@ class ValidationParticipant
     /**
      * Set session
      *
-     * @param  \Entities\ValidationSession $session
+     * @param  ValidationSession $session
      * @return ValidationParticipant
      */
-    public function setSession(\Entities\ValidationSession $session = null)
+    public function setSession(ValidationSession $session = null)
     {
         $this->session = $session;
 
@@ -290,7 +290,7 @@ class ValidationParticipant
     /**
      * Get session
      *
-     * @return \Entities\ValidationSession
+     * @return ValidationSession
      */
     public function getSession()
     {
@@ -305,7 +305,7 @@ class ValidationParticipant
         }
 
         foreach ($this->getDatas() as $validation_data) {
-            /* @var $validation_data \Entities\ValidationData */
+            /* @var $validation_data ValidationData */
             if ($validation_data->getAgreement() === null) {
                 return false;
             }

lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Entities;
+namespace Alchemy\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Mapping as ORM;
@@ -194,10 +194,10 @@ class ValidationSession
     /**
      * Set basket
      *
-     * @param  \Entities\Basket  $basket
+     * @param  Basket  $basket
      * @return ValidationSession
      */
-    public function setBasket(\Entities\Basket $basket = null)
+    public function setBasket(Basket $basket = null)
     {
         $this->basket = $basket;
 
@@ -207,7 +207,7 @@ class ValidationSession
     /**
      * Get basket
      *
-     * @return \Entities\Basket
+     * @return Basket
      */
     public function getBasket()
     {
@@ -217,10 +217,10 @@ class ValidationSession
     /**
      * Add participants
      *
-     * @param  \Entities\ValidationParticipant $participants
+     * @param  ValidationParticipant $participants
      * @return ValidationSession
      */
-    public function addParticipant(\Entities\ValidationParticipant $participants)
+    public function addParticipant(ValidationParticipant $participants)
     {
         $this->participants[] = $participants;
 
@@ -230,9 +230,9 @@ class ValidationSession
     /**
      * Remove participants
      *
-     * @param \Entities\ValidationParticipant $participants
+     * @param ValidationParticipant $participants
      */
-    public function removeParticipant(\Entities\ValidationParticipant $participants)
+    public function removeParticipant(ValidationParticipant $participants)
     {
         $this->participants->removeElement($participants);
     }
@@ -291,7 +291,7 @@ class ValidationSession
     /**
      * Get a participant
      *
-     * @return Entities\ValidationParticipant
+     * @return Alchemy\Phrasea\Model\Entities\ValidationParticipant
      */
     public function getParticipant(\User_Adapter $user, Application $app)
     {

lib/Alchemy/Phrasea/Model/Manager/UserManager.php

@@ -13,8 +13,8 @@ namespace Alchemy\Phrasea\Model\Manager;
 
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Doctrine\Common\Persistence\ObjectManager;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
-use Entities\UserSetting;
+use Alchemy\Phrasea\Model\Entities\UserSetting;
 
 class UserManager
 {
@@ -137,7 +137,7 @@ class UserManager
      */
     private function cleanFtpExports(User $user)
     {
-       $elements = $this->objectManager->getRepository('Entities\FtpExport')
+       $elements = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
                ->findBy(array('usrId' => $user->getId()));
 
        foreach($elements as $element) {
@@ -152,7 +152,7 @@ class UserManager
      */
     private function cleanOrders(User $user)
     {
-       $orders = $this->objectManager->getRepository('Entities\Order')
+       $orders = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Order')
                ->findBy(array('usrId' => $user->getId()));
 
        foreach($orders as $order) {

lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php

@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Model\Manager\UserManager;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Doctrine\Common\Persistence\ObjectManager;
-use Entities\User;
+use Alchemy\Phrasea\Model\Entities\User;
 use Repositories\UserRepository;
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
 
@@ -45,7 +45,7 @@ class UserManipulator implements ManipulatorInterface
      */
     public function getRepository()
     {
-        return $this->manager->getObjectManager()->getRepository('Entities\User');
+        return $this->manager->getObjectManager()->getRepository('Alchemy\Phrasea\Model\Entities\User');
     }
 
     /**

lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Notification\Mail;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Alchemy\Phrasea\Exception\LogicException;
 
 class MailInfoOrderDelivered extends AbstractMail

lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Notification\Mail;
 
-use Entities\Basket;
+use Alchemy\Phrasea\Model\Entities\Basket;
 use Alchemy\Phrasea\Exception\LogicException;
 
 class MailInfoPushReceived extends AbstractMailWithLink
@@ -24,7 +24,7 @@ class MailInfoPushReceived extends AbstractMailWithLink
     /**
      * Sets the basket
      *
-     * @param \Entities\Basket $basket
+     * @param Basket $basket
      */
     public function setBasket(Basket $basket)
     {

lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php

@@ -18,7 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
 
 class PhraseaEngine implements SearchEngineInterface
 {

lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php

@@ -16,7 +16,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
 
 interface SearchEngineInterface
 {

lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php

@@ -18,7 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entities\FeedEntry;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\Process;
 

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAggregateToken.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class AggregateToken extends \Entities\AggregateToken implements \Doctrine\ORM\Proxy\Proxy
+class AggregateToken extends \Alchemy\Phrasea\Model\Entities\AggregateToken implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesAuthFailure.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class AuthFailure extends \Entities\AuthFailure implements \Doctrine\ORM\Proxy\Proxy
+class AuthFailure extends \Alchemy\Phrasea\Model\Entities\AuthFailure implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
+class Basket extends \Alchemy\Phrasea\Model\Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -171,7 +171,7 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function setValidation(\Entities\ValidationSession $validation = NULL)
+    public function setValidation(\Alchemy\Phrasea\Model\Entities\ValidationSession $validation = NULL)
     {
         $this->__load();
         return parent::setValidation($validation);
@@ -183,19 +183,19 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
         return parent::getValidation();
     }
 
-    public function addElement(\Entities\BasketElement $elements)
+    public function addElement(\Alchemy\Phrasea\Model\Entities\BasketElement $elements)
     {
         $this->__load();
         return parent::addElement($elements);
     }
 
-    public function removeElement(\Entities\BasketElement $elements)
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\BasketElement $elements)
     {
         $this->__load();
         return parent::removeElement($elements);
     }
 
-    public function setOrder(\Entities\Order $order = NULL)
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
     {
         $this->__load();
         return parent::setOrder($order);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesBasketElement.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Proxy\Proxy
+class BasketElement extends \Alchemy\Phrasea\Model\Entities\BasketElement implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -123,13 +123,13 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
         return parent::getUpdated();
     }
 
-    public function addValidationData(\Entities\ValidationData $validationDatas)
+    public function addValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
     {
         $this->__load();
         return parent::addValidationData($validationDatas);
     }
 
-    public function removeValidationData(\Entities\ValidationData $validationDatas)
+    public function removeValidationData(\Alchemy\Phrasea\Model\Entities\ValidationData $validationDatas)
     {
         $this->__load();
         return parent::removeValidationData($validationDatas);
@@ -141,7 +141,7 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
         return parent::getValidationDatas();
     }
 
-    public function setBasket(\Entities\Basket $basket = NULL)
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
     {
         $this->__load();
         return parent::setBasket($basket);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeed.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
+class Feed extends \Alchemy\Phrasea\Model\Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -99,13 +99,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::getTitle();
     }
 
-    public function addPublisher(\Entities\FeedPublisher $publishers)
+    public function addPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
     {
         $this->__load();
         return parent::addPublisher($publishers);
     }
 
-    public function removePublisher(\Entities\FeedPublisher $publishers)
+    public function removePublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publishers)
     {
         $this->__load();
         return parent::removePublisher($publishers);
@@ -117,13 +117,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::getPublishers();
     }
 
-    public function addEntry(\Entities\FeedEntry $entries)
+    public function addEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::addEntry($entries);
     }
 
-    public function removeEntry(\Entities\FeedEntry $entries)
+    public function removeEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::removeEntry($entries);
@@ -225,13 +225,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::hasAccess($user, $app);
     }
 
-    public function addToken(\Entities\FeedToken $tokens)
+    public function addToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
     {
         $this->__load();
         return parent::addToken($tokens);
     }
 
-    public function removeToken(\Entities\FeedToken $tokens)
+    public function removeToken(\Alchemy\Phrasea\Model\Entities\FeedToken $tokens)
     {
         $this->__load();
         return parent::removeToken($tokens);
@@ -243,13 +243,13 @@ class Feed extends \Entities\Feed implements \Doctrine\ORM\Proxy\Proxy
         return parent::getTokens();
     }
 
-    public function addEntrie(\Entities\FeedEntry $entries)
+    public function addEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::addEntrie($entries);
     }
 
-    public function removeEntrie(\Entities\FeedEntry $entries)
+    public function removeEntrie(\Alchemy\Phrasea\Model\Entities\FeedEntry $entries)
     {
         $this->__load();
         return parent::removeEntrie($entries);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedEntry.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
+class FeedEntry extends \Alchemy\Phrasea\Model\Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -123,13 +123,13 @@ class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdatedOn();
     }
 
-    public function addItem(\Entities\FeedItem $items)
+    public function addItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items)
     {
         $this->__load();
         return parent::addItem($items);
     }
 
-    public function removeItem(\Entities\FeedItem $items)
+    public function removeItem(\Alchemy\Phrasea\Model\Entities\FeedItem $items)
     {
         $this->__load();
         return parent::removeItem($items);
@@ -141,7 +141,7 @@ class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
         return parent::getItems();
     }
 
-    public function setPublisher(\Entities\FeedPublisher $publisher = NULL)
+    public function setPublisher(\Alchemy\Phrasea\Model\Entities\FeedPublisher $publisher = NULL)
     {
         $this->__load();
         return parent::setPublisher($publisher);
@@ -153,7 +153,7 @@ class FeedEntry extends \Entities\FeedEntry implements \Doctrine\ORM\Proxy\Proxy
         return parent::getPublisher();
     }
 
-    public function setFeed(\Entities\Feed $feed = NULL)
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
     {
         $this->__load();
         return parent::setFeed($feed);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedItem.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedItem extends \Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
+class FeedItem extends \Alchemy\Phrasea\Model\Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -75,7 +75,7 @@ class FeedItem extends \Entities\FeedItem implements \Doctrine\ORM\Proxy\Proxy
         return parent::getSbasId();
     }
 
-    public function setEntry(\Entities\FeedEntry $entry = NULL)
+    public function setEntry(\Alchemy\Phrasea\Model\Entities\FeedEntry $entry = NULL)
     {
         $this->__load();
         return parent::setEntry($entry);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedPublisher.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedPublisher extends \Entities\FeedPublisher implements \Doctrine\ORM\Proxy\Proxy
+class FeedPublisher extends \Alchemy\Phrasea\Model\Entities\FeedPublisher implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -75,7 +75,7 @@ class FeedPublisher extends \Entities\FeedPublisher implements \Doctrine\ORM\Pro
         return parent::isOwner();
     }
 
-    public function setFeed(\Entities\Feed $feed = NULL)
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
     {
         $this->__load();
         return parent::setFeed($feed);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFeedToken.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FeedToken extends \Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
+class FeedToken extends \Alchemy\Phrasea\Model\Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -63,7 +63,7 @@ class FeedToken extends \Entities\FeedToken implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUsrId();
     }
 
-    public function setFeed(\Entities\Feed $feed = NULL)
+    public function setFeed(\Alchemy\Phrasea\Model\Entities\Feed $feed = NULL)
     {
         $this->__load();
         return parent::setFeed($feed);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpCredential.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Proxy\Proxy
+class FtpCredential extends \Alchemy\Phrasea\Model\Entities\FtpCredential implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -51,12 +51,6 @@ class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Pro
         return parent::getId();
     }
 
-    public function getUser(\Alchemy\Phrasea\Application $app)
-    {
-        $this->__load();
-        return parent::getUser($app);
-    }
-
     public function getUsrId()
     {
         $this->__load();
@@ -69,6 +63,18 @@ class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Pro
         return parent::setUsrId($usrId);
     }
 
+    public function getUser()
+    {
+        $this->__load();
+        return parent::getUser();
+    }
+
+    public function setUser(\Alchemy\Phrasea\Model\Entities\User $user)
+    {
+        $this->__load();
+        return parent::setUser($user);
+    }
+
     public function isActive()
     {
         $this->__load();
@@ -192,7 +198,7 @@ class FtpCredential extends \Entities\FtpCredential implements \Doctrine\ORM\Pro
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'usrId', 'active', 'address', 'login', 'password', 'receptionFolder', 'repositoryPrefixName', 'passive', 'ssl', 'maxRetry', 'updated');
+        return array('__isInitialized__', 'id', 'usrId', 'active', 'address', 'login', 'password', 'receptionFolder', 'repositoryPrefixName', 'passive', 'ssl', 'maxRetry', 'updated', 'user');
     }
 
     public function __clone()

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExport.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
+class FtpExport extends \Alchemy\Phrasea\Model\Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -249,7 +249,7 @@ class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
         return parent::isLogfile();
     }
 
-    public function setCreated($created)
+    public function setCreated(\DateTime $created)
     {
         $this->__load();
         return parent::setCreated($created);
@@ -261,7 +261,7 @@ class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
         return parent::getCreated();
     }
 
-    public function setUpdated($updated)
+    public function setUpdated(\DateTime $updated)
     {
         $this->__load();
         return parent::setUpdated($updated);
@@ -273,13 +273,13 @@ class FtpExport extends \Entities\FtpExport implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function addElement(\Entities\FtpExportElement $elements)
+    public function addElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements)
     {
         $this->__load();
         return parent::addElement($elements);
     }
 
-    public function removeElement(\Entities\FtpExportElement $elements)
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\FtpExportElement $elements)
     {
         $this->__load();
         return parent::removeElement($elements);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesFtpExportElement.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\ORM\Proxy\Proxy
+class FtpExportElement extends \Alchemy\Phrasea\Model\Entities\FtpExportElement implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -147,7 +147,7 @@ class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\O
         return parent::isBusinessfields();
     }
 
-    public function setCreated($created)
+    public function setCreated(\DateTime $created)
     {
         $this->__load();
         return parent::setCreated($created);
@@ -159,7 +159,7 @@ class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\O
         return parent::getCreated();
     }
 
-    public function setUpdated($updated)
+    public function setUpdated(\DateTime $updated)
     {
         $this->__load();
         return parent::setUpdated($updated);
@@ -171,7 +171,7 @@ class FtpExportElement extends \Entities\FtpExportElement implements \Doctrine\O
         return parent::getUpdated();
     }
 
-    public function setExport(\Entities\FtpExport $export = NULL)
+    public function setExport(\Alchemy\Phrasea\Model\Entities\FtpExport $export = NULL)
     {
         $this->__load();
         return parent::setExport($export);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretAttribute.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\ORM\Proxy\Proxy
+class LazaretAttribute extends \Alchemy\Phrasea\Model\Entities\LazaretAttribute implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -99,7 +99,7 @@ class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\O
         return parent::getUpdated();
     }
 
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
+    public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL)
     {
         $this->__load();
         return parent::setLazaretFile($lazaretFile);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretCheck.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy\Proxy
+class LazaretCheck extends \Alchemy\Phrasea\Model\Entities\LazaretCheck implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -63,7 +63,7 @@ class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy
         return parent::getCheckClassname();
     }
 
-    public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
+    public function setLazaretFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $lazaretFile = NULL)
     {
         $this->__load();
         return parent::setLazaretFile($lazaretFile);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\Proxy
+class LazaretFile extends \Alchemy\Phrasea\Model\Entities\LazaretFile implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -165,13 +165,13 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
         return parent::getUpdated();
     }
 
-    public function addAttribute(\Entities\LazaretAttribute $attributes)
+    public function addAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes)
     {
         $this->__load();
         return parent::addAttribute($attributes);
     }
 
-    public function removeAttribute(\Entities\LazaretAttribute $attributes)
+    public function removeAttribute(\Alchemy\Phrasea\Model\Entities\LazaretAttribute $attributes)
     {
         $this->__load();
         return parent::removeAttribute($attributes);
@@ -183,13 +183,13 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
         return parent::getAttributes();
     }
 
-    public function addCheck(\Entities\LazaretCheck $checks)
+    public function addCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
     {
         $this->__load();
         return parent::addCheck($checks);
     }
 
-    public function removeCheck(\Entities\LazaretCheck $checks)
+    public function removeCheck(\Alchemy\Phrasea\Model\Entities\LazaretCheck $checks)
     {
         $this->__load();
         return parent::removeCheck($checks);
@@ -201,7 +201,7 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
         return parent::getChecks();
     }
 
-    public function setSession(\Entities\LazaretSession $session = NULL)
+    public function setSession(\Alchemy\Phrasea\Model\Entities\LazaretSession $session = NULL)
     {
         $this->__load();
         return parent::setSession($session);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesLazaretSession.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\Proxy\Proxy
+class LazaretSession extends \Alchemy\Phrasea\Model\Entities\LazaretSession implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -93,13 +93,13 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
         return parent::getUpdated();
     }
 
-    public function addFile(\Entities\LazaretFile $files)
+    public function addFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files)
     {
         $this->__load();
         return parent::addFile($files);
     }
 
-    public function removeFile(\Entities\LazaretFile $files)
+    public function removeFile(\Alchemy\Phrasea\Model\Entities\LazaretFile $files)
     {
         $this->__load();
         return parent::removeFile($files);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Order extends \Entities\Order implements \Doctrine\ORM\Proxy\Proxy
+class Order extends \Alchemy\Phrasea\Model\Entities\Order implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -87,13 +87,13 @@ class Order extends \Entities\Order implements \Doctrine\ORM\Proxy\Proxy
         return parent::getCreatedOn();
     }
 
-    public function addElement(\Entities\OrderElement $elements)
+    public function addElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements)
     {
         $this->__load();
         return parent::addElement($elements);
     }
 
-    public function removeElement(\Entities\OrderElement $elements)
+    public function removeElement(\Alchemy\Phrasea\Model\Entities\OrderElement $elements)
     {
         $this->__load();
         return parent::removeElement($elements);
@@ -141,7 +141,7 @@ class Order extends \Entities\Order implements \Doctrine\ORM\Proxy\Proxy
         return parent::getOrderUsage();
     }
 
-    public function setBasket(\Entities\Basket $basket = NULL)
+    public function setBasket(\Alchemy\Phrasea\Model\Entities\Basket $basket = NULL)
     {
         $this->__load();
         return parent::setBasket($basket);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesOrderElement.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class OrderElement extends \Entities\OrderElement implements \Doctrine\ORM\Proxy\Proxy
+class OrderElement extends \Alchemy\Phrasea\Model\Entities\OrderElement implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -81,7 +81,7 @@ class OrderElement extends \Entities\OrderElement implements \Doctrine\ORM\Proxy
         return parent::getDeny();
     }
 
-    public function setOrder(\Entities\Order $order = NULL)
+    public function setOrder(\Alchemy\Phrasea\Model\Entities\Order $order = NULL)
     {
         $this->__load();
         return parent::setOrder($order);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSession.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class Session extends \Entities\Session implements \Doctrine\ORM\Proxy\Proxy
+class Session extends \Alchemy\Phrasea\Model\Entities\Session implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -207,13 +207,13 @@ class Session extends \Entities\Session implements \Doctrine\ORM\Proxy\Proxy
         return parent::getUpdated();
     }
 
-    public function addModule(\Entities\SessionModule $modules)
+    public function addModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules)
     {
         $this->__load();
         return parent::addModule($modules);
     }
 
-    public function removeModule(\Entities\SessionModule $modules)
+    public function removeModule(\Alchemy\Phrasea\Model\Entities\SessionModule $modules)
     {
         $this->__load();
         return parent::removeModule($modules);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesSessionModule.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class SessionModule extends \Entities\SessionModule implements \Doctrine\ORM\Proxy\Proxy
+class SessionModule extends \Alchemy\Phrasea\Model\Entities\SessionModule implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;
@@ -87,7 +87,7 @@ class SessionModule extends \Entities\SessionModule implements \Doctrine\ORM\Pro
         return parent::getUpdated();
     }
 
-    public function setSession(\Entities\Session $session = NULL)
+    public function setSession(\Alchemy\Phrasea\Model\Entities\Session $session = NULL)
     {
         $this->__load();
         return parent::setSession($session);

lib/Doctrine/Proxies/__CG__AlchemyPhraseaModelEntitiesStoryWZ.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Proxies\__CG__\Entities;
+namespace Proxies\__CG__\Alchemy\Phrasea\Model\Entities;
 
 /**
  * THIS CLASS WAS GENERATED BY THE DOCTRINE ORM. DO NOT EDIT THIS FILE.
  */
-class StoryWZ extends \Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
+class StoryWZ extends \Alchemy\Phrasea\Model\Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
 {
     private $_entityPersister;
     private $_identifier;