From 038364a93f7dedddf43258990534215c20af8b5f Mon Sep 17 00:00:00 2001 From: Imanali Mamadiev Date: Sat, 23 Feb 2019 04:37:13 +0500 Subject: [PATCH] $selfUrl variable is deleted (#365) --- .../Dashboard/Asker/BookingController.php | 24 +++++++++---------- .../Dashboard/Offerer/BookingController.php | 9 ++++--- .../ListingAvailabilityPriceController.php | 10 ++++---- .../ListingAvailabilityStatusController.php | 15 ++++-------- .../ListingCategoriesAjaxController.php | 4 +--- .../Offerer/ListingCategoriesController.php | 4 +--- .../ListingCharacteristicController.php | 11 ++++----- .../Dashboard/Offerer/ListingController.php | 4 +--- .../Offerer/ListingDiscountController.php | 8 ++----- .../Offerer/ListingImageController.php | 12 ++++------ .../Offerer/ListingLocationController.php | 11 ++++----- .../Offerer/ListingPresentationController.php | 11 ++++----- 12 files changed, 45 insertions(+), 78 deletions(-) diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Asker/BookingController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Asker/BookingController.php index 8877909b6..8f91c083b 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Asker/BookingController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Asker/BookingController.php @@ -101,10 +101,6 @@ public function showAction(Request $request, Booking $booking) $formHandler = $this->get('fos_message.reply_form.handler'); if ($message = $formHandler->process($form)) { - $selfUrl = $this->get('router')->generate( - 'cocorico_dashboard_booking_show_asker', - array('id' => $booking->getId()) - ); $recipients = $thread->getOtherParticipants($this->getUser()); $recipient = (count($recipients) > 0) ? $recipients[0] : $this->getUser(); @@ -112,7 +108,10 @@ public function showAction(Request $request, Booking $booking) $messageEvent = new MessageEvent($thread, $recipient, $this->getUser()); $this->get('event_dispatcher')->dispatch(MessageEvents::MESSAGE_POST_SEND, $messageEvent); - return new RedirectResponse($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_booking_show_asker', + array('id' => $booking->getId()) + ); } $canBeCanceledByAsker = $this->get('cocorico.booking.manager')->canBeCanceledByAsker($booking); @@ -162,20 +161,19 @@ public function editAction(Request $request, Booking $booking, $type) $translator = $this->get('translator'); $session = $this->get('session'); if ($success == 1) { - $url = $this->generateUrl( - 'cocorico_dashboard_booking_edit_asker', - array( - 'id' => $booking->getId(), - 'type' => $type - ) - ); $session->getFlashBag()->add( 'success', $translator->trans('booking.edit.success', array(), 'cocorico_booking') ); - return $this->redirect($url); + return $this->redirectToRoute( + 'cocorico_dashboard_booking_edit_asker', + array( + 'id' => $booking->getId(), + 'type' => $type + ) + ); } elseif ($success < 0) { $errorMsg = $translator->trans('booking.new.unknown.error', array(), 'cocorico_booking'); if ($success == -1 || $success == -2 || $success == -4) { diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/BookingController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/BookingController.php index 30b4fafc3..b874854e6 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/BookingController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/BookingController.php @@ -102,10 +102,6 @@ public function showAction(Request $request, Booking $booking) /** @var Message $message */ if ($message = $formHandler->process($form)) { - $selfUrl = $this->get('router')->generate( - 'cocorico_dashboard_booking_show_offerer', - array('id' => $booking->getId()) - ); $recipients = $thread->getOtherParticipants($this->getUser()); $recipient = (count($recipients) > 0) ? $recipients[0] : $this->getUser(); @@ -113,7 +109,10 @@ public function showAction(Request $request, Booking $booking) $messageEvent = new MessageEvent($thread, $recipient, $this->getUser()); $this->get('event_dispatcher')->dispatch(MessageEvents::MESSAGE_POST_SEND, $messageEvent); - return new RedirectResponse($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_booking_show_offerer', + array('id' => $booking->getId()) + ); } //Amount excl or incl tax diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php index 2ca1d488b..8db6d30ac 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php @@ -49,11 +49,6 @@ class ListingAvailabilityPriceController extends Controller */ public function editAvailabilitiesPricesAction(Request $request, Listing $listing) { - $selfUrl = $this->generateUrl( - 'cocorico_dashboard_listing_edit_availabilities_prices', - array('listing_id' => $listing->getId()) - ); - $listingAvailabilityHandler = $this->get('cocorico.form.handler.listing_availability.price.dashboard'); $form = $this->createEditAvailabilitiesPricesForm($listing); $success = $listingAvailabilityHandler->processMany($form); @@ -64,7 +59,10 @@ public function editAvailabilitiesPricesAction(Request $request, Listing $listin $this->get('translator')->trans('listing.edit.success', array(), 'cocorico_listing') ); - return $this->redirect($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_listing_edit_availabilities_prices', + array('listing_id' => $listing->getId()) + ); } elseif ($success == -1) { $this->get('session')->getFlashBag()->add( 'error', diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityStatusController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityStatusController.php index 03fb33082..3d5870884 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityStatusController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityStatusController.php @@ -42,18 +42,12 @@ class ListingAvailabilityStatusController extends Controller * * @Method({"GET", "POST"}) * - * @param Request $request * @param $listing * * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response */ - public function editAvailabilitiesStatusAction(Request $request, Listing $listing) + public function editAvailabilitiesStatusAction(Listing $listing) { - $selfUrl = $this->generateUrl( - 'cocorico_dashboard_listing_edit_availabilities_status', - array('listing_id' => $listing->getId()) - ); - $listingAvailabilityHandler = $this->get('cocorico.form.handler.listing_availability.status.dashboard'); $form = $this->createEditAvailabilitiesStatusForm($listing); $success = $listingAvailabilityHandler->processMany($form); @@ -64,7 +58,10 @@ public function editAvailabilitiesStatusAction(Request $request, Listing $listin $this->get('translator')->trans('listing.edit.success', array(), 'cocorico_listing') ); - return $this->redirect($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_listing_edit_availabilities_status', + array('listing_id' => $listing->getId()) + ); } elseif ($success == -1) { $this->get('session')->getFlashBag()->add( 'error', @@ -125,7 +122,6 @@ private function createEditAvailabilitiesStatusForm(Listing $listing) * * @Method({"GET", "POST"}) * - * @param Request $request * @param Listing $listing * @param string $day * @param string $start_time @@ -135,7 +131,6 @@ private function createEditAvailabilitiesStatusForm(Listing $listing) * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException */ public function editAvailabilityStatusAction( - Request $request, Listing $listing, $day, $start_time, diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesAjaxController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesAjaxController.php index cc9c2e46a..572d7e541 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesAjaxController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesAjaxController.php @@ -95,12 +95,10 @@ public function editCategoriesAjaxAction(Request $request, Listing $listing) $this->get('translator')->trans('listing.edit.success', array(), 'cocorico_listing') ); - $selfUrl = $this->generateUrl( + return $this->redirectToRoute( 'cocorico_dashboard_listing_edit_categories_ajax', array('id' => $listing->getId()) ); - - return $this->redirect($selfUrl); } return $this->render( diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesController.php index 7581b4ee5..df302703d 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCategoriesController.php @@ -83,12 +83,10 @@ public function editCategoriesAction(Request $request, Listing $listing) $this->get('translator')->trans('listing.edit.success', array(), 'cocorico_listing') ); - $selfUrl = $this->generateUrl( + return $this->redirectToRoute( 'cocorico_dashboard_listing_edit_categories', array('id' => $listing->getId()) ); - - return $this->redirect($selfUrl); } return $this->render( diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCharacteristicController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCharacteristicController.php index 13bf36d7f..5e723e05a 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCharacteristicController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingCharacteristicController.php @@ -48,12 +48,6 @@ public function editCharacteristicAction(Request $request, Listing $listing) $editForm = $this->createEditCharacteristicForm($listing); $editForm->handleRequest($request); - $selfUrl = $this->generateUrl( - 'cocorico_dashboard_listing_edit_characteristic', - array( - 'id' => $listing->getId() - ) - ); if ($editForm->isSubmitted() && $editForm->isValid()) { $this->get("cocorico.listing.manager")->save($listing); @@ -62,7 +56,10 @@ public function editCharacteristicAction(Request $request, Listing $listing) $translator->trans('listing.edit.success', array(), 'cocorico_listing') ); - return $this->redirect($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_listing_edit_characteristic', + array('id' => $listing->getId()) + ); } return $this->render( diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingController.php index be37a1f9d..2c7343a79 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingController.php @@ -202,14 +202,12 @@ public function editPriceAction(Request $request, Listing $listing) $listing = $this->get("cocorico.listing.manager")->save($listing); $this->addFormSuccessMessagesToFlashBag('price'); - $selfUrl = $this->generateUrl( + return $this->redirectToRoute( 'cocorico_dashboard_listing_edit_price', array( 'id' => $listing->getId() ) ); - - return $this->redirect($selfUrl); } diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingDiscountController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingDiscountController.php index 3d3aed200..b71383fcb 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingDiscountController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingDiscountController.php @@ -96,14 +96,10 @@ public function editDiscountAction(Request $request, Listing $listing) $this->get('translator')->trans('listing.edit_discount.success', array(), 'cocorico_listing') ); - $selfUrl = $this->generateUrl( + return $this->redirectToRoute( 'cocorico_dashboard_listing_edit_discount', - array( - 'id' => $listing->getId() - ) + array('id' => $listing->getId()) ); - - return $this->redirect($selfUrl); } if ($request->isXmlHttpRequest()) { diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingImageController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingImageController.php index b8a53cfe4..aee9dd461 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingImageController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingImageController.php @@ -48,13 +48,6 @@ public function editImagesAction(Request $request, Listing $listing) $editForm = $this->createEditImagesForm($listing); $editForm->handleRequest($request); - $selfUrl = $this->generateUrl( - 'cocorico_dashboard_listing_edit_images', - array( - 'id' => $listing->getId() - ) - ); - if ($editForm->isSubmitted() && $editForm->isValid()) { $this->get("cocorico.listing.manager")->save($listing); @@ -63,7 +56,10 @@ public function editImagesAction(Request $request, Listing $listing) $translator->trans('listing.edit.success', array(), 'cocorico_listing') ); - return $this->redirect($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_listing_edit_images', + array('id' => $listing->getId()) + ); } return $this->render( diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingLocationController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingLocationController.php index ed0189b6d..c9a42bf03 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingLocationController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingLocationController.php @@ -48,12 +48,6 @@ public function editLocationAction(Request $request, Listing $listing) $editForm = $this->createEditLocationForm($listing); $editForm->handleRequest($request); - $selfUrl = $this->generateUrl( - 'cocorico_dashboard_listing_edit_location', - array( - 'id' => $listing->getId() - ) - ); if ($editForm->isSubmitted() && $editForm->isValid()) { $this->get("cocorico.listing.manager")->save($listing); @@ -62,7 +56,10 @@ public function editLocationAction(Request $request, Listing $listing) $translator->trans('listing.edit.success', array(), 'cocorico_listing') ); - return $this->redirect($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_listing_edit_location', + array('id' => $listing->getId()) + ); } return $this->render( diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingPresentationController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingPresentationController.php index 128096cd4..cd564500d 100644 --- a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingPresentationController.php +++ b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingPresentationController.php @@ -47,12 +47,6 @@ public function editPresentationAction(Request $request, Listing $listing) $editForm = $this->createEditPresentationForm($listing); $editForm->handleRequest($request); - $selfUrl = $this->generateUrl( - 'cocorico_dashboard_listing_edit_presentation', - array( - 'id' => $listing->getId() - ) - ); if ($editForm->isSubmitted() && $editForm->isValid()) { $this->get("cocorico.listing.manager")->save($listing); @@ -62,7 +56,10 @@ public function editPresentationAction(Request $request, Listing $listing) ); - return $this->redirect($selfUrl); + return $this->redirectToRoute( + 'cocorico_dashboard_listing_edit_presentation', + array('id' => $listing->getId()) + ); } return $this->render(