Merge branch 'stable/v0.9.9' into feature/v0.9.9/plugin

app/Resources/translations/elements.en.yml

@@ -9,6 +9,8 @@ noelements:
   
   sentence_filter_link_string: delete them.
   
+  nofound_anymore:      Share not found (maybe deleted by owner)
+  
 element:
   favorite:
     add:                Add to faves

app/Resources/translations/elements.fr.yml

@@ -8,6 +8,7 @@ noelements:
                          <br />Vous pouvez ajouter des tags ou
                          <a class="filter_clear_url" href="#" >%link_string%</a>.
   sentence_filter_link_string: les retirer
+  nofound_anymore:      Le partage est introuvable (il peut avoir été supprimé par son auteur)
   
 element:
   favorite:

src/Muzich/AdminBundle/Controller/Moderate_comment/EditController.php

@@ -30,10 +30,10 @@ class EditController extends BaseController
     $element->setComments($cm->get());
     $element->setCountCommentReport($cm->countCommentAlert());
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getManager()->persist($element);
     
     // On récupère les user qui ont signalés ce commentaire
-    $users = $this->getDoctrine()->getEntityManager()
+    $users = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT u FROM MuzichCoreBundle:User u
         WHERE u.id IN (:uids)'
@@ -46,10 +46,10 @@ class EditController extends BaseController
     foreach ($users as $user)
     {
       $user->addBadReport();
-      $this->getDoctrine()->getEntityManager()->persist($user);
+      $this->getDoctrine()->getManager()->persist($user);
     }
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     if (!$this->getRequest()->isXmlHttpRequest())
     {
@@ -78,16 +78,16 @@ class EditController extends BaseController
     
     // On récupère l'auteur du commentaire pour lui incrémenté son compteur
     // de contenu modéré
-    $user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+    $user = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:User')
       ->findOneBy(array(
         'id' => $comment['u']['i']
       ));
     
     $user->addModeratedCommentCount();
     
-    $this->getDoctrine()->getEntityManager()->persist($user);
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($user);
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     if (!$this->getRequest()->isXmlHttpRequest())
     {

src/Muzich/AdminBundle/Controller/Moderate_element/EditController.php

@@ -26,9 +26,9 @@ class EditController extends BaseEditController
     $user_ids = $element->getReportIds();
     $element->setReportIds(null);
     $element->setCountReport(null);
-    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getManager()->persist($element);
     
-    $users = $this->getDoctrine()->getEntityManager()
+    $users = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT u FROM MuzichCoreBundle:User u
         WHERE u.id IN (:uids)'
@@ -40,10 +40,10 @@ class EditController extends BaseEditController
     foreach ($users as $user)
     {
       $user->addBadReport();
-      $this->getDoctrine()->getEntityManager()->persist($user);
+      $this->getDoctrine()->getManager()->persist($user);
     }
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
     return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_element_list" ));
@@ -56,9 +56,9 @@ class EditController extends BaseEditController
     $event->elementRemoved($element);
     $element->getOwner()->addModeratedElementCount();
     
-    $this->getDoctrine()->getEntityManager()->persist($element->getOwner());
-    $this->getDoctrine()->getEntityManager()->remove($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element->getOwner());
+    $this->getDoctrine()->getManager()->remove($element);
+    $this->getDoctrine()->getManager()->flush();
     
     $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
     return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_element_list" ));

src/Muzich/AdminBundle/Controller/Moderate_tag/EditController.php

@@ -53,7 +53,7 @@ class EditController extends BaseEditController
     
     $uids = json_decode($tag->getPrivateids(), true);
     
-    $users = $this->getDoctrine()->getEntityManager()
+    $users = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT u FROM MuzichCoreBundle:User u
         WHERE u.id IN (:uids)'
@@ -65,10 +65,10 @@ class EditController extends BaseEditController
     foreach ($users as $user)
     {
       $user->addModeratedTagCount();
-      $this->getDoctrine()->getEntityManager()->persist($user);
+      $this->getDoctrine()->getManager()->persist($user);
     }
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     if (!$this->getRequest()->isXmlHttpRequest())
     {

src/Muzich/AdminBundle/Controller/Moderate_user/EditController.php

@@ -56,10 +56,10 @@ class EditController extends BaseController
     $element->setComments($cm->get());
     $element->setCountCommentReport($cm->countCommentAlert());
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getManager()->persist($element);
     
     // On récupère les user qui ont signalés ce commentaire
-    $users = $this->getDoctrine()->getEntityManager()
+    $users = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT u FROM MuzichCoreBundle:User u
         WHERE u.id IN (:uids)'
@@ -72,10 +72,10 @@ class EditController extends BaseController
     foreach ($users as $user)
     {
       $user->addBadReport();
-      $this->getDoctrine()->getEntityManager()->persist($user);
+      $this->getDoctrine()->getManager()->persist($user);
     }
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     if (!$this->getRequest()->isXmlHttpRequest())
     {
@@ -104,16 +104,16 @@ class EditController extends BaseController
     
     // On récupère l'auteur du commentaire pour lui incrémenté son compteur
     // de contenu modéré
-    $user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+    $user = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:User')
       ->findOneBy(array(
         'id' => $comment['u']['i']
       ));
     
     $user->addModeratedCommentCount();
     
-    $this->getDoctrine()->getEntityManager()->persist($user);
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($user);
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     if (!$this->getRequest()->isXmlHttpRequest())
     {

src/Muzich/CommentBundle/Controller/CommentController.php

@@ -79,8 +79,8 @@ class CommentController extends Controller
     // Event pour user d'un nouveau comment
     $event->commentAdded($element, $this->getUser());
 
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
 
     // On récupère le html du li avec le comment pour la réponse
     $html = $this->render('MuzichCommentBundle:Comment:li.comment.html.twig', array(
@@ -139,8 +139,8 @@ class CommentController extends Controller
     // Si tout c'est bien passé on met a jour l'attribut de l'élément
     $element->setComments($cm->get());
       
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success'
@@ -260,8 +260,8 @@ class CommentController extends Controller
     $cm->update($this->getUser(), $date, $comment, $follow);
     $element->setComments($cm->get());
 
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
         
     if (null === ($comment_index = $cm->getIndex($this->getUserId(), $date)))
     {
@@ -321,8 +321,8 @@ if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::A
     $element->setComments($cm->get());
     $element->setCountCommentReport($cm->countCommentAlert());
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success'
@@ -360,8 +360,8 @@ if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::A
     $element->setComments($cm->get());
     $element->setCountCommentReport($cm->countCommentAlert());
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success'

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -120,7 +120,7 @@ class CoreController extends Controller
     }
 
     // On tente de récupérer l'enregistrement FollowUser / FollowGroup
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     $Follow = $em
       ->getRepository('MuzichCoreBundle:Follow' . ucfirst($type))
       ->findOneBy(
@@ -204,7 +204,7 @@ class CoreController extends Controller
     }
     
     $user = $this->getUser(true, array('join' => array('groups_owned_groups_tags')));
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     
     /*
      * Contrôle préléminaire si groupe précisé
@@ -524,8 +524,8 @@ class CoreController extends Controller
       $fav->setTag($tag);
       $fav->setUser($user);
       $fav->setPosition(0);
-      $this->getDoctrine()->getEntityManager()->persist($fav);
-      $this->getDoctrine()->getEntityManager()->flush();
+      $this->getDoctrine()->getManager()->persist($fav);
+      $this->getDoctrine()->getManager()->flush();
     }
     
     return $this->jsonResponse(array(
@@ -573,8 +573,8 @@ class CoreController extends Controller
     
     // a partir d'ici on a tout ce qu'il faut
     $element->setGroup($group);
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     // On récupère le nouveau dom de l'élément
     $html = $this->render('MuzichCoreBundle:SearchElement:element.html.twig', array(
@@ -616,8 +616,8 @@ class CoreController extends Controller
     $erm = new ElementReportManager($element);
     $erm->add($this->getUser());
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success'

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -129,7 +129,7 @@ class ElementController extends Controller
     if ($form->isValid())
     {
       $status = 'success';
-      $em = $this->getDoctrine()->getEntityManager();
+      $em = $this->getDoctrine()->getManager();
       // On utilise le manager d'élément
       $factory = new ElementManager($element, $em, $this->container);
       $factory->proceedFill($user);
@@ -178,7 +178,7 @@ class ElementController extends Controller
     
     
     $element->setTagsWithIds(
-      $this->getDoctrine()->getEntityManager(), 
+      $this->getDoctrine()->getManager(), 
       json_decode($element->getTags())
     );
     
@@ -210,7 +210,7 @@ class ElementController extends Controller
     
     try {
       $element = $this->checkExistingAndOwned($element_id);
-      $em = $this->getDoctrine()->getEntityManager();
+      $em = $this->getDoctrine()->getManager();
       
       $event = new EventElement($this->container);
       $event->elementRemoved($element);
@@ -461,8 +461,8 @@ class ElementController extends Controller
     $event = new EventElement($this->container);
     $event->onePointAdded($element);
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success',
@@ -520,8 +520,8 @@ class ElementController extends Controller
     $event = new EventElement($this->container);
     $event->onePointRemoved($element);
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success',
@@ -625,7 +625,7 @@ class ElementController extends Controller
     if (count($tags_ids))
     {
       // On récupère les tags en base
-      $tags = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:Tag')
+      $tags = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:Tag')
         ->getTagsWithIds($tags_ids)
       ;
     }
@@ -663,7 +663,7 @@ class ElementController extends Controller
           $private_ids = json_decode($tag->getPrivateids(), true);
           $private_ids[] = $element->getOwner()->getId();
           $tag->setPrivateids(json_encode($private_ids));
-          $this->getDoctrine()->getEntityManager()->persist($tag);
+          $this->getDoctrine()->getManager()->persist($tag);
         }
       }
           
@@ -672,14 +672,14 @@ class ElementController extends Controller
     
     $element->setHasTagProposition(true);
     
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->persist($proposition);
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->persist($proposition);
     
     // Notifs etc 
     $event = new EventElement($this->container);
     $event->tagsProposed($element);
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success',
@@ -712,7 +712,7 @@ class ElementController extends Controller
     }
     
     // On récupére toute les propsotions pour cet élément
-    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+    $propositions = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
       ->findByElement($element->getId())
     ;
     
@@ -753,25 +753,25 @@ class ElementController extends Controller
     }
     $element->setHasTagProposition(false);
     $element->setNeedTags(false);
-    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getManager()->persist($element);
     
     $event = new EventElement($this->container);
     $event->tagsAccepteds($proposition);
     
-    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+    $propositions = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
       ->findByElement($element->getId())
     ;
     
     // On supprime les proposition liés a cet élement
     foreach ($propositions as $proposition)
     {
-      $this->getDoctrine()->getEntityManager()->remove($proposition);
+      $this->getDoctrine()->getManager()->remove($proposition);
     }
     
     // Traitement de l'Event si il y a
     $this->removeElementFromEvent($element->getId(), Event::TYPE_TAGS_PROPOSED);
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     $element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
       ->findOneById($element->getId())
     ;
@@ -804,12 +804,12 @@ class ElementController extends Controller
     }
     
     // On supprime les proposition liés a cet élement
-    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+    $propositions = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
       ->findByElement($element->getId())
     ;
     foreach ($propositions as $proposition)
     {
-      $this->getDoctrine()->getEntityManager()->remove($proposition);
+      $this->getDoctrine()->getManager()->remove($proposition);
     }
     
     // Traitement de l'Event si il y a
@@ -817,8 +817,8 @@ class ElementController extends Controller
     
     // On spécifie qu'il n'y as plus de proposition
     $element->setHasTagProposition(false);
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($element);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success'
@@ -903,7 +903,7 @@ class ElementController extends Controller
   
   protected function findTagsWithProposeds($tags)
   {
-    $tag_like = new TagLike($this->getDoctrine()->getEntityManager());
+    $tag_like = new TagLike($this->getDoctrine()->getManager());
     $tags_with_likes = array();
     foreach ($tags as $tag_name)
     {
@@ -1085,8 +1085,10 @@ class ElementController extends Controller
     if (!($element = $es->getElements($this->getDoctrine(), $this->getUserId(true), 'single')))
     {
       return $this->jsonResponse(array(
-      'status'  => 'error'
-    ));
+        self::RESPONSE_STATUS_ID  => self::RESPONSE_STATUS_ERROR,
+        self::RESPONSE_ERROR_ID   => self::ERROR_TYPE_NOTFOUND,
+        self::RESPONSE_MESSAGE_ID => $this->trans('noelements.nofound_anymore', array(), 'elements')
+      ));
     }
     
     $html = $this->render('MuzichCoreBundle:SearchElement:li.element.html.twig', array(

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -253,7 +253,7 @@ class SearchController extends Controller
       if (strlen(trim($string_search)) > 1)
       {
         // On utilise l'objet TagLike
-        $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+        $TagLike = new TagLike($this->getDoctrine()->getManager());
         // Pour trier nos tags d'une manière plus humaine
         $sort_response = $TagLike->getSimilarTags($string_search, $this->getUserId(true));
       
@@ -302,7 +302,7 @@ class SearchController extends Controller
   {
     if ($this->getRequest()->isXmlHttpRequest())
     {
-      $tag_id = $this->getDoctrine()->getEntityManager()->createQuery("
+      $tag_id = $this->getDoctrine()->getManager()->createQuery("
         SELECT t.id FROM MuzichCoreBundle:Tag t
         WHERE t.name = :str
         ORDER BY t.name ASC"

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -54,332 +54,332 @@ class ElementRepository extends EntityRepository
   
   
   
-  /**
-   * TODO: Faire un bel objet pour gérer tout ça =)
-   * => Utiliser l'objet ElementSearcher (ou du moin réorganiser ça en plusieurs 
-   * objets)
-   * 
-   * 
-   * @param ElementSearcher $searcher
-   * @return Doctrine\ORM\Query
-   */
-  public function findBySearchOLD(ElementSearcher $searcher, $user_id, $exec_type = 'execute', $params = array())
-  {
-    // Tableaux des paramétres
-    $params_ids = array();
-    $params_select = array();
-    $params_select['uid'] = $user_id;
-    $order_by = "ORDER BY e_.created DESC, e_.id DESC";
-    
-    // Première chose, si on impose les element_ids on a pas besoin de faire 
-    // le filtrage
-    if ($searcher->hasIds())
-    {
-      // Dans ce cas ou les ids sont déjà donné, on ne peut pas avoir de nouveaux
-      // éléments
-      if ($searcher->isSearchingNew())
-      {
-        return $query = $this->getEntityManager()
-          ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
-        ;
-      }
-      
-      if (($id_limit = $searcher->getIdLimit()))
-      {
-        return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), $id_limit, $searcher->getCount(), $searcher->getIdsDisplay());
-      }
-      return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), null, null, $searcher->getIdsDisplay());
-    }
-    
-    // Booléen nous permettant de savoir si un where a déjà été écrit
-    $is_where = false;
-    
-    // Si c'est une recherche string, les autres paramètres ne sont pas nécéssaire
-    // TODO: Dans la nouvelle version ourquoi pas !!
-    // TODOOO: Pas encore dans new version (string)
-    $where_string = '';
-    if (($string = $searcher->getString()))
-    {
-      // On prépare notre liste de mots
-      $words = array_unique(array_merge(
-        explode(' ', $string),
-        explode('-', $string),
-        explode('- ', $string),
-        explode(' -', $string),
-        explode(' - ', $string),
-        explode(',', $string),
-        explode(', ', $string),
-        explode(' ,', $string),
-        explode(' , ', $string)
-      ));
-      
-      // On récupère les ids des elements correspondants
-      $word_min_length = 0;
-      if (isset($params['word_min_length']))
-      {
-        $word_min_length = $params['word_min_length'];
-      }
-      foreach ($words as $i => $word)
-      {
-        if (strlen($word) >= $word_min_length)
-        {
-          if ($where_string === '')
-          {
-            $where_string = ($is_where) ? ' AND (' : ' WHERE (';
-            $is_where = true;
-            $where_string .= "UPPER(e_.name) LIKE :str".$i;
-          }
-          else
-          {
-            $where_string .= " OR UPPER(e_.name) LIKE :str".$i;
-          }
-          $params_ids['str'.$i] = '%'.strtoupper($word).'%';
-        }
-      }
-      $where_string .= ')';
-      
-    }
-    
-    
-    // Construction des conditions pour la selection d'ids
-    $where_tags = '';
-    $join_tags  = '';
-    
-    /*
-     * des fois on se retrouve avec un string au lieu d'un tableau
-     */
-    $tags = $searcher->getTags();
-    
-    if (!is_array($tags))
-    {
-      $tags_decoded = json_decode($tags);
-      $tags = array();
-      foreach ($tags_decoded as $tag_id)
-      {
-        $tags[$tag_id] = $tag_id;
-      }
-    }
-    
-    if (count($tags))
-    {
-      foreach ($tags as $tag_id => $tag_name)
-      {
-        // LEFT JOIN car un element n'est pas obligatoirement lié a un/des tags
-        $join_tags = " LEFT JOIN e_.tags t_";
-
-        // Construction du chere pour les tags
-        if ($where_tags == '')
-        {
-          $where_tags .= ' WHERE (t_.id = :tid'.$tag_id;
-        }
-        else
-        {
-          $where_tags .= ' OR t_.id = :tid'.$tag_id;
-        }
-        $params_ids['tid'.$tag_id] = $tag_id;
-      }
-      // Fermeture de la parenthése qui isole la condition des tags
-      $where_tags .= ')';
-      $is_where = true;
-    }
-    
-    // Construction de la condition network
-    $join_network  = '';
-    $where_network = '';
-    if ($searcher->getNetwork() == ElementSearcher::NETWORK_PERSONAL)
-    {
-      $join_network = 
-        " JOIN e_.owner o_"
-      // LEFT JOIN car l'element n'est pas obligatoirement lié a un groupe
-      . " LEFT JOIN e_.group g_"
-      // LEFT JOIN car owner n'est pas obligatoirement lié a des followers
-      . " LEFT JOIN o_.followers_users f_"
-      // LEFT JOIN car le groupe n'est pas obligatoirement lié a des followers
-      . " LEFT JOIN g_.followers gf_"
-      ;
-      $where_network = ($is_where) ? ' AND' : ' WHERE';
-      $is_where = true;
-      // Le filtre applique: Soit le proprio fait partis des followeds de l'utilisateur
-      // soit l'element est ajouté dans un groupe que l'utilisateur follow.
-      $where_network .= ' (f_.follower = :userid OR gf_.follower = :useridg)';
-      $params_ids['userid'] = $user_id;
-      $params_ids['useridg'] = $user_id;
-    }
-    
-    // ajout du filtre sur un user si c'est le cas
-    $where_user = '';
-    //                                                  Si c'est une recherche 
-    //                de favoris, on ne filtre pas sur le proprio de l'element
-    if (($search_user_id = $searcher->getUserId()) && !$searcher->isFavorite())
-    {
-      $where_user = ($is_where) ? ' AND' : ' WHERE';
-      $is_where = true;
-      $where_user .= ' e_.owner = :suid';
-      $params_ids['suid'] = $search_user_id;
-    }
-    
-    // ajout du filtre sur un user si c'est le cas
-    $where_group = '';
-    //                                                 Si c'est une recherche 
-    //               de favoris, on ne filtre pas sur le proprio de l'element
-    if (($search_group_id = $searcher->getGroupId()) && !$searcher->isFavorite())
-    {
-      $where_group = ($is_where) ? ' AND' : ' WHERE';
-      $is_where = true;
-      $where_group .= ' e_.group = :sgid';
-      $params_ids['sgid'] = $search_group_id;
-    }
-    
-    // Filtre pour afficher uniquement les elements mis en favoris
-    $join_favorite = ''; 
-    $where_favorite = '';
-    if ($searcher->isFavorite())
-    {
-      $where_favorite = ($is_where) ? ' AND' : ' WHERE';
-      $is_where = true;
-      if (($favorite_user_id = $searcher->getUserId()) && !$searcher->getGroupId())
-      {
-        // Pas de LEFT JOIN car on ne veut que les elements mis en favoris
-        $join_favorite = 'JOIN e_.elements_favorites fav2_';
-        $where_favorite .= ' fav2_.user = :fuid';
-        $params_ids['fuid'] = $favorite_user_id;
-      }
-      else if (($favorite_group_id = $searcher->getGroupId()) && !$searcher->getUserId())
-      {
-        // TODO: Faire en sorte que ça affiche les favoris des gens suivant
-        // le groupe
-      }
-      else
-      {
-        throw new Exception('For use favorite search element, you must specify an user_id or group_id');
-      }
-    }
-    
-    // Si id_limit est précisé c'est que l'on demande "la suite" ou "les nouveaux"
-    $where_id_limit = '';
-    if (($id_limit = $searcher->getIdLimit()) && !$searcher->isSearchingNew())
-    {
-      $where_id_limit = ($is_where) ? ' AND' : ' WHERE';
-      $is_where = true;
-      $where_id_limit .= " e_.id < :id_limit";
-      $params_ids['id_limit'] = $id_limit;
-    }
-    elseif ($id_limit && $searcher->isSearchingNew())
-    {
-      $where_id_limit = ($is_where) ? ' AND' : ' WHERE';
-      $is_where = true;
-      $where_id_limit .= " e_.id > :id_limit";
-      $params_ids['id_limit'] = $id_limit;
-      // Pour pouvoir charger les x nouveaux on doit organiser la liste 
-      // de manière croissante
-      $order_by = "ORDER BY e_.created ASC, e_.id ASC";
-    }
-    
-    
-    // Recherche strict ou non ?
-    $where_tag_strict = '';
-    if ($searcher->getTagStrict() && count($tags))
-    {
-      // On a besoin de récupérer la liste des element_id qui ont les tags
-      // demandés.
-      $tag_ids = '';
-      foreach ($tags as $tag_id => $tag_name)
-      {
-        if ($tag_ids === '')
-        {
-          $tag_ids .= (int)$tag_id;
-        }
-        else
-        {
-          $tag_ids .= ','.(int)$tag_id;
-        }
-      }
-      
-      $sql = "SELECT et.element_id FROM elements_tag et "
-      ."WHERE et.tag_id IN ($tag_ids) group by et.element_id "
-      ."having count(distinct et.tag_id) = ".count($tags);
-      $rsm = new \Doctrine\ORM\Query\ResultSetMapping;
-      $rsm->addScalarResult('element_id', 'element_id');
-      
-      $strict_element_ids_result = $this->getEntityManager()
-        ->createNativeQuery($sql, $rsm)
-        //->setParameter('ids', $tag_ids)
-        ->getScalarResult()
-      ;
-      
-      $strict_element_ids = array();
-      foreach ($strict_element_ids_result as $strict_id)
-      {
-        $strict_element_ids[] = $strict_id['element_id'];
-      }
-      
-      if (count($strict_element_ids))
-      {
-        $where_tag_strict = ($is_where) ? ' AND' : ' WHERE';
-        $where_tag_strict .= ' e_.id IN (:tag_strict_ids)';
-        $params_ids['tag_strict_ids'] = $strict_element_ids;
-      }
-      // Ce else palie au bug du au cas ou $strict_element_ids est egal a array();
-      else
-      {
-        $where_tag_strict = ($is_where) ? ' AND' : ' WHERE';
-        $where_tag_strict .= ' 1 = 2';
-      }
-    }
-    
-    // Requête qui selectionnera les ids en fonction des critéres
-    $id_query = $this->getEntityManager()
-      ->createQuery(
-        "SELECT e_.id
-        FROM MuzichCoreBundle:Element e_
-        $join_tags
-        $join_network
-        $join_favorite
-        $where_tags
-        $where_network
-        $where_user
-        $where_group
-        $where_favorite
-        $where_tag_strict
-        $where_string
-        $where_id_limit
-        GROUP BY e_.id
-        $order_by")
-     ->setParameters($params_ids)
-    ;
-    
-    // Si on a précisé que l'on voulait un count, pas de limite
-    if ($exec_type != 'count')
-    {
-      $id_query->setMaxResults($searcher->getCount());
-    }
-    
-    // si l'on a demandé un count
-    if ($exec_type == 'count')
-    {
-      // On retourne cette query
-      return $id_query;
-    }
-    
-    $r_ids = $id_query->getArrayResult();
-    
-    $ids = array();
-    
-    if (count($r_ids))
-    {
-      foreach ($r_ids as $r_id)
-      {
-        $ids[] = $r_id['id'];
-      }
-
-      return $this->getSelectElementForSearchQuery($params_select, $user_id, $ids);
-    }
-    
-    // Il faut retourner une Query
-    return $query = $this->getEntityManager()
-      ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
-    ;
-  }
+//  /**
+//   * TODO: Faire un bel objet pour gérer tout ça =)
+//   * => Utiliser l'objet ElementSearcher (ou du moin réorganiser ça en plusieurs 
+//   * objets)
+//   * 
+//   * 
+//   * @param ElementSearcher $searcher
+//   * @return Doctrine\ORM\Query
+//   */
+//  public function findBySearchOLD(ElementSearcher $searcher, $user_id, $exec_type = 'execute', $params = array())
+//  {
+//    // Tableaux des paramétres
+//    $params_ids = array();
+//    $params_select = array();
+//    $params_select['uid'] = $user_id;
+//    $order_by = "ORDER BY e_.created DESC, e_.id DESC";
+//    
+//    // Première chose, si on impose les element_ids on a pas besoin de faire 
+//    // le filtrage
+//    if ($searcher->hasIds())
+//    {
+//      // Dans ce cas ou les ids sont déjà donné, on ne peut pas avoir de nouveaux
+//      // éléments
+//      if ($searcher->isSearchingNew())
+//      {
+//        return $query = $this->getEntityManager()
+//          ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
+//        ;
+//      }
+//      
+//      if (($id_limit = $searcher->getIdLimit()))
+//      {
+//        return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), $id_limit, $searcher->getCount(), $searcher->getIdsDisplay());
+//      }
+//      return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), null, null, $searcher->getIdsDisplay());
+//    }
+//    
+//    // Booléen nous permettant de savoir si un where a déjà été écrit
+//    $is_where = false;
+//    
+//    // Si c'est une recherche string, les autres paramètres ne sont pas nécéssaire
+//    // TODO: Dans la nouvelle version ourquoi pas !!
+//    // TODOOO: Pas encore dans new version (string)
+//    $where_string = '';
+//    if (($string = $searcher->getString()))
+//    {
+//      // On prépare notre liste de mots
+//      $words = array_unique(array_merge(
+//        explode(' ', $string),
+//        explode('-', $string),
+//        explode('- ', $string),
+//        explode(' -', $string),
+//        explode(' - ', $string),
+//        explode(',', $string),
+//        explode(', ', $string),
+//        explode(' ,', $string),
+//        explode(' , ', $string)
+//      ));
+//      
+//      // On récupère les ids des elements correspondants
+//      $word_min_length = 0;
+//      if (isset($params['word_min_length']))
+//      {
+//        $word_min_length = $params['word_min_length'];
+//      }
+//      foreach ($words as $i => $word)
+//      {
+//        if (strlen($word) >= $word_min_length)
+//        {
+//          if ($where_string === '')
+//          {
+//            $where_string = ($is_where) ? ' AND (' : ' WHERE (';
+//            $is_where = true;
+//            $where_string .= "UPPER(e_.name) LIKE :str".$i;
+//          }
+//          else
+//          {
+//            $where_string .= " OR UPPER(e_.name) LIKE :str".$i;
+//          }
+//          $params_ids['str'.$i] = '%'.strtoupper($word).'%';
+//        }
+//      }
+//      $where_string .= ')';
+//      
+//    }
+//    
+//    
+//    // Construction des conditions pour la selection d'ids
+//    $where_tags = '';
+//    $join_tags  = '';
+//    
+//    /*
+//     * des fois on se retrouve avec un string au lieu d'un tableau
+//     */
+//    $tags = $searcher->getTags();
+//    
+//    if (!is_array($tags))
+//    {
+//      $tags_decoded = json_decode($tags);
+//      $tags = array();
+//      foreach ($tags_decoded as $tag_id)
+//      {
+//        $tags[$tag_id] = $tag_id;
+//      }
+//    }
+//    
+//    if (count($tags))
+//    {
+//      foreach ($tags as $tag_id => $tag_name)
+//      {
+//        // LEFT JOIN car un element n'est pas obligatoirement lié a un/des tags
+//        $join_tags = " LEFT JOIN e_.tags t_";
+//
+//        // Construction du chere pour les tags
+//        if ($where_tags == '')
+//        {
+//          $where_tags .= ' WHERE (t_.id = :tid'.$tag_id;
+//        }
+//        else
+//        {
+//          $where_tags .= ' OR t_.id = :tid'.$tag_id;
+//        }
+//        $params_ids['tid'.$tag_id] = $tag_id;
+//      }
+//      // Fermeture de la parenthése qui isole la condition des tags
+//      $where_tags .= ')';
+//      $is_where = true;
+//    }
+//    
+//    // Construction de la condition network
+//    $join_network  = '';
+//    $where_network = '';
+//    if ($searcher->getNetwork() == ElementSearcher::NETWORK_PERSONAL)
+//    {
+//      $join_network = 
+//        " JOIN e_.owner o_"
+//      // LEFT JOIN car l'element n'est pas obligatoirement lié a un groupe
+//      . " LEFT JOIN e_.group g_"
+//      // LEFT JOIN car owner n'est pas obligatoirement lié a des followers
+//      . " LEFT JOIN o_.followers_users f_"
+//      // LEFT JOIN car le groupe n'est pas obligatoirement lié a des followers
+//      . " LEFT JOIN g_.followers gf_"
+//      ;
+//      $where_network = ($is_where) ? ' AND' : ' WHERE';
+//      $is_where = true;
+//      // Le filtre applique: Soit le proprio fait partis des followeds de l'utilisateur
+//      // soit l'element est ajouté dans un groupe que l'utilisateur follow.
+//      $where_network .= ' (f_.follower = :userid OR gf_.follower = :useridg)';
+//      $params_ids['userid'] = $user_id;
+//      $params_ids['useridg'] = $user_id;
+//    }
+//    
+//    // ajout du filtre sur un user si c'est le cas
+//    $where_user = '';
+//    //                                                  Si c'est une recherche 
+//    //                de favoris, on ne filtre pas sur le proprio de l'element
+//    if (($search_user_id = $searcher->getUserId()) && !$searcher->isFavorite())
+//    {
+//      $where_user = ($is_where) ? ' AND' : ' WHERE';
+//      $is_where = true;
+//      $where_user .= ' e_.owner = :suid';
+//      $params_ids['suid'] = $search_user_id;
+//    }
+//    
+//    // ajout du filtre sur un user si c'est le cas
+//    $where_group = '';
+//    //                                                 Si c'est une recherche 
+//    //               de favoris, on ne filtre pas sur le proprio de l'element
+//    if (($search_group_id = $searcher->getGroupId()) && !$searcher->isFavorite())
+//    {
+//      $where_group = ($is_where) ? ' AND' : ' WHERE';
+//      $is_where = true;
+//      $where_group .= ' e_.group = :sgid';
+//      $params_ids['sgid'] = $search_group_id;
+//    }
+//    
+//    // Filtre pour afficher uniquement les elements mis en favoris
+//    $join_favorite = ''; 
+//    $where_favorite = '';
+//    if ($searcher->isFavorite())
+//    {
+//      $where_favorite = ($is_where) ? ' AND' : ' WHERE';
+//      $is_where = true;
+//      if (($favorite_user_id = $searcher->getUserId()) && !$searcher->getGroupId())
+//      {
+//        // Pas de LEFT JOIN car on ne veut que les elements mis en favoris
+//        $join_favorite = 'JOIN e_.elements_favorites fav2_';
+//        $where_favorite .= ' fav2_.user = :fuid';
+//        $params_ids['fuid'] = $favorite_user_id;
+//      }
+//      else if (($favorite_group_id = $searcher->getGroupId()) && !$searcher->getUserId())
+//      {
+//        // TODO: Faire en sorte que ça affiche les favoris des gens suivant
+//        // le groupe
+//      }
+//      else
+//      {
+//        throw new Exception('For use favorite search element, you must specify an user_id or group_id');
+//      }
+//    }
+//    
+//    // Si id_limit est précisé c'est que l'on demande "la suite" ou "les nouveaux"
+//    $where_id_limit = '';
+//    if (($id_limit = $searcher->getIdLimit()) && !$searcher->isSearchingNew())
+//    {
+//      $where_id_limit = ($is_where) ? ' AND' : ' WHERE';
+//      $is_where = true;
+//      $where_id_limit .= " e_.id < :id_limit";
+//      $params_ids['id_limit'] = $id_limit;
+//    }
+//    elseif ($id_limit && $searcher->isSearchingNew())
+//    {
+//      $where_id_limit = ($is_where) ? ' AND' : ' WHERE';
+//      $is_where = true;
+//      $where_id_limit .= " e_.id > :id_limit";
+//      $params_ids['id_limit'] = $id_limit;
+//      // Pour pouvoir charger les x nouveaux on doit organiser la liste 
+//      // de manière croissante
+//      $order_by = "ORDER BY e_.created ASC, e_.id ASC";
+//    }
+//    
+//    
+//    // Recherche strict ou non ?
+//    $where_tag_strict = '';
+//    if ($searcher->getTagStrict() && count($tags))
+//    {
+//      // On a besoin de récupérer la liste des element_id qui ont les tags
+//      // demandés.
+//      $tag_ids = '';
+//      foreach ($tags as $tag_id => $tag_name)
+//      {
+//        if ($tag_ids === '')
+//        {
+//          $tag_ids .= (int)$tag_id;
+//        }
+//        else
+//        {
+//          $tag_ids .= ','.(int)$tag_id;
+//        }
+//      }
+//      
+//      $sql = "SELECT et.element_id FROM elements_tag et "
+//      ."WHERE et.tag_id IN ($tag_ids) group by et.element_id "
+//      ."having count(distinct et.tag_id) = ".count($tags);
+//      $rsm = new \Doctrine\ORM\Query\ResultSetMapping;
+//      $rsm->addScalarResult('element_id', 'element_id');
+//      
+//      $strict_element_ids_result = $this->getEntityManager()
+//        ->createNativeQuery($sql, $rsm)
+//        //->setParameter('ids', $tag_ids)
+//        ->getScalarResult()
+//      ;
+//      
+//      $strict_element_ids = array();
+//      foreach ($strict_element_ids_result as $strict_id)
+//      {
+//        $strict_element_ids[] = $strict_id['element_id'];
+//      }
+//      
+//      if (count($strict_element_ids))
+//      {
+//        $where_tag_strict = ($is_where) ? ' AND' : ' WHERE';
+//        $where_tag_strict .= ' e_.id IN (:tag_strict_ids)';
+//        $params_ids['tag_strict_ids'] = $strict_element_ids;
+//      }
+//      // Ce else palie au bug du au cas ou $strict_element_ids est egal a array();
+//      else
+//      {
+//        $where_tag_strict = ($is_where) ? ' AND' : ' WHERE';
+//        $where_tag_strict .= ' 1 = 2';
+//      }
+//    }
+//    
+//    // Requête qui selectionnera les ids en fonction des critéres
+//    $id_query = $this->getEntityManager()
+//      ->createQuery(
+//        "SELECT e_.id
+//        FROM MuzichCoreBundle:Element e_
+//        $join_tags
+//        $join_network
+//        $join_favorite
+//        $where_tags
+//        $where_network
+//        $where_user
+//        $where_group
+//        $where_favorite
+//        $where_tag_strict
+//        $where_string
+//        $where_id_limit
+//        GROUP BY e_.id
+//        $order_by")
+//     ->setParameters($params_ids)
+//    ;
+//    
+//    // Si on a précisé que l'on voulait un count, pas de limite
+//    if ($exec_type != 'count')
+//    {
+//      $id_query->setMaxResults($searcher->getCount());
+//    }
+//    
+//    // si l'on a demandé un count
+//    if ($exec_type == 'count')
+//    {
+//      // On retourne cette query
+//      return $id_query;
+//    }
+//    
+//    $r_ids = $id_query->getArrayResult();
+//    
+//    $ids = array();
+//    
+//    if (count($r_ids))
+//    {
+//      foreach ($r_ids as $r_id)
+//      {
+//        $ids[] = $r_id['id'];
+//      }
+//
+//      return $this->getSelectElementForSearchQuery($params_select, $user_id, $ids);
+//    }
+//    
+//    // Il faut retourner une Query
+//    return $query = $this->getEntityManager()
+//      ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
+//    ;
+//  }
   
   protected function getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit = null, $count_limit = null, $ids_display = null)
   {
@@ -518,12 +518,21 @@ class ElementRepository extends EntityRepository
     $doctrineConfig = $this->getEntityManager()->getConfiguration();
     $doctrineConfig->addCustomStringFunction('FIELD', 'Muzich\CoreBundle\DoctrineExtensions\Query\Mysql\Field');
     
+    if (count($element_ids))
+    {
+      return $this->getEntityManager()->createQueryBuilder()
+        ->select('e, field(e.id, ' . implode(', ', $element_ids) . ') as HIDDEN field')
+        ->from('MuzichCoreBundle:Element', 'e')
+        ->where('e.id IN (:element_ids)')
+        ->setParameter('element_ids', $element_ids)
+        ->orderBy('field')
+      ;
+    }
+    
     return $this->getEntityManager()->createQueryBuilder()
-      ->select('e, field(e.id, ' . implode(', ', $element_ids) . ') as HIDDEN field')
+      ->select('e')
       ->from('MuzichCoreBundle:Element', 'e')
-      ->where('e.id IN (:element_ids)')
-      ->setParameter('element_ids', $element_ids)
-      ->orderBy('field')
+      ->where('1 = 2')
     ;
   }
   

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -2568,6 +2568,12 @@ $(document).ready(function(){
     $(this).hide();
   });
   
+  $('a.display_all_cloud_tag').click(function(){
+    $(this).parents('ul.tags_cloud').find('li').show();
+    $(this).parent().remove();
+    return false;
+  });
+  
   $('input#cloud_tags_filter').keyup(function(){
     var search_string = $(this).val();
     
@@ -3141,10 +3147,16 @@ $(document).ready(function(){
           function(){}
         );
 
+        line.find('img.loader').hide();
         if (response.status === 'success')
         {
           line.find('div.content_opened').html('<ul class="elements">' + response.data + '</ul>');
         }
+        else
+        if (response.status === 'error')
+        {
+          line.find('div.content_opened').html(response.message);
+        }
       });
     }
     else

src/Muzich/CoreBundle/Resources/views/Tag/tag_cloud.html.twig

@@ -1,10 +1,24 @@
+{% if tags_display_limit is not defined %}
+  {% set tags_display_limit = cloud_tags_limit_to_display %}
+{% endif %}
+
 <ul class="tags_cloud">
   {% for key, tag in tags %}
-    <li class="{{ css_list_length_class(key, tags|length) }}" {% if loop.index0 > cloud_tags_limit_to_display %}style="display: none;"{% endif %}>
+    <li class="{{ css_list_length_class(key, tags|length) }}" {% if loop.index0 > tags_display_limit %}style="display: none;"{% endif %}>
       <a data-tagid="{{ tag.id }}" href="#" class="tag">
         {{ tag.name }}
       </a>
     </li>
   {% endfor %}
+  
+  {% if (tags|length)-1 > tags_display_limit %}
+    
+    <li>
+      <a class="display_all_cloud_tag" href="#" class="tag">
+        ...
+      </a>
+    </li>
+  {% endif %}
+    
 </ul>
 <div class="clearboth" ></div>

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Searcher;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
+use Doctrine\ORM\NoResultException;
 
 class ElementSearcher extends Searcher implements SearcherInterface
 {
@@ -341,7 +342,15 @@ class ElementSearcher extends Searcher implements SearcherInterface
       break;
     
       case 'single':
-        return $query->getSingleResult();
+        try
+        {
+          return $query->getSingleResult();
+        } 
+        catch (NoResultException $exc)
+        {
+          return null;
+        }
+        
       break;
     
       default :

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -247,37 +247,40 @@ class ElementSearcherQueryBuilder
             $tag_ids .= ','.(int)$tag_id;
           }
         }
-      
-        $sql = "SELECT et.element_id FROM elements_tag et "
-        ."WHERE et.tag_id IN ($tag_ids) group by et.element_id "
-        ."having count(distinct et.tag_id) = ".count($tags);
-        $rsm = new \Doctrine\ORM\Query\ResultSetMapping;
-        $rsm->addScalarResult('element_id', 'element_id');
+        
+        if (!is_null(trim($tag_ids)))
+        {
+          $sql = "SELECT et.element_id FROM elements_tag et "
+          ."WHERE et.tag_id IN ($tag_ids) group by et.element_id "
+          ."having count(distinct et.tag_id) = ".count($tags);
+          $rsm = new \Doctrine\ORM\Query\ResultSetMapping;
+          $rsm->addScalarResult('element_id', 'element_id');
 
-        $strict_element_ids_result = $this->em
-          ->createNativeQuery($sql, $rsm)
-          //->setParameter('ids', $tag_ids)
-          ->getScalarResult()
-        ;
+          $strict_element_ids_result = $this->em
+            ->createNativeQuery($sql, $rsm)
+            //->setParameter('ids', $tag_ids)
+            ->getScalarResult()
+          ;
 
-        $strict_element_ids = array();
-        if (count($strict_element_ids_result))
-        {
-          foreach ($strict_element_ids_result as $strict_id)
+          $strict_element_ids = array();
+          if (count($strict_element_ids_result))
           {
-            $strict_element_ids[] = $strict_id['element_id'];
+            foreach ($strict_element_ids_result as $strict_id)
+            {
+              $strict_element_ids[] = $strict_id['element_id'];
+            }
           }
-        }
 
-        if (count($strict_element_ids))
-        {
-          $this->query_ids->andWhere('e.id IN (:tag_strict_ids)');
-          $this->parameters_ids['tag_strict_ids'] = $strict_element_ids;
-        }
-        // Ce else palie au bug du au cas ou $strict_element_ids est egal a array();
-        else
-        {
-          return false;
+          if (count($strict_element_ids))
+          {
+            $this->query_ids->andWhere('e.id IN (:tag_strict_ids)');
+            $this->parameters_ids['tag_strict_ids'] = $strict_element_ids;
+          }
+          // Ce else palie au bug du au cas ou $strict_element_ids est egal a array();
+          else
+          {
+            return false;
+          }
         }
       }
     }

src/Muzich/CoreBundle/Tests/Controller/ElementControllerTest.php

@@ -507,14 +507,14 @@ class ElementControllerTest extends FunctionalTest
     ;
     
     // Pas de proposition en base pur cet élément
-    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+    $propositions = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
       ->findOneByElement($element->getId())
     ;
     
     $this->assertEquals(0, count($propositions));
     
     // Pas d'événement pour bux
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -565,7 +565,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // On a maintenant la proposition en base
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -592,7 +592,7 @@ class ElementControllerTest extends FunctionalTest
     }
     
     // Il y a maintenant un event pour bux
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -657,7 +657,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // On a maintenant la proposition en base
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -684,7 +684,7 @@ class ElementControllerTest extends FunctionalTest
     }
     
     // avec la propsoition de joelle le nombre d'event n'a pas bougé (le compteur compte les éléments)
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -785,7 +785,7 @@ class ElementControllerTest extends FunctionalTest
     }
         
     // La proposition de joelle a disparu
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -797,7 +797,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals(0, count($propositions));
     
     // celle de paul aussi 
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -809,7 +809,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals(0, count($propositions));
     
     // Mais on a un event en archive pour joelle
