diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2018-10-08 08:00:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-08 08:00:07 +0000 |
commit | 102f57941ebfd03899760f8add0701952b4d982f (patch) | |
tree | 004a45801b8e811e97661a156d862da572f14034 /tests/Wallabag/ApiBundle | |
parent | 2b6380f5acaecaa7aa04c12d7bf4fd7c84b60b08 (diff) | |
parent | 115de64e5bb9d7f9151ecf15e15a0d988563528e (diff) | |
download | wallabag-102f57941ebfd03899760f8add0701952b4d982f.tar.gz wallabag-102f57941ebfd03899760f8add0701952b4d982f.tar.zst wallabag-102f57941ebfd03899760f8add0701952b4d982f.zip |
Merge pull request #3731 from wallabag/symfony3.4
Jump to Symfony 3.4
Diffstat (limited to 'tests/Wallabag/ApiBundle')
-rw-r--r-- | tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php | 2 | ||||
-rw-r--r-- | tests/Wallabag/ApiBundle/WallabagApiTestCase.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php index f58d1c12..090155d7 100644 --- a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php +++ b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php | |||
@@ -121,7 +121,7 @@ class DeveloperControllerTest extends WallabagCoreTestCase | |||
121 | { | 121 | { |
122 | $client = $this->getClient(); | 122 | $client = $this->getClient(); |
123 | $em = $client->getContainer()->get('doctrine.orm.entity_manager'); | 123 | $em = $client->getContainer()->get('doctrine.orm.entity_manager'); |
124 | $userManager = $client->getContainer()->get('fos_user.user_manager'); | 124 | $userManager = $client->getContainer()->get('fos_user.user_manager.test'); |
125 | $user = $userManager->findUserBy(['username' => $username]); | 125 | $user = $userManager->findUserBy(['username' => $username]); |
126 | $apiClient = new Client($user); | 126 | $apiClient = new Client($user); |
127 | $apiClient->setName('My app'); | 127 | $apiClient->setName('My app'); |
diff --git a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php index 8a188e1c..0c52aea0 100644 --- a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php +++ b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php | |||
@@ -31,9 +31,9 @@ abstract class WallabagApiTestCase extends WebTestCase | |||
31 | $container = $client->getContainer(); | 31 | $container = $client->getContainer(); |
32 | 32 | ||
33 | /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */ | 33 | /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */ |
34 | $userManager = $container->get('fos_user.user_manager'); | 34 | $userManager = $container->get('fos_user.user_manager.test'); |
35 | /** @var $loginManager \FOS\UserBundle\Security\LoginManager */ | 35 | /** @var $loginManager \FOS\UserBundle\Security\LoginManager */ |
36 | $loginManager = $container->get('fos_user.security.login_manager'); | 36 | $loginManager = $container->get('fos_user.security.login_manager.test'); |
37 | $firewallName = $container->getParameter('fos_user.firewall_name'); | 37 | $firewallName = $container->getParameter('fos_user.firewall_name'); |
38 | 38 | ||
39 | $this->user = $userManager->findUserBy(['username' => 'admin']); | 39 | $this->user = $userManager->findUserBy(['username' => 'admin']); |