Prechádzať zdrojové kódy

Modifs de services pour passage en arguments

François 6 rokov pred
rodič
commit
769e373139

+ 3 - 7
app/config/services.yml

@@ -38,9 +38,7 @@ services:
         tags:
         - { name: 'kernel.event_listener', event: 'kernel.controller', method: onCoreController }
 
-    film.searcher:
-        class: AppBundle\Service\Search
-        public: true
+    AppBundle\Service\Search:
         arguments:
         - "@doctrine.orm.entity_manager"
 
@@ -60,8 +58,6 @@ services:
         - '%mail_reply%'
         - '%mail_name%'
 
-    film.mattermost:
-        class: AppBundle\Service\Mattermost
-        public: true
+    AppBundle\Service\Mattermost:
         arguments:
-        - '%mattermost_url%'
+            $url: '%mattermost_url%'

+ 3 - 2
src/AppBundle/Controller/SearchController.php

@@ -2,6 +2,7 @@
 
 namespace AppBundle\Controller;
 
+use AppBundle\Service\Search;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -11,12 +12,12 @@ class SearchController extends Controller
     /**
      * @Route("/recherche", name="search_recherche")
      */
-    public function searchAction(Request $request)
+    public function searchAction(Request $request, Search $filmSearch)
     {
-        $filmSearch = $this->get('film.searcher');
         $query = $request->query->get('q', "");
         return $this->render('@App/videotheque/liste.html.twig', array(
             'listeFilms'    =>  $filmSearch->search($query),
+            'titre'         =>  'Recherche '. $query,
             'query'         =>  $query
         ));
     }

+ 3 - 3
src/AppBundle/Controller/VideothequeController.php

@@ -5,6 +5,7 @@ namespace AppBundle\Controller;
 use AppBundle\Entity\Commentaire;
 use AppBundle\Entity\Genre;
 use AppBundle\Entity\Realisateur;
+use AppBundle\Service\Mattermost;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -69,7 +70,7 @@ class VideothequeController extends Controller
 	/**
 	 * @Route("/ajouter", name="videotheque_ajouter")
 	 */
-	public function ajouterAction(Request $request)
+	public function ajouterAction(Request $request, Mattermost $mattermost)
 	{
 		$film = new Film;
 		$film->setAuthered($this->getUser());
@@ -84,8 +85,7 @@ class VideothequeController extends Controller
 			$em->persist($film);
 			$em->flush();
 			$this->addFlash('success', 'Le film a été ajouté');
-			$notifMattermost = $this->get('film.mattermost');
-			$notifMattermost->sendNouveauFilm($film);
+			$mattermost->sendNouveauFilm($film);
 			return $this->redirectToRoute('videotheque_voirfilm', array('id'=>$film->getId()));
 		}