mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 11:01:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6085 from wallabag/fix/remove-deprecation

Browse source 
Remove some deprecation
This commit is contained in:
Kevin Decherf 2022-11-22 21:45:29 +01:00 committed by GitHub
commit b6ba8517a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/config/services.yml
View file

@ -152,6 +152,9 @@ services:
bd_guzzle_site_authenticator.site_config_builder:
alias: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
GuzzleHttp\Cookie\CookieJar:
alias: 'Wallabag\CoreBundle\Helper\FileCookieJar'
Wallabag\CoreBundle\Helper\HttpClientFactory:
calls:
- ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]

9
src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
View file

@ -2,7 +2,7 @@
namespace Wallabag\CoreBundle\Event\Listener;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
/**
@ -15,12 +15,9 @@ use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
*/
class UserLocaleListener
{
/**
* @var Session
*/
private $session;
private SessionInterface $session;
public function __construct(Session $session)
public function __construct(SessionInterface $session)
{
$this->session = $session;
}

6
src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
View file

@ -6,7 +6,7 @@ use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfig;
use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfigBuilder;
use Graby\SiteConfig\ConfigBuilder;
use Psr\Log\LoggerInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
class GrabySiteConfigBuilder implements SiteConfigBuilder
@ -27,14 +27,14 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
private $logger;
/**
* @var TokenStorage
* @var TokenStorageInterface
*/
private $token;
/**
* GrabySiteConfigBuilder constructor.
*/
public function __construct(ConfigBuilder $grabyConfigBuilder, TokenStorage $token, SiteCredentialRepository $credentialRepository, LoggerInterface $logger)
public function __construct(ConfigBuilder $grabyConfigBuilder, TokenStorageInterface $token, SiteCredentialRepository $credentialRepository, LoggerInterface $logger)
{
$this->grabyConfigBuilder = $grabyConfigBuilder;
$this->credentialRepository = $credentialRepository;

5
src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
View file

@ -4,19 +4,16 @@ namespace Wallabag\CoreBundle\Helper;
use Pagerfanta\Adapter\AdapterInterface;
use Pagerfanta\Pagerfanta;
use Symfony\Component\Routing\Router;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\UserBundle\Entity\User;
class PreparePagerForEntries
{
private $router;
private $tokenStorage;
public function __construct(TokenStorageInterface $tokenStorage, Router $router)
public function __construct(TokenStorageInterface $tokenStorage)
{
$this->tokenStorage = $tokenStorage;
$this->router = $router;
}
/**

4
src/Wallabag/CoreBundle/Helper/Redirect.php
View file

@ -2,7 +2,7 @@
namespace Wallabag\CoreBundle\Helper;
use Symfony\Component\Routing\Router;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Entity\Config;
@ -14,7 +14,7 @@ class Redirect
private $router;
private $tokenStorage;
public function __construct(Router $router, TokenStorageInterface $tokenStorage)
public function __construct(UrlGeneratorInterface $router, TokenStorageInterface $tokenStorage)
{
$this->router = $router;
$this->tokenStorage = $tokenStorage;

4
src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
View file

@ -6,7 +6,7 @@ use Doctrine\ORM\EntityManagerInterface;
use FOS\UserBundle\Event\UserEvent;
use FOS\UserBundle\FOSUserEvents;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Wallabag\CoreBundle\Entity\Config;
/**
@ -25,7 +25,7 @@ class CreateConfigListener implements EventSubscriberInterface
private $listMode;
private $session;
public function __construct(EntityManagerInterface $em, $theme, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, Session $session)
public function __construct(EntityManagerInterface $em, $theme, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, SessionInterface $session)
{
$this->em = $em;
$this->theme = $theme;