Merge pull request #1167 from wallabag/v2-api-bundle

Move API stuff in ApiBundle

diff --git a/README.md b/README.md
index 1e33940a8de9fa70a9e4a31bfdfc8cbe90022951..34f60b9084f855301b10392b0534721099392276 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
+[![Code Coverage](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/coverage.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+
 # What is wallabag ?
 wallabag is a self hostable application allowing you to not miss any content anymore.
 Click, save, read it when you can. It extracts content so that you can read it when you have time.

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryType.php b/src/Wallabag/CoreBundle/Form/Type/EntryType.php
index 839bc25cccadfefcfd2c5df67d7a91e5dba0509f..0532bf104e8523d295a098034a9c18325d53ae20 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/EntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryType.php
@@ -11,7 +11,7 @@ class EntryType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('url', 'url')
+            ->add('url', 'url', array('required' => true))
             ->add('save', 'submit')
         ;
     }

diff --git a/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php
index 2ee24b8f569cf18086cd28dda4ac3484f61f7e05..9e95eb47a9613d9ed0727a889b3b3925a8fa3d11 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php
@@ -21,6 +21,7 @@ class ForgotPasswordType extends AbstractType
     {
         $builder
             ->add('email', 'email', array(
+                'required' => true,
                 'constraints' => array(
                     new Constraints\Email(),
                     new Constraints\NotBlank(),

diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index da30ccd93ade8b0a0cdbc68bb9064eb4581ff7a0..a12fff2b9b850514a6d0296bed79877550a640f1 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -12,7 +12,7 @@ class NewUserType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('username', 'text')
+            ->add('username', 'text', array('required' => true))
             ->add('password', 'password', array(
                 'constraints' => array(
                     new Constraints\Length(array(
@@ -22,7 +22,7 @@ class NewUserType extends AbstractType
                     new Constraints\NotBlank(),
                 ),
             ))
-            ->add('email', 'text')
+            ->add('email', 'email')
             ->add('save', 'submit')
         ;
     }

diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index c088fdd0dde135a29cc6e37d74ba25f7f6db4b44..f0367d14f339809f781bff5b4255ad123e34187e 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -12,7 +12,7 @@ class UserInformationType extends AbstractType
     {
         $builder
             ->add('name', 'text')
-            ->add('email', 'text')
+            ->add('email', 'email')
             ->add('save', 'submit')
         ;
     }