diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-24 10:06:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-24 10:06:12 +0200 |
commit | a1c18418288a9521c980c96fd5defffc757a81c6 (patch) | |
tree | 7331a401bec4f3a4d2a8afc6462ac4fe2eea32f9 /tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php | |
parent | 1e7807e703fd75eceff3df512308b56e452d6dc6 (diff) | |
parent | aa4741091f3f2cc7e4a7ef061a04678597ddeca8 (diff) | |
download | wallabag-a1c18418288a9521c980c96fd5defffc757a81c6.tar.gz wallabag-a1c18418288a9521c980c96fd5defffc757a81c6.tar.zst wallabag-a1c18418288a9521c980c96fd5defffc757a81c6.zip |
Merge pull request #1890 from wallabag/v2-api-annotation-switched
bring annotations to API
Diffstat (limited to 'tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php')
-rw-r--r-- | tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php index 82790a5c..ef3f1324 100644 --- a/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php +++ b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\BrowserKit\Cookie; | |||
8 | abstract class WallabagAnnotationTestCase extends WebTestCase | 8 | abstract class WallabagAnnotationTestCase extends WebTestCase |
9 | { | 9 | { |
10 | /** | 10 | /** |
11 | * @var Client | 11 | * @var \Symfony\Bundle\FrameworkBundle\Client |
12 | */ | 12 | */ |
13 | protected $client = null; | 13 | protected $client = null; |
14 | 14 | ||
@@ -35,7 +35,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase | |||
35 | } | 35 | } |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * @return Client | 38 | * @return \Symfony\Bundle\FrameworkBundle\Client |
39 | */ | 39 | */ |
40 | protected function createAuthorizedClient() | 40 | protected function createAuthorizedClient() |
41 | { | 41 | { |
@@ -49,7 +49,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase | |||
49 | $firewallName = $container->getParameter('fos_user.firewall_name'); | 49 | $firewallName = $container->getParameter('fos_user.firewall_name'); |
50 | 50 | ||
51 | $this->user = $userManager->findUserBy(['username' => 'admin']); | 51 | $this->user = $userManager->findUserBy(['username' => 'admin']); |
52 | $loginManager->loginUser($firewallName, $this->user); | 52 | $loginManager->logInUser($firewallName, $this->user); |
53 | 53 | ||
54 | // save the login token into the session and put it in a cookie | 54 | // save the login token into the session and put it in a cookie |
55 | $container->get('session')->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken())); | 55 | $container->get('session')->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken())); |