Merged in update (pull request #40)

composer update

composer.json

@@ -16,6 +16,7 @@
         "ext-ctype": "*",
         "ext-hash": "*",
         "ext-iconv": "*",
+        "babdev/pagerfanta-bundle": "^2.4",
         "excelwebzone/recaptcha-bundle": "^1.5",
         "sensio/framework-extra-bundle": "^5.1",
         "sentry/sentry-symfony": "^3.4",
@@ -36,8 +37,7 @@
         "symfony/twig-bundle": "^4.1",
         "symfony/validator": "^4.1",
         "symfony/web-server-bundle": "^4.1",
-        "symfony/yaml": "^4.1",
-        "white-october/pagerfanta-bundle": "^1.2"
+        "symfony/yaml": "^4.1"
     },
     "require-dev": {
         "symfony/web-profiler-bundle": "^4.1"

config/bundles.php

@@ -7,7 +7,7 @@ return [
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
     Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
-    WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle::class => ['all' => true],
+    BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],

config/packages/pagefanta.yaml

@@ -1,2 +1,2 @@
-white_october_pagerfanta:
+babdev_pagerfanta:
     default_view: twitter_bootstrap4_pageless

symfony.lock

@@ -1,4 +1,7 @@
 {
+    "babdev/pagerfanta-bundle": {
+        "version": "v2.4.3"
+    },
     "clue/stream-filter": {
         "version": "v1.4.1"
     },
@@ -65,6 +68,9 @@
     "doctrine/reflection": {
         "version": "v1.0.0"
     },
+    "doctrine/sql-formatter": {
+        "version": "1.1.0"
+    },
     "egulias/email-validator": {
         "version": "2.1.14"
     },
@@ -105,9 +111,6 @@
     "http-interop/http-factory-guzzle": {
         "version": "1.0.0"
     },
-    "jdorn/sql-formatter": {
-        "version": "v1.2.17"
-    },
     "jean85/pretty-package-versions": {
         "version": "1.2"
     },
@@ -124,7 +127,7 @@
         "version": "2.2.0"
     },
     "pagerfanta/pagerfanta": {
-        "version": "v2.0.1"
+        "version": "v2.3.0"
     },
     "paragonie/random_compat": {
         "version": "v9.99.99"
@@ -237,6 +240,9 @@
     "symfony/dependency-injection": {
         "version": "v4.1.0"
     },
+    "symfony/deprecation-contracts": {
+        "version": "v2.1.2"
+    },
     "symfony/doctrine-bridge": {
         "version": "v4.1.0"
     },
@@ -333,12 +339,18 @@
     "symfony/orm-pack": {
         "version": "v1.0.5"
     },
+    "symfony/polyfill-intl-grapheme": {
+        "version": "v1.17.1"
+    },
     "symfony/polyfill-intl-icu": {
         "version": "v1.8.0"
     },
     "symfony/polyfill-intl-idn": {
         "version": "v1.11.0"
     },
+    "symfony/polyfill-intl-normalizer": {
+        "version": "v1.17.1"
+    },
     "symfony/polyfill-mbstring": {
         "version": "v1.8.0"
     },
@@ -348,6 +360,9 @@
     "symfony/polyfill-php73": {
         "version": "v1.11.0"
     },
+    "symfony/polyfill-php80": {
+        "version": "v1.17.1"
+    },
     "symfony/polyfill-uuid": {
         "version": "v1.13.1"
     },
@@ -402,6 +417,9 @@
     "symfony/stopwatch": {
         "version": "v4.2.2"
     },
+    "symfony/string": {
+        "version": "v5.1.2"
+    },
     "symfony/translation": {
         "version": "3.3",
         "recipe": {
@@ -465,9 +483,6 @@
     "webmozart/assert": {
         "version": "1.3.0"
     },
-    "white-october/pagerfanta-bundle": {
-        "version": "v1.2.1"
-    },
     "zendframework/zend-code": {
         "version": "3.3.0"
     },

templates/Account/api.html.twig

@@ -20,7 +20,7 @@
         </th>
         <td>
             {# We can't use constant() in the hash so it's necessay to hard-code query parameter here #}
-            <input class="form-control" type="text" value="{{ url('api_v1_rss_last') }}?{{ {'api-key': token.key} | url_encode }}" readonly onclick="this.select();">
+            <input class="form-control" type="text" value="{{ url('api_v1_rss_last') }}?{{ {'api-token': token.key} | url_encode }}" readonly onclick="this.select();">
         </td>
         <td>
             {{ token.createdAt | date('Y-m-d H:i:s') }}

templates/base.html.twig

@@ -78,7 +78,7 @@
 </main><!-- /.container -->
 
 {% block javascript %}
-<script src="/assets/jquery/js/jquery-3.3.1.slim.min.js"></script>
+<script src="/assets/jquery/js/jquery-3.5.1.slim.min.js"></script>
 <script src="/assets/popper/js/popper.min.js"></script>
 <script src="/assets/bootstrap/js/bootstrap.min.js"></script>
 {% endblock %}