Fix coalesce warning

[airbundle] / Controller / CalendarController.php

diff --git a/Controller/CalendarController.php b/Controller/CalendarController.php
index 3e6f65d973a59da799d33d9e6f51baa40b4fa73a..663349cac91b6e01c9cc9c5ab1b4d35d0c654d7b 100644 (file)
--- a/Controller/CalendarController.php
+++ b/Controller/CalendarController.php
@@ -18,7 +18,7 @@ class CalendarController extends DefaultController {
        /**
         * Calendar authorization
         *
-        * @desc Initiate calendar oauth process
+        * Initiate calendar oauth process
         *
         * @param Request $request The request instance
         *
@@ -43,7 +43,7 @@ class CalendarController extends DefaultController {
                //Create the form according to the FormType created previously.
                //And give the proper parameters
                $form = $this->createForm('Rapsys\AirBundle\Form\CalendarType', ['calendar' => $this->config['calendar']['calendar'], 'prefix' => $this->config['calendar']['prefix']], [
-                       'action' => $this->generateUrl('rapsys_air_calendar'),
+                       'action' => $this->generateUrl('rapsysair_calendar'),
                        'method' => 'POST'
                ]);
 
@@ -70,7 +70,7 @@ class CalendarController extends DefaultController {
                                                'application_name' => $data['project'],
                                                'client_id' => $data['client'],
                                                'client_secret' => $data['secret'],
-                                               'redirect_uri' => $redirect = $this->generateUrl('rapsys_air_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+                                               'redirect_uri' => $redirect = $this->generateUrl('rapsysair_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
                                                'scopes' => [Calendar::CALENDAR, Calendar::CALENDAR_EVENTS],
                                                'access_type' => 'offline',
                                                'approval_prompt' => 'force'
@@ -93,7 +93,7 @@ class CalendarController extends DefaultController {
 #                              $googleClient->addScope(Calendar::CALENDAR_EVENTS);
 #
 #                              //Set redirect uri
-#                              $googleClient->setRedirectUri($redirect = $this->generateUrl('rapsys_air_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL));
+#                              $googleClient->setRedirectUri($redirect = $this->generateUrl('rapsysair_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL));
 #
 #                              //Set offline access
 #                              $googleClient->setAccessType('offline');