mark search service provider as private

Controller/SearchController.php

@@ -31,15 +31,44 @@ use Chill\MainBundle\Search\SearchInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Chill\MainBundle\Search\SearchProvider;
+use Symfony\Component\Translation\TranslatorInterface;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 
 /**
  *
  *
- * @author julien.fastre@champs-libres.coop
- * @author marc@champs-libres.coop
  */
 class SearchController extends Controller
 {
+    /**
+     *
+     * @var SearchProvider
+     */
+    protected $searchProvider;
+    
+    /**
+     *
+     * @var TranslatorInterface
+     */
+    protected $translator;
+    
+    /**
+     *
+     * @var PaginatorFactory
+     */
+    protected $paginatorFactory;
+    
+    function __construct(
+        SearchProvider $searchProvider, 
+        TranslatorInterface $translator, 
+        PaginatorFactory $paginatorFactory
+    ) {
+        $this->searchProvider = $searchProvider;
+        $this->translator = $translator;
+        $this->paginatorFactory = $paginatorFactory;
+    }
+
     
     public function searchAction(Request $request, $_format)
     {
@@ -50,7 +79,7 @@ class SearchController extends Controller
                 case 'html': 
                     return $this->render('ChillMainBundle:Search:error.html.twig',
                           array(
-                             'message' => $this->get('translator')->trans("Your search is empty. "
+                             'message' => $this->translator->trans("Your search is empty. "
                                    . "Please provide search terms."),
                              'pattern' => $pattern
                           ));
@@ -72,7 +101,7 @@ class SearchController extends Controller
                 }
                 
                 // no specific search selected. Rendering result in "preview" mode
-                $results = $this->get('chill.main.search_provider')
+                $results = $this->searchProvider
                     ->getSearchResults(
                         $pattern,
                         0,
@@ -81,17 +110,12 @@ class SearchController extends Controller
                         );
             } else {
                 // we want search on a specific search provider. Display full results.
-                
-                // create a paginator to get the startPage and stopPage
-                /* @var $paginatorFactory \Chill\MainBundle\Pagination\PaginatorFactory */
-                $paginatorFactory = $this->get('chill_main.paginator_factory');
-                
-                $results = [$this->get('chill.main.search_provider')
+                $results = [$this->searchProvider
                     ->getResultByName(
                             $pattern,
                             $name,
-                            $paginatorFactory->getCurrentPageFirstItemNumber(),
-                            $paginatorFactory->getCurrentItemsPerPage(),
+                            $this->paginatorFactory->getCurrentPageFirstItemNumber(),
+                            $this->paginatorFactory->getCurrentItemsPerPage(),
                             array(
                                 SearchInterface::SEARCH_PREVIEW_OPTION => false,
                                 SearchInterface::REQUEST_QUERY_PARAMETERS => $request
@@ -116,8 +140,8 @@ class SearchController extends Controller
         } catch (ParsingException $ex) {
             return $this->render('ChillMainBundle:Search:error.html.twig',
                   array(
-                     "message" => $this->get('translator')->trans('Invalid terms').
-                     ": ".$this->get('translator')->trans($ex->getMessage()),
+                     "message" => $this->translator->trans('Invalid terms').
+                     ": ".$this->translator->trans($ex->getMessage()),
                      'pattern' => $pattern
                   ));
         }
@@ -131,7 +155,7 @@ class SearchController extends Controller
     public function advancedSearchListAction(Request $request)
     {
         /* @var $variable Chill\MainBundle\Search\SearchProvider */
-        $searchProvider = $this->get('chill.main.search_provider');
+        $searchProvider = $this->searchProvider;
         $advancedSearchProviders = $searchProvider
             ->getHasAdvancedFormSearchServices();
         
@@ -150,9 +174,9 @@ class SearchController extends Controller
     {
         try {
             /* @var $variable Chill\MainBundle\Search\SearchProvider */
-            $searchProvider = $this->get('chill.main.search_provider');
+            $searchProvider = $this->searchProvider;
             /* @var $variable Chill\MainBundle\Search\HasAdvancedSearchFormInterface */
-            $search = $this->get('chill.main.search_provider')
+            $search = $this->searchProvider
                         ->getHasAdvancedFormByName($name);
         
         } catch (\Chill\MainBundle\Search\UnknowSearchNameException $e) {
@@ -171,7 +195,7 @@ class SearchController extends Controller
             $form->handleRequest($request);
             
             if ($form->isValid()) {
-                $pattern = $this->get('chill.main.search_provider')
+                $pattern = $this->searchProvider
                     ->getHasAdvancedFormByName($name)
                     ->convertFormDataToQuery($form->getData());
 
@@ -194,13 +218,13 @@ class SearchController extends Controller
         $builder = $this
             ->get('form.factory')
             ->createNamedBuilder(
-                null, 
+                null,
                 FormType::class, 
                 $data, 
                 [ 'method' => Request::METHOD_POST ]
             );
 
-        $this->get('chill.main.search_provider')
+        $this->searchProvider
             ->getHasAdvancedFormByName($name)
             ->buildForm($builder)
             ;