Cleanup

[airbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 4f8559f44740ec64f48c8e151b2c4420b7f77a3c..def8c54574d0169aa5ba66e91c508d2a355656e0 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -11,10 +11,11 @@ use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
-use Symfony\Component\Mime\NamedAddress;
+use Symfony\Component\Mime\Address;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Rapsys\UserBundle\Utils\Slugger;
 
 class DefaultController extends AbstractController {
        //Config array
@@ -23,16 +24,33 @@ class DefaultController extends AbstractController {
        //Context array
        protected $context;
 
+       //Router instance
+       protected $router;
+
+       //Slugger instance
+       protected $slugger;
+
        //Translator instance
        protected $translator;
 
        /**
         * Inject container and translator interface
+        *
+        * @param ContainerInterface $container The container instance
+        * @param RouterInterface $router The router instance
+        * @param Slugger $slugger The slugger instance
+        * @param TranslatorInterface $translator The translator instance
         */
-       public function __construct(ContainerInterface $container, TranslatorInterface $translator, RouterInterface $router) {
+       public function __construct(ContainerInterface $container, RouterInterface $router, Slugger $slugger, TranslatorInterface $translator) {
                //Retrieve config
                $this->config = $container->getParameter($this->getAlias());
 
+               //Set the router
+               $this->router = $router;
+
+               //Set the slugger
+               $this->slugger = $slugger;
+
                //Set the translator
                $this->translator = $translator;
 
@@ -45,12 +63,19 @@ class DefaultController extends AbstractController {
                        'site_png' => $this->config['site']['png'],
                        'site_svg' => $this->config['site']['svg'],
                        'site_title' => $translator->trans($this->config['site']['title']),
-                       'site_url' => $router->generate('rapsys_air_index')
+                       'site_url' => $router->generate($this->config['site']['url'])
                ];
        }
 
        /**
         * The contact page
+        *
+        * @desc Send a contact mail to configured contact
+        *
+        * @param Request $request The request instance
+        * @param MailerInterface $mailer The mailer instance
+        *
+        * @return Response The rendered view or redirection
         */
        public function contact(Request $request, MailerInterface $mailer) {
                //Set section
@@ -62,7 +87,6 @@ class DefaultController extends AbstractController {
                //Create the form according to the FormType created previously.
                //And give the proper parameters
                $form = $this->createForm('Rapsys\AirBundle\Form\ContactType', null, [
-                       // To set the action use $this->generateUrl('route_identifier')
                        'action' => $this->generateUrl('rapsys_air_contact'),
                        'method' => 'POST'
                ]);
@@ -78,10 +102,10 @@ class DefaultController extends AbstractController {
                                //Create message
                                $message = (new TemplatedEmail())
                                        //Set sender
-                                       ->from(new NamedAddress($data['mail'], $data['name']))
+                                       ->from(new Address($data['mail'], $data['name']))
                                        //Set recipient
                                        //XXX: remove the debug set in vendor/symfony/mime/Address.php +46
-                                       ->to(new NamedAddress($this->config['contact']['mail'], $this->config['contact']['name']))
+                                       ->to(new Address($this->config['contact']['mail'], $this->config['contact']['name']))
                                        //Set subject
                                        ->subject($data['subject'])
 
@@ -124,8 +148,12 @@ class DefaultController extends AbstractController {
 
        /**
         * The index page
+        *
+        * @desc Welcome the user
+        *
+        * @return Response The rendered view
         */
-       public function index(Request $request) {
+       public function index() {
                //Set section
                $section = $this->translator->trans('Index');
 
@@ -137,17 +165,21 @@ class DefaultController extends AbstractController {
        }
 
        /**
-        * The policy page
+        * The regulation page
+        *
+        * @desc Display the regulation policy
+        *
+        * @return Response The rendered view
         */
-       public function policy(Request $request) {
+       public function regulation() {
                //Set section
-               $section = $this->translator->trans('Policy');
+               $section = $this->translator->trans('Regulation');
 
                //Set title
                $title = $section.' - '.$this->context['site_title'];
 
                //Render template
-               return $this->render('@RapsysAir/default/policy.html.twig', ['title' => $title, 'section' => $section]+$this->context);
+               return $this->render('@RapsysAir/default/regulation.html.twig', ['title' => $title, 'section' => $section]+$this->context);
        }
 
        /**