Merge remote-tracking branch 'origin/master' into 2.3

src/Wallabag/ApiBundle/Controller/EntryRestController.php

@@ -95,12 +95,13 @@ class EntryRestController extends WallabagRestController
         $tags = $request->query->get('tags', '');
         $since = $request->query->get('since', 0);
 
+        /** @var \Pagerfanta\Pagerfanta $pager */
         $pager = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
             ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
 
-        $pager->setCurrentPage($page);
         $pager->setMaxPerPage($perPage);
+        $pager->setCurrentPage($page);
 
         $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
         $paginatedCollection = $pagerfantaFactory->createRepresentation(

src/Wallabag/ApiBundle/Form/Type/ClientType.php

@@ -16,7 +16,11 @@ class ClientType extends AbstractType
     {
         $builder
             ->add('name', TextType::class, ['label' => 'developer.client.form.name_label'])
-            ->add('redirect_uris', UrlType::class, ['required' => false, 'label' => 'developer.client.form.redirect_uris_label'])
+            ->add('redirect_uris', UrlType::class, [
+                'required' => false,
+                'label' => 'developer.client.form.redirect_uris_label',
+                'property_path' => 'redirectUris',
+            ])
             ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label'])
         ;
 

src/Wallabag/CoreBundle/Form/Type/ConfigType.php

@@ -39,9 +39,11 @@ class ConfigType extends AbstractType
             ])
             ->add('items_per_page', null, [
                 'label' => 'config.form_settings.items_per_page_label',
+                'property_path' => 'itemsPerPage',
             ])
             ->add('reading_speed', ChoiceType::class, [
                 'label' => 'config.form_settings.reading_speed.label',
+                'property_path' => 'readingSpeed',
                 'choices' => [
                     'config.form_settings.reading_speed.100_word' => '0.5',
                     'config.form_settings.reading_speed.200_word' => '1',
@@ -51,6 +53,7 @@ class ConfigType extends AbstractType
             ])
             ->add('action_mark_as_read', ChoiceType::class, [
                 'label' => 'config.form_settings.action_mark_as_read.label',
+                'property_path' => 'actionMarkAsRead',
                 'choices' => [
                     'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
                     'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
@@ -61,6 +64,7 @@ class ConfigType extends AbstractType
                 'label' => 'config.form_settings.language_label',
             ])
             ->add('pocket_consumer_key', null, [
+                'property_path' => 'pocketConsumerKey',
                 'label' => 'config.form_settings.pocket_consumer_key_label',
             ])
             ->add('save', SubmitType::class, [

src/Wallabag/CoreBundle/Form/Type/RssType.php

@@ -14,6 +14,7 @@ class RssType extends AbstractType
         $builder
             ->add('rss_limit', null, [
                 'label' => 'config.form_rss.rss_limit',
+                'property_path' => 'rssLimit',
             ])
             ->add('save', SubmitType::class, [
                 'label' => 'config.form.save',

src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig

@@ -106,8 +106,8 @@
                             <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
                             <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
                             <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
-                            <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
-                            <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
+                            <tr><td>j0k3r/graby</td><td>MIT</td></tr>
+                            <tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr>
                             <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
                             <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
                             <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>

src/Wallabag/UserBundle/Resources/views/Security/login.html.twig

@@ -5,7 +5,7 @@
     <div class="card-content">
 
         {% if error %}
-            <script>Materialize.toast('{{ error.message }}', 4000)</script>
+            <script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
         {% endif %}
 
         {% for flashMessage in app.session.flashbag.get('notice') %}