diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 18:59:08 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 18:59:08 +0200 |
commit | a0a4ce3135565d5d0e362da044e17ce8052bb272 (patch) | |
tree | 59c04b4836def3628c508c4d15e5ec45f4c05315 | |
parent | 9bed0ea23672eaf72c3a7d9107e7d1fd4fe8fdf0 (diff) | |
download | wallabag-a0a4ce3135565d5d0e362da044e17ce8052bb272.tar.gz wallabag-a0a4ce3135565d5d0e362da044e17ce8052bb272.tar.zst wallabag-a0a4ce3135565d5d0e362da044e17ce8052bb272.zip |
Lock deps for FOSUser
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.
-rw-r--r-- | composer.json | 4 | ||||
-rw-r--r-- | 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 @@ | |||
65 | "liip/theme-bundle": "~1.1", | 65 | "liip/theme-bundle": "~1.1", |
66 | "lexik/form-filter-bundle": "~5.0", | 66 | "lexik/form-filter-bundle": "~5.0", |
67 | "j0k3r/graby": "~1.0", | 67 | "j0k3r/graby": "~1.0", |
68 | "friendsofsymfony/user-bundle": "~2.0@dev", | 68 | "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev", |
69 | "friendsofsymfony/oauth-server-bundle": "^1.5", | 69 | "friendsofsymfony/oauth-server-bundle": "^1.5", |
70 | "stof/doctrine-extensions-bundle": "^1.2@dev", | 70 | "stof/doctrine-extensions-bundle": "^1.2", |
71 | "scheb/two-factor-bundle": "~2.0", | 71 | "scheb/two-factor-bundle": "~2.0", |
72 | "grandt/phpepub": "~4.0", | 72 | "grandt/phpepub": "~4.0", |
73 | "wallabag/php-mobi": "~1.0.0", | 73 | "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 | |||
90 | try { | 90 | try { |
91 | $this->client->getContainer()->get('wallabag_core.redis.client')->connect(); | 91 | $this->client->getContainer()->get('wallabag_core.redis.client')->connect(); |
92 | } catch (\Exception $e) { | 92 | } catch (\Exception $e) { |
93 | $this->markTestSkipped( | 93 | $this->markTestSkipped('Redis is not installed/activated'); |
94 | 'Redis is not installed/activated' | ||
95 | ); | ||
96 | } | 94 | } |
97 | } | 95 | } |
98 | } | 96 | } |