diff --git a/composer.json b/composer.json index 4f56162ec..79de337ba 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 4f103921a..7bf4b43ce 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'); } } }