forked from wallabag/wallabag
Fix PHPStan errors
This commit is contained in:
@ -4,12 +4,8 @@ namespace Tests\Wallabag\AnnotationBundle;
|
||||
|
||||
use FOS\UserBundle\Model\UserInterface;
|
||||
use FOS\UserBundle\Model\UserManager;
|
||||
use FOS\UserBundle\Security\LoginManager;
|
||||
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
|
||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||
use Symfony\Component\BrowserKit\Cookie;
|
||||
use Symfony\Component\HttpFoundation\Session\SessionInterface;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
|
||||
|
||||
abstract class WallabagAnnotationTestCase extends WebTestCase
|
||||
{
|
||||
@ -51,19 +47,11 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
|
||||
|
||||
/** @var UserManager $userManager */
|
||||
$userManager = $container->get('fos_user.user_manager.test');
|
||||
/** @var LoginManager $loginManager */
|
||||
$loginManager = $container->get('fos_user.security.login_manager.test');
|
||||
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||
|
||||
$this->user = $userManager->findUserBy(['username' => 'admin']);
|
||||
$loginManager->logInUser($firewallName, $this->user);
|
||||
|
||||
// save the login token into the session and put it in a cookie
|
||||
$container->get(SessionInterface::class)->set('_security_' . $firewallName, serialize($container->get(TokenStorageInterface::class)->getToken()));
|
||||
$container->get(SessionInterface::class)->save();
|
||||
|
||||
$session = $container->get(SessionInterface::class);
|
||||
$client->getCookieJar()->set(new Cookie($session->getName(), $session->getId()));
|
||||
$client->loginUser($this->user, $firewallName);
|
||||
|
||||
return $client;
|
||||
}
|
||||
|
||||
@ -5,12 +5,8 @@ namespace Tests\Wallabag\ApiBundle;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use FOS\UserBundle\Model\UserInterface;
|
||||
use FOS\UserBundle\Model\UserManager;
|
||||
use FOS\UserBundle\Security\LoginManager;
|
||||
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
|
||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||
use Symfony\Component\BrowserKit\Cookie;
|
||||
use Symfony\Component\HttpFoundation\Session\SessionInterface;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
abstract class WallabagApiTestCase extends WebTestCase
|
||||
@ -51,19 +47,11 @@ abstract class WallabagApiTestCase extends WebTestCase
|
||||
|
||||
/** @var UserManager $userManager */
|
||||
$userManager = $container->get('fos_user.user_manager.test');
|
||||
/** @var LoginManager $loginManager */
|
||||
$loginManager = $container->get('fos_user.security.login_manager.test');
|
||||
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||
|
||||
$this->user = $userManager->findUserBy(['username' => 'admin']);
|
||||
$loginManager->logInUser($firewallName, $this->user);
|
||||
|
||||
// save the login token into the session and put it in a cookie
|
||||
$container->get(SessionInterface::class)->set('_security_' . $firewallName, serialize($container->get(TokenStorageInterface::class)->getToken()));
|
||||
$container->get(SessionInterface::class)->save();
|
||||
|
||||
$session = $container->get(SessionInterface::class);
|
||||
$client->getCookieJar()->set(new Cookie($session->getName(), $session->getId()));
|
||||
$client->loginUser($this->user, $firewallName);
|
||||
|
||||
return $client;
|
||||
}
|
||||
|
||||
@ -6,10 +6,8 @@ use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Console\Application;
|
||||
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
|
||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||
use Symfony\Component\BrowserKit\Cookie;
|
||||
use Symfony\Component\Console\Input\ArrayInput;
|
||||
use Symfony\Component\Console\Output\NullOutput;
|
||||
use Symfony\Component\HttpFoundation\Session\SessionInterface;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
@ -88,10 +86,8 @@ abstract class WallabagCoreTestCase extends WebTestCase
|
||||
public function logInAs($username)
|
||||
{
|
||||
$container = $this->client->getContainer();
|
||||
$session = $container->get(SessionInterface::class);
|
||||
|
||||
$userManager = $container->get('fos_user.user_manager.test');
|
||||
$loginManager = $container->get('fos_user.security.login_manager.test');
|
||||
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||
|
||||
$user = $userManager->findUserBy(['username' => $username]);
|
||||
@ -100,13 +96,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
|
||||
throw new \Exception('Unable to find user "' . $username . '". Does fixtures were loaded?');
|
||||
}
|
||||
|
||||
$loginManager->logInUser($firewallName, $user);
|
||||
|
||||
$session->set('_security_' . $firewallName, serialize($container->get(TokenStorageInterface::class)->getToken()));
|
||||
$session->save();
|
||||
|
||||
$cookie = new Cookie($session->getName(), $session->getId());
|
||||
$this->client->getCookieJar()->set($cookie);
|
||||
$this->client->loginUser($user, $firewallName);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user