UserAndGroupSearcher: Inclusion de la récupération des objets dans la requête.

src/Muzich/CoreBundle/Searcher/UserAndGroupSearcher.php

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Searcher;
 
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Bundle\DoctrineBundle\Registry;
 
 class UserAndGroupSearcher extends Searcher implements SearcherInterface
 {
@@ -67,4 +68,33 @@ class UserAndGroupSearcher extends Searcher implements SearcherInterface
     $this->string = $string;
   }
   
+  /**
+   * Retourne les user et groupes correspondant a la recherche
+   *
+   * @param Registry $doctrine
+   * @return array
+   */
+  public function getResults(Registry $doctrine)
+  {
+    // On remplace le caratcère '%' au cas ou un malin l'insére.
+    $string = str_replace('%', '#', $this->string);
+    
+    $users = $doctrine
+      ->getRepository('MuzichCoreBundle:User')
+      ->findByString($string)
+      ->execute()
+    ;
+    
+    $groups = $doctrine
+      ->getRepository('MuzichCoreBundle:Group')
+      ->findByString($string)
+      ->execute()
+    ;
+    
+    return array(
+      'users'  => $users,
+      'groups' => $groups
+    );
+  }
+  
 }

src/Muzich/MynetworkBundle/Controller/MynetworkController.php

@@ -54,7 +54,7 @@ class MynetworkController extends Controller
       $search_form->bindRequest($request);
       if ($search_form->isValid())
       {
-        $results = $this->doSearchAction($search);
+        $results = $search->getResults($this->getDoctrine());
       }
     }
     
@@ -72,32 +72,4 @@ class MynetworkController extends Controller
     }
   }
   
-  /**
-   * Retourne le résultat de recherche sur les users et groupes.
-   * 
-   * @param string $search
-   * @return array 
-   */
-  protected function doSearchAction($search)
-  {
-    $string = str_replace('%', '#', $search->getString());
-    
-    $users = $this->getDoctrine()
-      ->getRepository('MuzichCoreBundle:User')
-      ->findByString($string)
-      ->execute()
-    ;
-    
-    $groups = $this->getDoctrine()
-      ->getRepository('MuzichCoreBundle:Group')
-      ->findByString($string)
-      ->execute()
-    ;
-    
-    return array(
-      'users'  => $users,
-      'groups' => $groups
-    );
-  }
-  
 }