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

2019-01-15 09:41:18 +01:00
parent 5c331bf0f9 f6b9e883c0
commit 5419a8368e
61 changed files with 3813 additions and 1509 deletions
--- a/src/Wallabag/ImportBundle/Import/BrowserImport.php
+++ b/src/Wallabag/ImportBundle/Import/BrowserImport.php
@ -149,9 +149,9 @@ abstract class BrowserImport extends AbstractImport
    /**
     * Parse and insert all given entries.
     *
-     * @param $entries
+     * @param array $entries
     */
-    protected function parseEntries($entries)
+    protected function parseEntries(array $entries)
    {
        $i = 1;
        $entryToBeFlushed = [];