mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-29 20:41:03 +00:00
Code Issues Projects Releases Wiki Activity

Lock deps for FOSUser

Browse source 
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.
This commit is contained in:
Jeremy Benoist 2016-10-11 18:59:08 +02:00
parent 9bed0ea236
commit a0a4ce3135
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
composer.json
View file

@ -65,9 +65,9 @@
"liip/theme-bundle": "~1.1", "liip/theme-bundle": "~1.1",
"lexik/form-filter-bundle": "~5.0", "lexik/form-filter-bundle": "~5.0",
"j0k3r/graby": "~1.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", "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", "scheb/two-factor-bundle": "~2.0",
"grandt/phpepub": "~4.0", "grandt/phpepub": "~4.0",
"wallabag/php-mobi": "~1.0.0", "wallabag/php-mobi": "~1.0.0",

4
tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
View file

@ -90,9 +90,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
try { try {
$this->client->getContainer()->get('wallabag_core.redis.client')->connect(); $this->client->getContainer()->get('wallabag_core.redis.client')->connect();
} catch (\Exception $e) { } catch (\Exception $e) {
$this->markTestSkipped( $this->markTestSkipped('Redis is not installed/activated');
'Redis is not installed/activated'
);
} }
} }
} }