diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index cba58858..17b72bd1 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -54,10 +54,10 @@ class EntryController extends Controller | |||
54 | if (false !== $existingEntry) { | 54 | if (false !== $existingEntry) { |
55 | $this->get('session')->getFlashBag()->add( | 55 | $this->get('session')->getFlashBag()->add( |
56 | 'notice', | 56 | 'notice', |
57 | $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y'))) | 57 | $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', ['%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')]) |
58 | ); | 58 | ); |
59 | 59 | ||
60 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); | 60 | return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()])); |
61 | } | 61 | } |
62 | 62 | ||
63 | $this->updateEntry($entry); | 63 | $this->updateEntry($entry); |
@@ -69,9 +69,9 @@ class EntryController extends Controller | |||
69 | return $this->redirect($this->generateUrl('homepage')); | 69 | return $this->redirect($this->generateUrl('homepage')); |
70 | } | 70 | } |
71 | 71 | ||
72 | return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array( | 72 | return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', [ |
73 | 'form' => $form->createView(), | 73 | 'form' => $form->createView(), |
74 | )); | 74 | ]); |
75 | } | 75 | } |
76 | 76 | ||
77 | /** | 77 | /** |
@@ -131,12 +131,12 @@ class EntryController extends Controller | |||
131 | 'flashes.entry.notice.entry_updated' | 131 | 'flashes.entry.notice.entry_updated' |
132 | ); | 132 | ); |
133 | 133 | ||
134 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); | 134 | return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); |
135 | } | 135 | } |
136 | 136 | ||
137 | return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array( | 137 | return $this->render('WallabagCoreBundle:Entry:edit.html.twig', [ |
138 | 'form' => $form->createView(), | 138 | 'form' => $form->createView(), |
139 | )); | 139 | ]); |
140 | } | 140 | } |
141 | 141 | ||
142 | /** | 142 | /** |
@@ -257,17 +257,17 @@ class EntryController extends Controller | |||
257 | $entries->setCurrentPage($page); | 257 | $entries->setCurrentPage($page); |
258 | } catch (OutOfRangeCurrentPageException $e) { | 258 | } catch (OutOfRangeCurrentPageException $e) { |
259 | if ($page > 1) { | 259 | if ($page > 1) { |
260 | return $this->redirect($this->generateUrl($type, array('page' => $entries->getNbPages())), 302); | 260 | return $this->redirect($this->generateUrl($type, ['page' => $entries->getNbPages()]), 302); |
261 | } | 261 | } |
262 | } | 262 | } |
263 | 263 | ||
264 | return $this->render( | 264 | return $this->render( |
265 | 'WallabagCoreBundle:Entry:entries.html.twig', | 265 | 'WallabagCoreBundle:Entry:entries.html.twig', |
266 | array( | 266 | [ |
267 | 'form' => $form->createView(), | 267 | 'form' => $form->createView(), |
268 | 'entries' => $entries, | 268 | 'entries' => $entries, |
269 | 'currentPage' => $page, | 269 | 'currentPage' => $page, |
270 | ) | 270 | ] |
271 | ); | 271 | ); |
272 | } | 272 | } |
273 | 273 | ||
@@ -286,7 +286,7 @@ class EntryController extends Controller | |||
286 | 286 | ||
287 | return $this->render( | 287 | return $this->render( |
288 | 'WallabagCoreBundle:Entry:entry.html.twig', | 288 | 'WallabagCoreBundle:Entry:entry.html.twig', |
289 | array('entry' => $entry) | 289 | ['entry' => $entry] |
290 | ); | 290 | ); |
291 | } | 291 | } |
292 | 292 | ||
@@ -314,7 +314,7 @@ class EntryController extends Controller | |||
314 | $message | 314 | $message |
315 | ); | 315 | ); |
316 | 316 | ||
317 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); | 317 | return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); |
318 | } | 318 | } |
319 | 319 | ||
320 | /** | 320 | /** |
@@ -394,7 +394,7 @@ class EntryController extends Controller | |||
394 | // to avoid redirecting to the deleted entry. Ugh. | 394 | // to avoid redirecting to the deleted entry. Ugh. |
395 | $url = $this->generateUrl( | 395 | $url = $this->generateUrl( |
396 | 'view', | 396 | 'view', |
397 | array('id' => $entry->getId()), | 397 | ['id' => $entry->getId()], |
398 | UrlGeneratorInterface::ABSOLUTE_URL | 398 | UrlGeneratorInterface::ABSOLUTE_URL |
399 | ); | 399 | ); |
400 | 400 | ||
@@ -426,11 +426,11 @@ class EntryController extends Controller | |||
426 | /** | 426 | /** |
427 | * Check for existing entry, if it exists, redirect to it with a message. | 427 | * Check for existing entry, if it exists, redirect to it with a message. |
428 | * | 428 | * |
429 | * @param $entry | 429 | * @param Entry $entry |
430 | * | 430 | * |
431 | * @return array|bool | 431 | * @return Entry|bool |
432 | */ | 432 | */ |
433 | private function checkIfEntryAlreadyExists($entry) | 433 | private function checkIfEntryAlreadyExists(Entry $entry) |
434 | { | 434 | { |
435 | return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); | 435 | return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); |
436 | } | 436 | } |