Refactorisation (récupération User, Group, instanciation ElementSearch)

src/Muzich/CoreBundle/lib/Controller.php

@@ -134,9 +134,66 @@ class Controller extends BaseController
       ->getPublicAndOwnedArray($this->getUserId());
   }
   
+  /**
+   * Met en place un message de type flash.
+   * 
+   * @param string $type
+   * @param string $value 
+   */
   protected function setFlash($type, $value)
   {
     $this->container->get('session')->setFlash($type, $value);
   }
   
+  /**
+   * Instancie et retourne un objet ElementSearch
+   * 
+   * @param array $params
+   * @return ElementSearcher 
+   */
+  protected function createSearchObject($params)
+  {
+    $search_object = new ElementSearcher();
+    $search_object->init($params);
+    return $search_object;
+  }
+  
+  /**
+   * Retourne un User en fonction du slug passé
+   * 
+   * @param string $slug
+   * @return User 
+   */
+  protected function findUserWithSlug($slug)
+  {
+    try {
+      return $this->getDoctrine()
+        ->getRepository('MuzichCoreBundle:User')
+        ->findOneBySlug($slug)
+        ->getSingleResult()
+      ;      
+    } catch (\Doctrine\ORM\NoResultException $e) {
+        throw $this->createNotFoundException('Utilisateur introuvable.');
+    }
+  }
+  
+  /**
+   * Retourne un Group en fonction du slug passé
+   * 
+   * @param string $slug
+   * @return Group 
+   */
+  protected function findGroupWithSlug($slug)
+  {
+    try {
+      return $this->getDoctrine()
+        ->getRepository('MuzichCoreBundle:Group')
+        ->findOneBySlug($slug)
+        ->getSingleResult()
+      ;      
+    } catch (\Doctrine\ORM\NoResultException $e) {
+        throw $this->createNotFoundException('Groupe introuvable.');
+    }
+  }
+  
 }

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -62,8 +62,7 @@ class FavoriteController extends Controller
    */
   public function myListAction()
   {
-    $search_object = new ElementSearcher();
-    $search_object->init(array(
+    $search_object = $this->createSearchObject(array(
       'user_id'  => $this->getUserId(),
       'favorite' => true
     ));
@@ -81,20 +80,9 @@ class FavoriteController extends Controller
    */
   public function userListAction($slug)
   {
-    try {
-      
-      $viewed_user = $this->getDoctrine()
-        ->getRepository('MuzichCoreBundle:User')
-        ->findOneBySlug($slug)
-        ->getSingleResult()
-      ;
-      
-    } catch (\Doctrine\ORM\NoResultException $e) {
-        throw $this->createNotFoundException('Utilisateur introuvable.');
-    }
+    $viewed_user = $this->findUserWithSlug($slug);
     
-    $search_object = new ElementSearcher();
-    $search_object->init(array(
+    $search_object = $this->createSearchObject(array(
       'user_id'  => $viewed_user->getId(),
       'favorite' => true
     ));

src/Muzich/FavoriteBundle/Resources/views/Favorite/myList.html.twig

@@ -4,6 +4,12 @@
 
 {% block content %}
 
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 
+    'active': 'myfavorites', 
+    'mygroups': false, 
+    'myfavorites': true 
+  } %}
+
   <h2>{{ 'favorites.your_favorites'|trans({}, 'network') }}</h2>
 
   {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}

src/Muzich/FavoriteBundle/Resources/views/Favorite/userList.html.twig

@@ -4,6 +4,12 @@
 
 {% block content %}
 
+  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 
+    'active': '', 
+    'mygroups': false, 
+    'myfavorites': true 
+  } %}
+
   <h2>{{ 'favorites.user_favorites'|trans({'%name%' : viewed_user.name}, 'network') }}</h2>
 
   {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}

src/Muzich/FavoriteBundle/Resources/views/layout.html.twig

@@ -6,12 +6,6 @@
 
 {% block main_content %}
   
-  {% include "MuzichCoreBundle:Menu:containerMenu.html.twig" with { 
-    'active': 'myfavorites', 
-    'mygroups': false, 
-    'myfavorites': true 
-  } %}
-  
   {% block content %}{% endblock %}
   
 {% endblock %}

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -9,25 +9,15 @@ class ShowController extends Controller
 {
   
   /**
-   * 
+   * Page public de l'utilisateur demandé.
    * 
    * @Template()
    */
   public function showUserAction($slug)
   {
-    try {
-      
-      $viewed_user = $this->getDoctrine()
-        ->getRepository('MuzichCoreBundle:User')
-        ->findOneBySlug($slug)
-        ->getSingleResult()
-      ;
-      $user = $this->getUser();
-      
-    } catch (\Doctrine\ORM\NoResultException $e) {
-        throw $this->createNotFoundException('Utilisateur introuvable.');
-    }
-    
+    $viewed_user = $this->findUserWithSlug($slug);
+    $user = $this->getUser();
+        
     return array(
       'viewed_user' => $viewed_user,
       'elements'    => $this->getShowedEntityElements($viewed_user->getId(), 'User'),
@@ -37,25 +27,15 @@ class ShowController extends Controller
   }
   
   /**
-   * 
+   * Page publique du groupe demandé.
    * 
    * @Template()
    */
   public function showGroupAction($slug)
   {
-    try {
-      
-      $group = $this->getDoctrine()
-        ->getRepository('MuzichCoreBundle:Group')
-        ->findOneBySlug($slug)
-        ->getSingleResult()
-      ;
-      $user = $this->getUser();
-      
-    } catch (\Doctrine\ORM\NoResultException $e) {
-        throw $this->createNotFoundException('Groupe introuvable.');
-    }
-    
+    $group = $this->findGroupWithSlug($slug);
+    $user = $this->getUser();
+        
     return array(
       'group'       => $group,
       'his_group'   => ($group->getOwner()->getId() == $user->getId()) ? true : false,
@@ -66,6 +46,8 @@ class ShowController extends Controller
   }
   
   /**
+   * Refactorisation pour showUserAction et showGroupAction. Récupére les 
+   * elements de l'entité demandé.
    *
    * @param Entity $entity
    * @param string $type