mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-08 16:29:30 +00:00
Code Issues Projects Releases Wiki Activity

CS

Browse source
This commit is contained in:
Jeremy Benoist 2016-02-12 12:24:30 +01:00
parent 0c6845a98f
commit 9856805540
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\TaggingRule;
@ -172,7 +173,7 @@ class ConfigController extends Controller
*
* @Route("/generate-token", name="generate_token")
*
* @return JsonResponse
* @return RedirectResponse|JsonResponse
*/
public function generateTokenAction(Request $request)
{
@ -202,7 +203,7 @@ class ConfigController extends Controller
*
* @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
* @return RedirectResponse
*/
public function deleteTaggingRuleAction(TaggingRule $rule)
{

2
src/Wallabag/CoreBundle/Form/Type/NewUserType.php
View file

@ -21,7 +21,7 @@ class NewUserType extends AbstractType
->add('plainPassword', RepeatedType::class, array(
'type' => PasswordType::class,
'invalid_message' => 'The password fields must match',
'first_options' => array('label' => 'Password'),
'first_options' => array('label' => 'Password'),
'second_options' => array('label' => 'Repeat new password'),
'constraints' => array(
new Constraints\Length(array(