From a0a4ce3135565d5d0e362da044e17ce8052bb272 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 11 Oct 2016 18:59:08 +0200
Subject: Lock deps for FOSUser
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We’ll wait until the final release will be out and other related project will be update to support it.
Meanwhile we can safely lock to a previous version.
---
 composer.json                                      | 4 ++--
 tests/Wallabag/CoreBundle/WallabagCoreTestCase.php | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 4f56162e..79de337b 100644
--- a/composer.json
+++ b/composer.json
@@ -65,9 +65,9 @@
         "liip/theme-bundle": "~1.1",
         "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "~2.0@dev",
+        "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
-        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "stof/doctrine-extensions-bundle": "^1.2",
         "scheb/two-factor-bundle": "~2.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 4f103921..7bf4b43c 100644
--- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
+++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
@@ -90,9 +90,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
         try {
             $this->client->getContainer()->get('wallabag_core.redis.client')->connect();
         } catch (\Exception $e) {
-            $this->markTestSkipped(
-              'Redis is not installed/activated'
-            );
+            $this->markTestSkipped('Redis is not installed/activated');
         }
     }
 }
-- 
cgit v1.2.3