From 9666fb70fc23f273d137d8d3300c60e24789c73b Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 12 Jan 2019 13:10:51 +0100
Subject: Bump ocramius/proxy-manager

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 composer.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 405b1188..5394442d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,10 @@
     "name": "wallabag/wallabag",
     "type": "project",
     "description": "open source self hostable read-it-later web application",
-    "keywords": ["read-it-later","read it later"],
+    "keywords": [
+        "read-it-later",
+        "read it later"
+    ],
     "homepage": "https://github.com/wallabag/wallabag",
     "license": "MIT",
     "authors": [
@@ -75,7 +78,7 @@
         "doctrine/doctrine-migrations-bundle": "^1.3",
         "craue/config-bundle": "dev-utf8mb4",
         "mnapoli/piwik-twig-extension": "^1.0",
-        "ocramius/proxy-manager": "^1.0.2",
+        "ocramius/proxy-manager": "^2.1.1",
         "white-october/pagerfanta-bundle": "^1.1",
         "php-amqplib/rabbitmq-bundle": "^1.14",
         "predis/predis": "v1.1.x-dev",
@@ -133,7 +136,9 @@
         "psr-4": {
             "Tests\\": "tests/"
         },
-        "files": [ "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
+        "files": [
+            "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php"
+        ]
     },
     "config": {
         "bin-dir": "bin",
-- 
cgit v1.2.3


From 963b87362624a39f5443b31a6b3591d70c63493b Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 18 Jan 2019 16:05:20 +0100
Subject: CS

---
 src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php       | 2 +-
 src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php | 2 +-
 src/Wallabag/ImportBundle/Import/InstapaperImport.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
index 1c2c5093..183d394a 100644
--- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
+++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
@@ -23,7 +23,7 @@ class PreparePagerForEntries
      * @param AdapterInterface $adapter
      * @param User             $user    If user isn't logged in, we can force it (like for rss)
      *
-     * @return null|Pagerfanta
+     * @return Pagerfanta|null
      */
     public function prepare(AdapterInterface $adapter, User $user = null)
     {
diff --git a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php
index 36906761..b2e212a4 100644
--- a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php
@@ -22,7 +22,7 @@ class SiteCredentialRepository extends \Doctrine\ORM\EntityRepository
      * @param string $host
      * @param int    $userId
      *
-     * @return null|array
+     * @return array|null
      */
     public function findOneByHostAndUser($host, $userId)
     {
diff --git a/src/Wallabag/ImportBundle/Import/InstapaperImport.php b/src/Wallabag/ImportBundle/Import/InstapaperImport.php
index e113ba00..a12af758 100644
--- a/src/Wallabag/ImportBundle/Import/InstapaperImport.php
+++ b/src/Wallabag/ImportBundle/Import/InstapaperImport.php
@@ -62,7 +62,7 @@ class InstapaperImport extends AbstractImport
         }
 
         $entries = [];
-        $handle = fopen($this->filepath, 'rb');
+        $handle = fopen($this->filepath, 'r');
         while (false !== ($data = fgetcsv($handle, 10240))) {
             if ('URL' === $data[0]) {
                 continue;
-- 
cgit v1.2.3