aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Controller
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-12-22 13:00:37 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-15 09:35:38 +0100
commit5c895a7fd15822856fb407910264c5d95e1e223c (patch)
treea850ff9ccfd8067d4f8cdd341a2dda4324008afa /src/Wallabag/CoreBundle/Controller
parent619cc45359ead519b64129181a07e14160fbbfcb (diff)
downloadwallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.gz
wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.zst
wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.zip
Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php13
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php6
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php2
3 files changed, 11 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index f51ccaa4..d0cf91de 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -8,6 +8,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
8use Symfony\Component\HttpFoundation\Request; 8use Symfony\Component\HttpFoundation\Request;
9use Wallabag\CoreBundle\Entity\Config; 9use Wallabag\CoreBundle\Entity\Config;
10use Wallabag\CoreBundle\Entity\TaggingRule; 10use Wallabag\CoreBundle\Entity\TaggingRule;
11use Wallabag\CoreBundle\Form\Type\ConfigType;
11use Wallabag\CoreBundle\Form\Type\ChangePasswordType; 12use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
12use Wallabag\CoreBundle\Form\Type\NewUserType; 13use Wallabag\CoreBundle\Form\Type\NewUserType;
13use Wallabag\CoreBundle\Form\Type\RssType; 14use Wallabag\CoreBundle\Form\Type\RssType;
@@ -31,7 +32,7 @@ class ConfigController extends Controller
31 $user = $this->getUser(); 32 $user = $this->getUser();
32 33
33 // handle basic config detail (this form is defined as a service) 34 // handle basic config detail (this form is defined as a service)
34 $configForm = $this->createForm('config', $config, array('action' => $this->generateUrl('config'))); 35 $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config')));
35 $configForm->handleRequest($request); 36 $configForm->handleRequest($request);
36 37
37 if ($configForm->isValid()) { 38 if ($configForm->isValid()) {
@@ -51,7 +52,7 @@ class ConfigController extends Controller
51 } 52 }
52 53
53 // handle changing password 54 // handle changing password
54 $pwdForm = $this->createForm(new ChangePasswordType(), null, array('action' => $this->generateUrl('config').'#set4')); 55 $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4'));
55 $pwdForm->handleRequest($request); 56 $pwdForm->handleRequest($request);
56 57
57 if ($pwdForm->isValid()) { 58 if ($pwdForm->isValid()) {
@@ -67,7 +68,7 @@ class ConfigController extends Controller
67 } 68 }
68 69
69 // handle changing user information 70 // handle changing user information
70 $userForm = $this->createForm(new UserInformationType(), $user, array( 71 $userForm = $this->createForm(UserInformationType::class, $user, array(
71 'validation_groups' => array('Profile'), 72 'validation_groups' => array('Profile'),
72 'action' => $this->generateUrl('config').'#set3', 73 'action' => $this->generateUrl('config').'#set3',
73 )); 74 ));
@@ -85,7 +86,7 @@ class ConfigController extends Controller
85 } 86 }
86 87
87 // handle rss information 88 // handle rss information
88 $rssForm = $this->createForm(new RssType(), $config, array('action' => $this->generateUrl('config').'#set2')); 89 $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2'));
89 $rssForm->handleRequest($request); 90 $rssForm->handleRequest($request);
90 91
91 if ($rssForm->isValid()) { 92 if ($rssForm->isValid()) {
@@ -102,7 +103,7 @@ class ConfigController extends Controller
102 103
103 // handle tagging rule 104 // handle tagging rule
104 $taggingRule = new TaggingRule(); 105 $taggingRule = new TaggingRule();
105 $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule, array('action' => $this->generateUrl('config').'#set5')); 106 $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
106 $newTaggingRule->handleRequest($request); 107 $newTaggingRule->handleRequest($request);
107 108
108 if ($newTaggingRule->isValid()) { 109 if ($newTaggingRule->isValid()) {
@@ -122,7 +123,7 @@ class ConfigController extends Controller
122 $newUser = $userManager->createUser(); 123 $newUser = $userManager->createUser();
123 // enable created user by default 124 // enable created user by default
124 $newUser->setEnabled(true); 125 $newUser->setEnabled(true);
125 $newUserForm = $this->createForm(new NewUserType(), $newUser, array( 126 $newUserForm = $this->createForm(NewUserType::class, $newUser, array(
126 'validation_groups' => array('Profile'), 127 'validation_groups' => array('Profile'),
127 'action' => $this->generateUrl('config').'#set5', 128 'action' => $this->generateUrl('config').'#set5',
128 )); 129 ));
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index c1b5a71b..83e5b57d 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -43,7 +43,7 @@ class EntryController extends Controller
43 { 43 {
44 $entry = new Entry($this->getUser()); 44 $entry = new Entry($this->getUser());
45 45
46 $form = $this->createForm(new NewEntryType(), $entry); 46 $form = $this->createForm(NewEntryType::class, $entry);
47 47
48 $form->handleRequest($request); 48 $form->handleRequest($request);
49 49
@@ -117,7 +117,7 @@ class EntryController extends Controller
117 { 117 {
118 $this->checkUserAction($entry); 118 $this->checkUserAction($entry);
119 119
120 $form = $this->createForm(new EditEntryType(), $entry); 120 $form = $this->createForm(EditEntryType::class, $entry);
121 121
122 $form->handleRequest($request); 122 $form->handleRequest($request);
123 123
@@ -234,7 +234,7 @@ class EntryController extends Controller
234 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); 234 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
235 } 235 }
236 236
237 $form = $this->get('form.factory')->create(new EntryFilterType($repository, $this->getUser())); 237 $form = $this->createForm(new EntryFilterType($repository, $this->getUser()));
238 238
239 if ($request->query->has($form->getName())) { 239 if ($request->query->has($form->getName())) {
240 // manually bind values from the request 240 // manually bind values from the request
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 682cc6e6..ff4d64a8 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -21,7 +21,7 @@ class TagController extends Controller
21 public function addTagFormAction(Request $request, Entry $entry) 21 public function addTagFormAction(Request $request, Entry $entry)
22 { 22 {
23 $tag = new Tag(); 23 $tag = new Tag();
24 $form = $this->createForm(new NewTagType(), $tag); 24 $form = $this->createForm(NewTagType::class, $tag);
25 $form->handleRequest($request); 25 $form->handleRequest($request);
26 26
27 if ($form->isValid()) { 27 if ($form->isValid()) {