pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix security.context deprecation

Browse Source
This commit is contained in:
Jeremy Benoist
2015-11-07 00:17:37 +01:00
parent 5ead137fe6
commit 18f8f32f70
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
View File

@ -3,7 +3,7 @@
namespace Wallabag\CoreBundle\Helper;
use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
use Symfony\Component\Security\Core\SecurityContextInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\UserBundle\Entity\User;
/**
@ -14,16 +14,16 @@ use Wallabag\UserBundle\Entity\User;
*/
class DetectActiveTheme implements DeviceDetectionInterface
{
protected $securityContext;
protected $tokenStorage;
protected $defaultTheme;
/**
* @param SecurityContextInterface $securityContext Needed to retrieve the current user
* @param TokenStorageInterface $tokenStorage Needed to retrieve the current user
* @param string $defaultTheme Default theme when user isn't logged in
*/
public function __construct(SecurityContextInterface $securityContext, $defaultTheme)
public function __construct(TokenStorageInterface $tokenStorage, $defaultTheme)
{
$this->securityContext = $securityContext;
$this->tokenStorage = $tokenStorage;
$this->defaultTheme = $defaultTheme;
}
@ -42,7 +42,7 @@ class DetectActiveTheme implements DeviceDetectionInterface
*/
public function getType()
{
$token = $this->securityContext->getToken();
$token = $this->tokenStorage->getToken();
if (is_null($token)) {
return $this->defaultTheme;