From 4094ea47712efbe58624ff74daeb1f77c9b0edcf Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 12 Apr 2016 11:36:01 +0200 Subject: Convert array + phpDoc Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter --- .../CoreBundle/Controller/ConfigController.php | 38 +++++++++++----------- .../CoreBundle/Controller/DeveloperController.php | 14 ++++---- .../CoreBundle/Controller/EntryController.php | 32 +++++++++--------- .../CoreBundle/Controller/ExportController.php | 10 +++++- .../CoreBundle/Controller/RssController.php | 4 +-- .../CoreBundle/Controller/StaticController.php | 8 ++--- .../CoreBundle/Controller/TagController.php | 11 ++++--- 7 files changed, 63 insertions(+), 54 deletions(-) (limited to 'src/Wallabag/CoreBundle/Controller') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 779be268..ccc3e8a1 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -32,7 +32,7 @@ class ConfigController extends Controller $user = $this->getUser(); // handle basic config detail (this form is defined as a service) - $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config'))); + $configForm = $this->createForm(ConfigType::class, $config, ['action' => $this->generateUrl('config')]); $configForm->handleRequest($request); if ($configForm->isValid()) { @@ -52,7 +52,7 @@ class ConfigController extends Controller } // handle changing password - $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4')); + $pwdForm = $this->createForm(ChangePasswordType::class, null, ['action' => $this->generateUrl('config').'#set4']); $pwdForm->handleRequest($request); if ($pwdForm->isValid()) { @@ -71,10 +71,10 @@ class ConfigController extends Controller } // handle changing user information - $userForm = $this->createForm(UserInformationType::class, $user, array( - 'validation_groups' => array('Profile'), + $userForm = $this->createForm(UserInformationType::class, $user, [ + 'validation_groups' => ['Profile'], 'action' => $this->generateUrl('config').'#set3', - )); + ]); $userForm->handleRequest($request); if ($userForm->isValid()) { @@ -89,7 +89,7 @@ class ConfigController extends Controller } // handle rss information - $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2')); + $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config').'#set2']); $rssForm->handleRequest($request); if ($rssForm->isValid()) { @@ -106,7 +106,7 @@ class ConfigController extends Controller // handle tagging rule $taggingRule = new TaggingRule(); - $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5')); + $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $this->generateUrl('config').'#set5']); $newTaggingRule->handleRequest($request); if ($newTaggingRule->isValid()) { @@ -126,10 +126,10 @@ class ConfigController extends Controller $newUser = $userManager->createUser(); // enable created user by default $newUser->setEnabled(true); - $newUserForm = $this->createForm(NewUserType::class, $newUser, array( - 'validation_groups' => array('Profile'), + $newUserForm = $this->createForm(NewUserType::class, $newUser, [ + 'validation_groups' => ['Profile'], 'action' => $this->generateUrl('config').'#set6', - )); + ]); $newUserForm->handleRequest($request); if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { @@ -147,27 +147,27 @@ class ConfigController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - $this->get('translator')->trans('flashes.config.notice.user_added', array('%username%' => $newUser->getUsername())) + $this->get('translator')->trans('flashes.config.notice.user_added', ['%username%' => $newUser->getUsername()]) ); return $this->redirect($this->generateUrl('config').'#set6'); } - return $this->render('WallabagCoreBundle:Config:index.html.twig', array( - 'form' => array( + return $this->render('WallabagCoreBundle:Config:index.html.twig', [ + 'form' => [ 'config' => $configForm->createView(), 'rss' => $rssForm->createView(), 'pwd' => $pwdForm->createView(), 'user' => $userForm->createView(), 'new_user' => $newUserForm->createView(), 'new_tagging_rule' => $newTaggingRule->createView(), - ), - 'rss' => array( + ], + 'rss' => [ 'username' => $user->getUsername(), 'token' => $config->getRssToken(), - ), + ], 'twofactor_auth' => $this->getParameter('twofactor_auth'), - )); + ]); } /** @@ -187,7 +187,7 @@ class ConfigController extends Controller $em->flush(); if ($request->isXmlHttpRequest()) { - return new JsonResponse(array('token' => $config->getRssToken())); + return new JsonResponse(['token' => $config->getRssToken()]); } $this->get('session')->getFlashBag()->add( @@ -229,7 +229,7 @@ class ConfigController extends Controller * Retrieve config for the current user. * If no config were found, create a new one. * - * @return Wallabag\CoreBundle\Entity\Config + * @return Config */ private function getConfig() { diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php index 7cb0ead2..d85ba5ee 100644 --- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php +++ b/src/Wallabag/CoreBundle/Controller/DeveloperController.php @@ -21,9 +21,9 @@ class DeveloperController extends Controller { $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findAll(); - return $this->render('WallabagCoreBundle:Developer:index.html.twig', array( + return $this->render('WallabagCoreBundle:Developer:index.html.twig', [ 'clients' => $clients, - )); + ]); } /** @@ -43,7 +43,7 @@ class DeveloperController extends Controller $clientForm->handleRequest($request); if ($clientForm->isValid()) { - $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password', 'refresh_token')); + $client->setAllowedGrantTypes(['token', 'authorization_code', 'password', 'refresh_token']); $em->persist($client); $em->flush(); @@ -52,15 +52,15 @@ class DeveloperController extends Controller 'flashes.developer.notice.client_created' ); - return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', array( + return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', [ 'client_id' => $client->getPublicId(), 'client_secret' => $client->getSecret(), - )); + ]); } - return $this->render('WallabagCoreBundle:Developer:client.html.twig', array( + return $this->render('WallabagCoreBundle:Developer:client.html.twig', [ 'form' => $clientForm->createView(), - )); + ]); } /** 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 if (false !== $existingEntry) { $this->get('session')->getFlashBag()->add( 'notice', - $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y'))) + $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', ['%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')]) ); - return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); + return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()])); } $this->updateEntry($entry); @@ -69,9 +69,9 @@ class EntryController extends Controller return $this->redirect($this->generateUrl('homepage')); } - return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array( + return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', [ 'form' => $form->createView(), - )); + ]); } /** @@ -131,12 +131,12 @@ class EntryController extends Controller 'flashes.entry.notice.entry_updated' ); - return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); } - return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array( + return $this->render('WallabagCoreBundle:Entry:edit.html.twig', [ 'form' => $form->createView(), - )); + ]); } /** @@ -257,17 +257,17 @@ class EntryController extends Controller $entries->setCurrentPage($page); } catch (OutOfRangeCurrentPageException $e) { if ($page > 1) { - return $this->redirect($this->generateUrl($type, array('page' => $entries->getNbPages())), 302); + return $this->redirect($this->generateUrl($type, ['page' => $entries->getNbPages()]), 302); } } return $this->render( 'WallabagCoreBundle:Entry:entries.html.twig', - array( + [ 'form' => $form->createView(), 'entries' => $entries, 'currentPage' => $page, - ) + ] ); } @@ -286,7 +286,7 @@ class EntryController extends Controller return $this->render( 'WallabagCoreBundle:Entry:entry.html.twig', - array('entry' => $entry) + ['entry' => $entry] ); } @@ -314,7 +314,7 @@ class EntryController extends Controller $message ); - return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); } /** @@ -394,7 +394,7 @@ class EntryController extends Controller // to avoid redirecting to the deleted entry. Ugh. $url = $this->generateUrl( 'view', - array('id' => $entry->getId()), + ['id' => $entry->getId()], UrlGeneratorInterface::ABSOLUTE_URL ); @@ -426,11 +426,11 @@ class EntryController extends Controller /** * Check for existing entry, if it exists, redirect to it with a message. * - * @param $entry + * @param Entry $entry * - * @return array|bool + * @return Entry|bool */ - private function checkIfEntryAlreadyExists($entry) + private function checkIfEntryAlreadyExists(Entry $entry) { return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); } diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Wallabag/CoreBundle/Controller/ExportController.php index c8ef49a2..944c755d 100644 --- a/src/Wallabag/CoreBundle/Controller/ExportController.php +++ b/src/Wallabag/CoreBundle/Controller/ExportController.php @@ -16,12 +16,15 @@ class ExportController extends Controller /** * Gets one entry content. * - * @param Entry $entry + * @param Entry $entry + * @param string $format * * @Route("/export/{id}.{format}", name="export_entry", requirements={ * "format": "epub|mobi|pdf|json|xml|txt|csv", * "id": "\d+" * }) + * + * @return \Symfony\Component\HttpFoundation\Response */ public function downloadEntryAction(Entry $entry, $format) { @@ -38,10 +41,15 @@ class ExportController extends Controller /** * Export all entries for current user. * + * @param string $format + * @param string $category + * * @Route("/export/{category}.{format}", name="export_entries", requirements={ * "format": "epub|mobi|pdf|json|xml|txt|csv", * "category": "all|unread|starred|archive" * }) + * + * @return \Symfony\Component\HttpFoundation\Response */ public function downloadEntriesAction($format, $category) { diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index a4f7a200..2118885c 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php @@ -87,9 +87,9 @@ class RssController extends Controller $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); $entries->setMaxPerPage($perPage); - return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( + return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', [ 'type' => $type, 'entries' => $entries, - )); + ]); } } diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index 5b7bd56e..b41302f8 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php @@ -14,7 +14,7 @@ class StaticController extends Controller { return $this->render( 'WallabagCoreBundle:Static:howto.html.twig', - array() + [] ); } @@ -25,10 +25,10 @@ class StaticController extends Controller { return $this->render( 'WallabagCoreBundle:Static:about.html.twig', - array( + [ 'version' => $this->getParameter('wallabag_core.version'), 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), - ) + ] ); } @@ -39,7 +39,7 @@ class StaticController extends Controller { return $this->render( 'WallabagCoreBundle:Static:quickstart.html.twig', - array() + [] ); } } diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 1a1f8c3d..e8e9ecbe 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php @@ -13,6 +13,7 @@ class TagController extends Controller { /** * @param Request $request + * @param Entry $entry * * @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag") * @@ -38,13 +39,13 @@ class TagController extends Controller 'flashes.tag.notice.tag_added' ); - return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); } - return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', array( + return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', [ 'form' => $form->createView(), 'entry' => $entry, - )); + ]); } /** @@ -82,9 +83,9 @@ class TagController extends Controller return $this->render( 'WallabagCoreBundle:Tag:tags.html.twig', - array( + [ 'tags' => $tags, - ) + ] ); } } -- cgit v1.2.3