devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-15 09:57:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2429 from wallabag/lock-fos-user

Browse Source 
Lock deps for FOSUser
This commit is contained in:
Nicolas Lœuillet 2016-10-11 19:32:22 +02:00 committed by GitHub
commit dbe94e73a9
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'
);
} }
} }
} }