-    $archives = $this->getDoctrine()->getEntityManager()
+    $archives = $this->getDoctrine()->getManager()
       ->createQuery('SELECT a FROM MuzichCoreBundle:EventArchive a'
         .' WHERE a.user = :uid AND a.type = :type')
       ->setParameters(array(
@@ -822,7 +822,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals(1, $archives[0]->getCount());
     
     // paul lui n'a pas d'archives
-    $archives = $this->getDoctrine()->getEntityManager()
+    $archives = $this->getDoctrine()->getManager()
       ->createQuery('SELECT a FROM MuzichCoreBundle:EventArchive a'
         .' WHERE a.user = :uid AND a.type = :type')
       ->setParameters(array(
@@ -877,14 +877,14 @@ class ElementControllerTest extends FunctionalTest
     ;
     
     // Pas de proposition en base pur cet élément
-    $propositions = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
+    $propositions = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:ElementTagsProposition')
       ->findOneByElement($element->getId())
     ;
     
     $this->assertEquals(0, count($propositions));
     
     // Pas d'événement pour bux
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -935,7 +935,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // On a maintenant la proposition en base
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -962,7 +962,7 @@ class ElementControllerTest extends FunctionalTest
     }
     
     // Il y a maintenant un event pour bux
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -1027,7 +1027,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // On a maintenant la proposition en base
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -1054,7 +1054,7 @@ class ElementControllerTest extends FunctionalTest
     }
     
     // avec la propsoition de joelle le nombre d'event n'a pas bougé (le compteur compte les éléments)
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -1136,7 +1136,7 @@ class ElementControllerTest extends FunctionalTest
     );
     
     // La proposition de joelle a disparu
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -1148,7 +1148,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals(0, count($propositions));
     
     // celle de paul aussi 
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(
@@ -1160,7 +1160,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals(0, count($propositions));
     
     // Et on as pas d'archive pour joelle
-    $archives = $this->getDoctrine()->getEntityManager()
+    $archives = $this->getDoctrine()->getManager()
       ->createQuery('SELECT a FROM MuzichCoreBundle:EventArchive a'
         .' WHERE a.user = :uid AND a.type = :type')
       ->setParameters(array(
@@ -1172,7 +1172,7 @@ class ElementControllerTest extends FunctionalTest
     $this->assertEquals(0, count($archives));
     
     // paul lui n'a pas d'archives non plus
-    $archives = $this->getDoctrine()->getEntityManager()
+    $archives = $this->getDoctrine()->getManager()
       ->createQuery('SELECT a FROM MuzichCoreBundle:EventArchive a'
         .' WHERE a.user = :uid AND a.type = :type')
       ->setParameters(array(

src/Muzich/CoreBundle/Tests/Controller/EventTest.php

@@ -22,7 +22,7 @@ class EventTest extends FunctionalTest
     $bux = $this->getUser('bux');
     
     // Actuellement il n'y a aucun event d'ouvert pour bux (fixtures)
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -55,7 +55,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // bux a maintenant un event en base
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
@@ -92,7 +92,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // bux a toujours 1 seul event en base
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
@@ -127,7 +127,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // bux a toujours 1 seul event en base
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -171,7 +171,7 @@ class EventTest extends FunctionalTest
     $this->exist('a[href="'.$url.'"]');
     
     // L'objet Event est encore en base
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -187,7 +187,7 @@ class EventTest extends FunctionalTest
     $this->isResponseSuccess();
     
     // L'objet Event ne doit plus être en base maintenant qu'il a été vu
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -230,7 +230,7 @@ class EventTest extends FunctionalTest
     $bux = $this->getUser('bux');
     
     // Actuellement il n'y a aucun event d'ouvert pour bux (fixtures)
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -266,7 +266,7 @@ class EventTest extends FunctionalTest
     $this->assertTrue(!is_null($fav));
     
     // bux a maintenant un event en base
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
@@ -299,7 +299,7 @@ class EventTest extends FunctionalTest
     $this->assertTrue(is_null($fav));
     
     // bux a toujours qu'un event avec un seul element signalé.
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
@@ -331,7 +331,7 @@ class EventTest extends FunctionalTest
     $paul = $this->getUser();
     
     // Actuellement il n'y a aucun event d'ouvert pour paul (fixtures)
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -380,7 +380,7 @@ class EventTest extends FunctionalTest
     $joelle = $this->getUser();
     
     // Actuellement il n'y a aucun event d'ouvert pour joelle (fixtures)
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -429,7 +429,7 @@ class EventTest extends FunctionalTest
     $bux = $this->getUser();
     
     // Actuellement il n'y a aucun event d'ouvert pour bux (fixtures)
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -462,7 +462,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // Paul et Joelle on maintenant des events
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -478,7 +478,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($result[0]['count'], 1);
     $this->assertEquals($result[0]['ids'], json_encode(array((string)$element->getId())));
     
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -514,7 +514,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // Pas de mouvement coté événements
-    $result_paul = $this->getDoctrine()->getEntityManager()
+    $result_paul = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -530,7 +530,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($result[0]['count'], 1);
     $this->assertEquals($result[0]['ids'], json_encode(array((string)$element->getId())));
     
-    $result_jo = $this->getDoctrine()->getEntityManager()
+    $result_jo = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -556,7 +556,7 @@ class EventTest extends FunctionalTest
     $this->isResponseSuccess();
     
     // L'objet Event doit encore être en bas etant que l'on a pas validé sa suppression
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -575,7 +575,7 @@ class EventTest extends FunctionalTest
     $this->isResponseSuccess();
         
     // L'objet Event ne doit plus être en base maintenant qu'il a été vu
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -634,7 +634,7 @@ class EventTest extends FunctionalTest
     $this->isResponseSuccess();
         
     // L'objet Event ne doit plus être en base maintenant qu'il a été vu
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -672,7 +672,7 @@ class EventTest extends FunctionalTest
     $this->assertEquals($response['status'], 'success');
     
     // Paul et Joelle on maintenant des events
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -684,7 +684,7 @@ class EventTest extends FunctionalTest
     ;
     $this->assertEquals(count($result), 0);
     
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -710,7 +710,7 @@ class EventTest extends FunctionalTest
     $bob = $this->getUser('bob');
     
     // Actuellement il n'y a aucun event d'ouvert pour paul (fixtures)
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -744,7 +744,7 @@ class EventTest extends FunctionalTest
     $this->isResponseSuccess();
     
     // Désormais bob doit avoir un event
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -778,7 +778,7 @@ class EventTest extends FunctionalTest
     $this->exist('ul#followers_users li:contains(\'bux\')');
     
     // L'event n'existe d'ailleurs plus en base
-    $result = $this->getDoctrine()->getEntityManager()
+    $result = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid'
       )
@@ -823,7 +823,7 @@ class EventTest extends FunctionalTest
   
   protected function eventCount($user, $type, $count)
   {
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type'
       )
@@ -860,7 +860,7 @@ class EventTest extends FunctionalTest
   
   protected function eventHasElementId($user, $type, $element_id)
   {
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type AND e.ids LIKE :eid'
       )
@@ -877,7 +877,7 @@ class EventTest extends FunctionalTest
   
   protected function eventHasNotElementId($user, $type, $element_id)
   {
-    $events = $this->getDoctrine()->getEntityManager()
+    $events = $this->getDoctrine()->getManager()
       ->createQuery('SELECT e FROM MuzichCoreBundle:Event e
         WHERE e.user = :uid AND e.type = :type AND e.ids LIKE :eid'
       )
@@ -935,7 +935,7 @@ class EventTest extends FunctionalTest
   
   protected function getElementTagProposition($element_id, $user_id)
   {
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(

src/Muzich/CoreBundle/Tests/Controller/FavoriteControllerTest.php

@@ -22,7 +22,7 @@ class FavoriteControllerTest extends FunctionalTest
     $this->clickOnLink($link);
     $this->isResponseSuccess();
         
-    $elements = $this->getDoctrine()->getEntityManager()->createQuery("
+    $elements = $this->getDoctrine()->getManager()->createQuery("
       SELECT e FROM MuzichCoreBundle:Element e
       LEFT JOIN e.elements_favorites ef
       WHERE ef.user = :uid
@@ -56,7 +56,7 @@ class FavoriteControllerTest extends FunctionalTest
     // On se rend sur sa page des favoris de bux
     $this->crawler = $this->client->request('GET', $this->generateUrl('favorite_user_list', array('slug' => 'bux')));
            
-    $elements = $this->getDoctrine()->getEntityManager()->createQuery("
+    $elements = $this->getDoctrine()->getManager()->createQuery("
       SELECT e FROM MuzichCoreBundle:Element e
       LEFT JOIN e.elements_favorites ef
       WHERE ef.user = :uid
@@ -91,7 +91,7 @@ class FavoriteControllerTest extends FunctionalTest
     // On se rend sur sa page des favoris de bux
     $this->crawler = $this->client->request('GET', $this->generateUrl('favorite_user_list', array('slug' => 'bux')));
            
-    $elements = $this->getDoctrine()->getEntityManager()->createQuery("
+    $elements = $this->getDoctrine()->getManager()->createQuery("
       SELECT e FROM MuzichCoreBundle:Element e
       LEFT JOIN e.elements_favorites ef
       WHERE ef.user = :uid

src/Muzich/CoreBundle/Tests/Controller/HomeControllerTest.php

@@ -945,7 +945,7 @@ class HomeControllerTest extends FunctionalTest
     $bux = $this->getUser();
     
     // On récupère la proposition
-    $propositions = $this->getDoctrine()->getEntityManager()
+    $propositions = $this->getDoctrine()->getManager()
       ->createQuery('SELECT p, t FROM MuzichCoreBundle:ElementTagsProposition p'
         .' JOIN p.tags t WHERE p.element = :eid AND p.user = :uid')
       ->setParameters(array(

src/Muzich/CoreBundle/Tests/Controller/IndexControllerTest.php

@@ -80,7 +80,7 @@ class IndexControllerTest extends FunctionalTest
     // On a besoin d'un token pour le moment
     $token = new RegistrationToken();
     $token->setToken('4vcsdv54svqcc3q1v54sdv6qs');
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     $em->persist($token);
     $em->flush();
     
@@ -106,7 +106,7 @@ class IndexControllerTest extends FunctionalTest
     $token = new RegistrationToken();
     $token_name = '45gf645jgf6xqz4dc'.time();
     $token->setToken($token_name);
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     $em->persist($token);
     $em->flush();
     

src/Muzich/CoreBundle/Tests/Controller/ReputationTest.php

@@ -30,8 +30,8 @@ class ReputationTest extends FunctionalTest
 //    
 //    $bux = $this->getUser('bux');
 //    $bux->setReputation(0);
-//    $this->getDoctrine()->getEntityManager()->persist($bux);
-//    $this->getDoctrine()->getEntityManager()->flush();
+//    $this->getDoctrine()->getManager()->persist($bux);
+//    $this->getDoctrine()->getManager()->flush();
 //    
 //    $bux = $this->getUser('bux');
 //    $this->assertEquals($bux->getReputation(), 0);

src/Muzich/CoreBundle/Tests/Controller/ShowControllerTest.php

@@ -199,8 +199,8 @@ class ShowControllerTest extends FunctionalTest
         'followed' => $paul->getId()
       ))
     ;
-    $this->getDoctrine()->getEntityManager()->remove($follow);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->remove($follow);
+    $this->getDoctrine()->getManager()->flush();
     
     // On rafraichie la page
     $this->crawler = $this->client->request('GET', 

src/Muzich/CoreBundle/Tests/Controller/UserControllerTest.php

@@ -307,7 +307,7 @@ class UserControllerTest extends FunctionalTest
       - $this->getContainer()->getParameter('changeemail_security_delay')
     );
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     $form = $this->selectForm('form[action="'.$url.'"] input[type="submit"]');
     $form['form[email]'] = 'trololololooo222@trolo.com';

src/Muzich/CoreBundle/Tests/Tag/TagReadTest.php

@@ -49,7 +49,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $response = $TagLike->getSimilarTags('punk', $bux->getId());
     
     $this->assertEquals(count($cresults), count($response['tags']));
@@ -72,7 +72,7 @@ class TagReadTest extends UnitTest
       'Reggae'
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $response = $TagLike->getSimilarTags('reggea', $bux->getId());
     
     $this->assertEquals(count($cresults), count($response['tags']));
@@ -96,7 +96,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('punk', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -108,7 +108,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('anarcho punk', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -120,7 +120,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('punk anarcho', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -132,7 +132,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('punk anar', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -144,7 +144,7 @@ class TagReadTest extends UnitTest
         'Pop-punk', 'Post-Punk', 'Punk rock', 'Ska-jazz', 'Skacore',  'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('ska punk', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -155,7 +155,7 @@ class TagReadTest extends UnitTest
       'Horror punk'
     );
     
-    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
+    $TagLike = new TagLike($this->getDoctrine()->getManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('horror', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);

src/Muzich/CoreBundle/Tests/Tag/TagWriteTest.php

@@ -162,14 +162,14 @@ class TagWriteTest extends UnitTest
       ->findOneByName('Ed Cox - La fanfare des teuffeurs (Hardcordian)')
     ;
     $element->addTag($tag_3);
-    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getManager()->persist($element);
     
     // Ajout en tag favoris
     $new_fav = new UsersTagsFavorites();
     $new_fav->setTag($tag_3);
     $new_fav->setUser($bux);
     $new_fav->setPosition(0);
-    $this->getDoctrine()->getEntityManager()->persist($new_fav);
+    $this->getDoctrine()->getManager()->persist($new_fav);
     
     // Ajout en tag de groupe
     $group = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')
@@ -180,9 +180,9 @@ class TagWriteTest extends UnitTest
     $new_fav->setTag($tag_3);
     $new_fav->setGroup($group);
     $new_fav->setPosition(0);
-    $this->getDoctrine()->getEntityManager()->persist($new_fav);
+    $this->getDoctrine()->getManager()->persist($new_fav);
     
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
     
     // On check que ces netités soit en base
     // Et que celle qui vont suivre (après le remplacement) n'y soit pas
@@ -244,8 +244,8 @@ class TagWriteTest extends UnitTest
     ;
     $this->assertTrue(is_null($fav));
     
-    $this->getDoctrine()->getEntityManager()->persist($tag_1);
-    $this->getDoctrine()->getEntityManager()->persist($tag_3);
+    $this->getDoctrine()->getManager()->persist($tag_1);
+    $this->getDoctrine()->getManager()->persist($tag_3);
     
     // A ce stade les vérifications on été faites on lance le replace
     // Test 3: On remplace
@@ -312,7 +312,7 @@ class TagWriteTest extends UnitTest
     ;
     $this->assertTrue(!is_null($fav));
     
-    $this->getDoctrine()->getEntityManager()->persist($tag_3);
+    $this->getDoctrine()->getManager()->persist($tag_3);
     $this->clean();
   }
   
@@ -327,11 +327,11 @@ class TagWriteTest extends UnitTest
     $tag4 = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')
       ->findOneByName('Xvlsd aoj 12');
     
-    ($tag1) ? $this->getDoctrine()->getEntityManager()->remove($tag1) : '';
-    ($tag2) ? $this->getDoctrine()->getEntityManager()->remove($tag2) : '';
-    ($tag3) ? $this->getDoctrine()->getEntityManager()->remove($tag3) : '';
-    ($tag4) ? $this->getDoctrine()->getEntityManager()->remove($tag4) : '';
-    $this->getDoctrine()->getEntityManager()->flush();
+    ($tag1) ? $this->getDoctrine()->getManager()->remove($tag1) : '';
+    ($tag2) ? $this->getDoctrine()->getManager()->remove($tag2) : '';
+    ($tag3) ? $this->getDoctrine()->getManager()->remove($tag3) : '';
+    ($tag4) ? $this->getDoctrine()->getManager()->remove($tag4) : '';
+    $this->getDoctrine()->getManager()->flush();
   }
   
 }

src/Muzich/CoreBundle/Tests/User/UserTest.php

@@ -109,7 +109,7 @@ class UserTest extends UnitTest
       ), $bux->getTagsFavoritesQuick());
     }
     
-    $this->getDoctrine()->getEntityManager()->remove($bux_melodique);
+    $this->getDoctrine()->getManager()->remove($bux_melodique);
     $this->flush();
     
     $bux = $this->getUser('bux');

src/Muzich/CoreBundle/lib/Controller.php

@@ -20,6 +20,14 @@ use Muzich\CoreBundle\Form\Playlist\PlaylistForm;
 class Controller extends BaseController
 {
   
+  const RESPONSE_STATUS_ID = 'status';
+  const RESPONSE_ERROR_ID = 'error';
+  const RESPONSE_MESSAGE_ID = 'message';
+  const RESPONSE_STATUS_ERROR = 'error';
+  
+  const ERROR_TYPE_NOTFOUND = 'notfound';
+  const ERROR_TYPE_MUSTBECONNECTED = 'mustbeconnected';
+  
   protected static $user = null;
   protected static $user_personal_query = null;
   protected static $tags = array();
@@ -517,7 +525,7 @@ class Controller extends BaseController
    */
   public function getEntityManager()
   {
-    return $this->getDoctrine()->getEntityManager();
+    return $this->getDoctrine()->getManager();
   }
   
   /**

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -271,7 +271,7 @@ class FunctionalTest extends WebTestCase
    */
   protected function findUserByUsername($username)
   {
-    return $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+    return $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:User')
       ->findOneByUsername($username)
     ;
   }
@@ -530,7 +530,7 @@ class FunctionalTest extends WebTestCase
    */
   protected function getEntityManager()
   {
-    return $this->getDoctrine()->getEntityManager();
+    return $this->getDoctrine()->getManager();
   }
   
   /**

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -46,7 +46,7 @@ class UnitTest extends \PHPUnit_Framework_TestCase
     
     $factory = new ElementManager(
       $element, 
-      $this->getDoctrine()->getEntityManager(), 
+      $this->getDoctrine()->getManager(), 
       $this->_container
     );
     $factory->proceedFill($user);
@@ -71,7 +71,7 @@ class UnitTest extends \PHPUnit_Framework_TestCase
     $element->setUrl($url);
     
     $factory = new ElementManager($element, 
-      $this->getDoctrine()->getEntityManager(), $this->_container);
+      $this->getDoctrine()->getManager(), $this->_container);
     $factory->proceedFill($user);
     
     return $element->getDatas();
@@ -95,12 +95,12 @@ class UnitTest extends \PHPUnit_Framework_TestCase
   
   protected function persist($entity)
   {
-    $this->getDoctrine()->getEntityManager()->persist($entity);
+    $this->getDoctrine()->getManager()->persist($entity);
   }
   
   protected function flush()
   {
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->flush();
   }
   
   /**
@@ -109,7 +109,7 @@ class UnitTest extends \PHPUnit_Framework_TestCase
    */
   protected function getEntityManager()
   {
-    return $this->getDoctrine()->getEntityManager();
+    return $this->getDoctrine()->getManager();
   }
   
   /**

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -102,7 +102,7 @@ class FavoriteController extends Controller
     }
     
     $user = $this->getUser();
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     
     if ($user->getPersonalHash($id) != $token || !is_numeric($id)
       || !($element = $em->getRepository('MuzichCoreBundle:Element')->findOneById($id))
@@ -271,7 +271,7 @@ class FavoriteController extends Controller
     $viewed_user = $this->getUser();
     if ($user_id != $this->getUserId(true))
     {
-      $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+      $viewed_user = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:User')
         ->findOneById($user_id, array())->getSingleResult();
     }
     

src/Muzich/GroupBundle/Controller/DefaultController.php

@@ -64,7 +64,7 @@ if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::A
       throw $this->createNotFoundException();
     }
     
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     
     $new_group = new Group();
     $new_group->setOwner($user);
@@ -152,7 +152,7 @@ if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::A
   
   public function updateAction(Request $request, $slug)
   {
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     $group = $this->findGroupWithSlug($slug);
     
     if ($group->getOwner()->getId() != $this->getUserId())
@@ -212,7 +212,7 @@ if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::A
       throw $this->createNotFoundException('Accès non autorisé.');
     }
     
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     
     // Il faudra le faire avec doctrine:
     $elements = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -158,12 +158,12 @@ class ShowController extends Controller
     }
     else if ($type == 'user')
     {
-      $object = $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+      $object = $viewed_user = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:User')
         ->findOneById($object_id, array())->getSingleResult();
     }
     else if ($type == 'group')
     {
-      $object = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:Group')
+      $object = $this->getDoctrine()->getManager()->getRepository('MuzichCoreBundle:Group')
         ->findOneById($object_id);
     }
     

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -51,8 +51,8 @@ class MynetworkController extends Controller
   {
     $ids = $event->getIds();
     
-    $this->getDoctrine()->getEntityManager()->remove($event);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->remove($event);
+    $this->getDoctrine()->getManager()->flush();
     
     $followers_users_new = array();
     foreach ($followers_users as $user)

src/Muzich/PlaylistBundle/Resources/views/Show/user.html.twig

@@ -105,7 +105,8 @@
           
 
           {% include "MuzichCoreBundle:Tag:tag_cloud.html.twig" with {
-            'tags' : playlist.tags
+            'tags' : playlist.tags,
+            'tags_display_limit' : playlist_tags_count_displayed_max
           } %}
 
         </li>

src/Muzich/UserBundle/Controller/UserController.php

@@ -317,7 +317,7 @@ class UserController extends Controller
       if ($form->isValid())
       {
         $data = $form->getData();
-        $user->updateTagsFavoritesById($this->getDoctrine()->getEntityManager(), $data['tags']);
+        $user->updateTagsFavoritesById($this->getDoctrine()->getManager(), $data['tags']);
         
         // On réinitialise l'eventuel session de recherche en mémoire
         $session = $this->get("session");
@@ -383,7 +383,7 @@ class UserController extends Controller
    */
   public function changeEmailRequestAction()
   {
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     $user = $this->getUser();
     
     $request = $this->getRequest();
@@ -470,7 +470,7 @@ class UserController extends Controller
    */
   public function changeEmailConfirmAction($token)
   {
-    $em = $this->getDoctrine()->getEntityManager();
+    $em = $this->getDoctrine()->getManager();
     $um = $this->get('muzich_user_manager');
     $user = $this->getUser();
     
@@ -533,8 +533,8 @@ class UserController extends Controller
     
     $user->setTown(trim($this->getRequest()->request->get('town')));
     $user->setCountry(trim($this->getRequest()->request->get('country')));
-    $this->getDoctrine()->getEntityManager()->persist($user);
-    $this->getDoctrine()->getEntityManager()->flush();
+    $this->getDoctrine()->getManager()->persist($user);
+    $this->getDoctrine()->getManager()->flush();
     
     return $this->jsonResponse(array(
       'status' => 'success'