mirror of
https://github.com/wallabag/wallabag.git
synced 2025-06-27 16:36:00 +00:00
Migrate to readonly properties
This commit is contained in:
parent
a107773c11
commit
ca018c77e3
71 changed files with 203 additions and 199 deletions
|
@ -9,7 +9,7 @@ use Wallabag\Entity\IgnoreOriginInstanceRule;
|
||||||
class IgnoreOriginInstanceRuleFixtures extends Fixture
|
class IgnoreOriginInstanceRuleFixtures extends Fixture
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private array $defaultIgnoreOriginInstanceRules,
|
private readonly array $defaultIgnoreOriginInstanceRules,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ use Wallabag\Entity\InternalSetting;
|
||||||
class InternalSettingFixtures extends Fixture
|
class InternalSettingFixtures extends Fixture
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private array $defaultInternalSettings,
|
private readonly array $defaultInternalSettings,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ use Wallabag\Helper\CryptoProxy;
|
||||||
class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface
|
class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private CryptoProxy $cryptoProxy,
|
private readonly CryptoProxy $cryptoProxy,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ declare(strict_types=1);
|
||||||
|
|
||||||
use Rector\Config\RectorConfig;
|
use Rector\Config\RectorConfig;
|
||||||
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
|
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
|
||||||
|
use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
|
||||||
|
|
||||||
return RectorConfig::configure()
|
return RectorConfig::configure()
|
||||||
->withPaths([
|
->withPaths([
|
||||||
|
@ -18,6 +19,9 @@ return RectorConfig::configure()
|
||||||
->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
|
->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
|
||||||
'inline_public' => true,
|
'inline_public' => true,
|
||||||
])
|
])
|
||||||
|
->withRules([
|
||||||
|
ReadOnlyPropertyRector::class,
|
||||||
|
])
|
||||||
->withSkip([
|
->withSkip([
|
||||||
ClassPropertyAssignToConstructorPromotionRector::class => [
|
ClassPropertyAssignToConstructorPromotionRector::class => [
|
||||||
__DIR__ . '/src/Entity/*',
|
__DIR__ . '/src/Entity/*',
|
||||||
|
|
|
@ -17,8 +17,8 @@ class CleanDownloadedImagesCommand extends Command
|
||||||
protected static $defaultDescription = 'Cleans downloaded images which are no more associated to an entry';
|
protected static $defaultDescription = 'Cleans downloaded images which are no more associated to an entry';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private DownloadImages $downloadImages,
|
private readonly DownloadImages $downloadImages,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,9 +23,9 @@ class CleanDuplicatesCommand extends Command
|
||||||
protected int $duplicates = 0;
|
protected int $duplicates = 0;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,10 +18,10 @@ class ExportCommand extends Command
|
||||||
protected static $defaultDescription = 'Export all entries for an user';
|
protected static $defaultDescription = 'Export all entries for an user';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
private EntriesExport $entriesExport,
|
private readonly EntriesExport $entriesExport,
|
||||||
private string $projectDir,
|
private readonly string $projectDir,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,9 +21,9 @@ class GenerateUrlHashesCommand extends Command
|
||||||
protected OutputInterface $output;
|
protected OutputInterface $output;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,21 +34,21 @@ class ImportCommand extends Command
|
||||||
protected static $defaultDescription = 'Import entries from a JSON export';
|
protected static $defaultDescription = 'Import entries from a JSON export';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private TokenStorageInterface $tokenStorage,
|
private readonly TokenStorageInterface $tokenStorage,
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
private WallabagV2Import $wallabagV2Import,
|
private readonly WallabagV2Import $wallabagV2Import,
|
||||||
private FirefoxImport $firefoxImport,
|
private readonly FirefoxImport $firefoxImport,
|
||||||
private ChromeImport $chromeImport,
|
private readonly ChromeImport $chromeImport,
|
||||||
private ReadabilityImport $readabilityImport,
|
private readonly ReadabilityImport $readabilityImport,
|
||||||
private InstapaperImport $instapaperImport,
|
private readonly InstapaperImport $instapaperImport,
|
||||||
private PinboardImport $pinboardImport,
|
private readonly PinboardImport $pinboardImport,
|
||||||
private DeliciousImport $deliciousImport,
|
private readonly DeliciousImport $deliciousImport,
|
||||||
private WallabagV1Import $wallabagV1Import,
|
private readonly WallabagV1Import $wallabagV1Import,
|
||||||
private ElcuratorImport $elcuratorImport,
|
private readonly ElcuratorImport $elcuratorImport,
|
||||||
private ShaarliImport $shaarliImport,
|
private readonly ShaarliImport $shaarliImport,
|
||||||
private PocketHtmlImport $pocketHtmlImport,
|
private readonly PocketHtmlImport $pocketHtmlImport,
|
||||||
private OmnivoreImport $omnivoreImport,
|
private readonly OmnivoreImport $omnivoreImport,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ class RedisWorkerCommand extends Command
|
||||||
protected static $defaultDescription = 'Launch Redis worker';
|
protected static $defaultDescription = 'Launch Redis worker';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ContainerInterface $container,
|
private readonly ContainerInterface $container,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,13 +38,13 @@ class InstallCommand extends Command
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private EventDispatcherInterface $dispatcher,
|
private readonly EventDispatcherInterface $dispatcher,
|
||||||
private UserManagerInterface $userManager,
|
private readonly UserManagerInterface $userManager,
|
||||||
private TableMetadataStorageConfiguration $tableMetadataStorageConfiguration,
|
private readonly TableMetadataStorageConfiguration $tableMetadataStorageConfiguration,
|
||||||
private string $databaseDriver,
|
private readonly string $databaseDriver,
|
||||||
private array $defaultSettings,
|
private readonly array $defaultSettings,
|
||||||
private array $defaultIgnoreOriginInstanceRules,
|
private readonly array $defaultIgnoreOriginInstanceRules,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ class ListUserCommand extends Command
|
||||||
protected static $defaultDescription = 'List all users';
|
protected static $defaultDescription = 'List all users';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,11 +22,11 @@ class ReloadEntryCommand extends Command
|
||||||
protected static $defaultDescription = 'Reload entries';
|
protected static $defaultDescription = 'Reload entries';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private ContentProxy $contentProxy,
|
private readonly ContentProxy $contentProxy,
|
||||||
private EventDispatcherInterface $dispatcher,
|
private readonly EventDispatcherInterface $dispatcher,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@ class ShowUserCommand extends Command
|
||||||
protected SymfonyStyle $io;
|
protected SymfonyStyle $io;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,9 +19,9 @@ class TagAllCommand extends Command
|
||||||
protected static $defaultDescription = 'Tag all entries using the tagging rules.';
|
protected static $defaultDescription = 'Tag all entries using the tagging rules.';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private RuleBasedTagger $ruleBasedTagger,
|
private readonly RuleBasedTagger $ruleBasedTagger,
|
||||||
private UserRepository $userRepository,
|
private readonly UserRepository $userRepository,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,9 +16,9 @@ class UpdatePicturesPathCommand extends Command
|
||||||
protected static $defaultDescription = 'Update the path of the pictures for each entry when you changed your wallabag instance URL.';
|
protected static $defaultDescription = 'Update the path of the pictures for each entry when you changed your wallabag instance URL.';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private string $wallabagUrl,
|
private readonly string $wallabagUrl,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,19 +11,19 @@ use OldSound\RabbitMqBundle\RabbitMq\Consumer;
|
||||||
class RabbitMQConsumerTotalProxy
|
class RabbitMQConsumerTotalProxy
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Consumer $pocketConsumer,
|
private readonly Consumer $pocketConsumer,
|
||||||
private Consumer $readabilityConsumer,
|
private readonly Consumer $readabilityConsumer,
|
||||||
private Consumer $wallabagV1Consumer,
|
private readonly Consumer $wallabagV1Consumer,
|
||||||
private Consumer $wallabagV2Consumer,
|
private readonly Consumer $wallabagV2Consumer,
|
||||||
private Consumer $firefoxConsumer,
|
private readonly Consumer $firefoxConsumer,
|
||||||
private Consumer $chromeConsumer,
|
private readonly Consumer $chromeConsumer,
|
||||||
private Consumer $instapaperConsumer,
|
private readonly Consumer $instapaperConsumer,
|
||||||
private Consumer $pinboardConsumer,
|
private readonly Consumer $pinboardConsumer,
|
||||||
private Consumer $deliciousConsumer,
|
private readonly Consumer $deliciousConsumer,
|
||||||
private Consumer $elcuratorConsumer,
|
private readonly Consumer $elcuratorConsumer,
|
||||||
private Consumer $shaarliConsumer,
|
private readonly Consumer $shaarliConsumer,
|
||||||
private Consumer $pocketHtmlConsumer,
|
private readonly Consumer $pocketHtmlConsumer,
|
||||||
private Consumer $omnivoreConsumer,
|
private readonly Consumer $omnivoreConsumer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,14 +45,14 @@ use Wallabag\Tools\Utils;
|
||||||
class ConfigController extends AbstractController
|
class ConfigController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private UserManagerInterface $userManager,
|
private readonly UserManagerInterface $userManager,
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private TagRepository $tagRepository,
|
private readonly TagRepository $tagRepository,
|
||||||
private AnnotationRepository $annotationRepository,
|
private readonly AnnotationRepository $annotationRepository,
|
||||||
private ConfigRepository $configRepository,
|
private readonly ConfigRepository $configRepository,
|
||||||
private EventDispatcherInterface $eventDispatcher,
|
private readonly EventDispatcherInterface $eventDispatcher,
|
||||||
private Redirect $redirectHelper,
|
private readonly Redirect $redirectHelper,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,14 +34,14 @@ use Wallabag\Repository\TagRepository;
|
||||||
class EntryController extends AbstractController
|
class EntryController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private EventDispatcherInterface $eventDispatcher,
|
private readonly EventDispatcherInterface $eventDispatcher,
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private Redirect $redirectHelper,
|
private readonly Redirect $redirectHelper,
|
||||||
private PreparePagerForEntries $preparePagerForEntriesHelper,
|
private readonly PreparePagerForEntries $preparePagerForEntriesHelper,
|
||||||
private FilterBuilderUpdaterInterface $filterBuilderUpdater,
|
private readonly FilterBuilderUpdaterInterface $filterBuilderUpdater,
|
||||||
private ContentProxy $contentProxy,
|
private readonly ContentProxy $contentProxy,
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ use Wallabag\Repository\EntryRepository;
|
||||||
class FeedController extends AbstractController
|
class FeedController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ use Wallabag\Repository\IgnoreOriginInstanceRuleRepository;
|
||||||
class IgnoreOriginInstanceRuleController extends AbstractController
|
class IgnoreOriginInstanceRuleController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class ChromeController extends BrowserController
|
class ChromeController extends BrowserController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ChromeImport $chromeImport,
|
private readonly ChromeImport $chromeImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class DeliciousController extends AbstractController
|
class DeliciousController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class ElcuratorController extends WallabagController
|
class ElcuratorController extends WallabagController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ElcuratorImport $elcuratorImport,
|
private readonly ElcuratorImport $elcuratorImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class FirefoxController extends BrowserController
|
class FirefoxController extends BrowserController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private FirefoxImport $firefoxImport,
|
private readonly FirefoxImport $firefoxImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@ use Wallabag\Import\ImportChain;
|
||||||
class ImportController extends AbstractController
|
class ImportController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RabbitMQConsumerTotalProxy $rabbitMQConsumerTotalProxy,
|
private readonly RabbitMQConsumerTotalProxy $rabbitMQConsumerTotalProxy,
|
||||||
private Client $redisClient,
|
private readonly Client $redisClient,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class InstapaperController extends AbstractController
|
class InstapaperController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class OmnivoreController extends AbstractController
|
class OmnivoreController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class PinboardController extends AbstractController
|
class PinboardController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,10 +18,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class PocketController extends AbstractController
|
class PocketController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
private SessionInterface $session,
|
private readonly SessionInterface $session,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class PocketHtmlController extends HtmlController
|
class PocketHtmlController extends HtmlController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private PocketHtmlImport $pocketHtmlImport,
|
private readonly PocketHtmlImport $pocketHtmlImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class ReadabilityController extends AbstractController
|
class ReadabilityController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class ShaarliController extends HtmlController
|
class ShaarliController extends HtmlController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ShaarliImport $shaarliImport,
|
private readonly ShaarliImport $shaarliImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class WallabagV1Controller extends WallabagController
|
class WallabagV1Controller extends WallabagController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private WallabagV1Import $wallabagImport,
|
private readonly WallabagV1Import $wallabagImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@ use Wallabag\Redis\Producer as RedisProducer;
|
||||||
class WallabagV2Controller extends WallabagController
|
class WallabagV2Controller extends WallabagController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private WallabagV2Import $wallabagImport,
|
private readonly WallabagV2Import $wallabagImport,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
private RabbitMqProducer $rabbitMqProducer,
|
private readonly RabbitMqProducer $rabbitMqProducer,
|
||||||
private RedisProducer $redisProducer,
|
private readonly RedisProducer $redisProducer,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,10 @@ use Wallabag\Repository\SiteCredentialRepository;
|
||||||
class SiteCredentialController extends AbstractController
|
class SiteCredentialController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
private CryptoProxy $cryptoProxy,
|
private readonly CryptoProxy $cryptoProxy,
|
||||||
private Config $craueConfig,
|
private readonly Config $craueConfig,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,10 @@ use Wallabag\Repository\TagRepository;
|
||||||
class TagController extends AbstractController
|
class TagController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private TagsAssigner $tagsAssigner,
|
private readonly TagsAssigner $tagsAssigner,
|
||||||
private Redirect $redirectHelper,
|
private readonly Redirect $redirectHelper,
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,8 @@ use Wallabag\Repository\UserRepository;
|
||||||
class UserController extends AbstractController
|
class UserController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@ use Doctrine\Migrations\Version\MigrationFactory;
|
||||||
class MigrationFactoryDecorator implements MigrationFactory
|
class MigrationFactoryDecorator implements MigrationFactory
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private MigrationFactory $migrationFactory,
|
private readonly MigrationFactory $migrationFactory,
|
||||||
private string $tablePrefix,
|
private readonly string $tablePrefix,
|
||||||
private array $defaultIgnoreOriginInstanceRules,
|
private readonly array $defaultIgnoreOriginInstanceRules,
|
||||||
private string $fetchingErrorMessage,
|
private readonly string $fetchingErrorMessage,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ use Symfony\Component\Security\Http\Event\LoginFailureEvent;
|
||||||
class AuthenticationFailureListener implements EventSubscriberInterface
|
class AuthenticationFailureListener implements EventSubscriberInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RequestStack $requestStack,
|
private readonly RequestStack $requestStack,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ use Wallabag\Entity\Config;
|
||||||
class CreateConfigListener implements EventSubscriberInterface
|
class CreateConfigListener implements EventSubscriberInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $em,
|
private readonly EntityManagerInterface $em,
|
||||||
private $itemsOnPage,
|
private $itemsOnPage,
|
||||||
private $feedLimit,
|
private $feedLimit,
|
||||||
private $language,
|
private $language,
|
||||||
|
@ -24,7 +24,7 @@ class CreateConfigListener implements EventSubscriberInterface
|
||||||
private $actionMarkAsRead,
|
private $actionMarkAsRead,
|
||||||
private $listMode,
|
private $listMode,
|
||||||
private $displayThumbnails,
|
private $displayThumbnails,
|
||||||
private RequestStack $requestStack,
|
private readonly RequestStack $requestStack,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||||
class PasswordResettingListener implements EventSubscriberInterface
|
class PasswordResettingListener implements EventSubscriberInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private UrlGeneratorInterface $router,
|
private readonly UrlGeneratorInterface $router,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ class RegistrationListener implements EventSubscriberInterface
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private $registrationEnabled,
|
private $registrationEnabled,
|
||||||
private UrlGeneratorInterface $urlGenerator,
|
private readonly UrlGeneratorInterface $urlGenerator,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ use Wallabag\Entity\User;
|
||||||
class UserLocaleListener
|
class UserLocaleListener
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private SessionInterface $session,
|
private readonly SessionInterface $session,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@ use Wallabag\Helper\DownloadImages;
|
||||||
class DownloadImagesSubscriber implements EventSubscriberInterface
|
class DownloadImagesSubscriber implements EventSubscriberInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $em,
|
private readonly EntityManagerInterface $em,
|
||||||
private DownloadImages $downloadImages,
|
private readonly DownloadImages $downloadImages,
|
||||||
private $enabled,
|
private $enabled,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ use Wallabag\Event\ConfigUpdatedEvent;
|
||||||
class GenerateCustomCSSSubscriber implements EventSubscriberInterface
|
class GenerateCustomCSSSubscriber implements EventSubscriberInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $em,
|
private readonly EntityManagerInterface $em,
|
||||||
private Compiler $compiler,
|
private readonly Compiler $compiler,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ use Wallabag\Entity\Entry;
|
||||||
class SQLiteCascadeDeleteSubscriber implements EventSubscriber
|
class SQLiteCascadeDeleteSubscriber implements EventSubscriber
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ManagerRegistry $doctrine,
|
private readonly ManagerRegistry $doctrine,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
|
||||||
class SchemaAdapterSubscriber implements EventSubscriber
|
class SchemaAdapterSubscriber implements EventSubscriber
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private string $databaseTablePrefix,
|
private readonly string $databaseTablePrefix,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
class AuthenticatorProvider implements ExpressionFunctionProviderInterface
|
class AuthenticatorProvider implements ExpressionFunctionProviderInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private HttpClientInterface $requestHtmlFunctionClient,
|
private readonly HttpClientInterface $requestHtmlFunctionClient,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,8 @@ class EntryFilterType extends AbstractType
|
||||||
* Repository & user are used to get a list of language entries for this user.
|
* Repository & user are used to get a list of language entries for this user.
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntryRepository $repository,
|
private readonly EntryRepository $repository,
|
||||||
private TokenStorageInterface $tokenStorage,
|
private readonly TokenStorageInterface $tokenStorage,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ class CryptoProxy
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
$encryptionKeyPath,
|
$encryptionKeyPath,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
if (!file_exists($encryptionKeyPath)) {
|
if (!file_exists($encryptionKeyPath)) {
|
||||||
$key = Key::createNewRandomKey();
|
$key = Key::createNewRandomKey();
|
||||||
|
|
|
@ -20,10 +20,10 @@ class DownloadImages
|
||||||
private $wallabagUrl;
|
private $wallabagUrl;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private HttpClientInterface $client,
|
private readonly HttpClientInterface $client,
|
||||||
private $baseFolder,
|
private $baseFolder,
|
||||||
$wallabagUrl,
|
$wallabagUrl,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
$this->wallabagUrl = rtrim($wallabagUrl, '/');
|
$this->wallabagUrl = rtrim($wallabagUrl, '/');
|
||||||
$this->mimeTypes = new MimeTypes();
|
$this->mimeTypes = new MimeTypes();
|
||||||
|
|
|
@ -31,10 +31,10 @@ class EntriesExport
|
||||||
* @param TokenStorageInterface $tokenStorage Needed to retrieve the current user
|
* @param TokenStorageInterface $tokenStorage Needed to retrieve the current user
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
private $wallabagUrl,
|
private $wallabagUrl,
|
||||||
private $logoPath,
|
private $logoPath,
|
||||||
private TokenStorageInterface $tokenStorage,
|
private readonly TokenStorageInterface $tokenStorage,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ use Wallabag\Entity\User;
|
||||||
class PreparePagerForEntries
|
class PreparePagerForEntries
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private TokenStorageInterface $tokenStorage,
|
private readonly TokenStorageInterface $tokenStorage,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@ use Wallabag\Entity\User;
|
||||||
class Redirect
|
class Redirect
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private UrlGeneratorInterface $router,
|
private readonly UrlGeneratorInterface $router,
|
||||||
private TokenStorageInterface $tokenStorage,
|
private readonly TokenStorageInterface $tokenStorage,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,10 +15,10 @@ use Wallabag\Repository\TagRepository;
|
||||||
class RuleBasedTagger
|
class RuleBasedTagger
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RulerZ $rulerz,
|
private readonly RulerZ $rulerz,
|
||||||
private TagRepository $tagRepository,
|
private readonly TagRepository $tagRepository,
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@ class Authenticator implements LoggerAwareInterface
|
||||||
private $logger;
|
private $logger;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private SiteConfigBuilder $configBuilder,
|
private readonly SiteConfigBuilder $configBuilder,
|
||||||
private LoginFormAuthenticator $authenticator,
|
private readonly LoginFormAuthenticator $authenticator,
|
||||||
) {
|
) {
|
||||||
$this->logger = new NullLogger();
|
$this->logger = new NullLogger();
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,13 +11,13 @@ use Symfony\Contracts\HttpClient\ResponseStreamInterface;
|
||||||
|
|
||||||
class WallabagClient implements HttpClientInterface
|
class WallabagClient implements HttpClientInterface
|
||||||
{
|
{
|
||||||
private HttpClientInterface $httpClient;
|
private readonly HttpClientInterface $httpClient;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private $restrictedAccess,
|
private $restrictedAccess,
|
||||||
private HttpBrowser $browser,
|
private readonly HttpBrowser $browser,
|
||||||
private Authenticator $authenticator,
|
private readonly Authenticator $authenticator,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
$this->httpClient = HttpClient::create([
|
$this->httpClient = HttpClient::create([
|
||||||
'timeout' => 10,
|
'timeout' => 10,
|
||||||
|
|
|
@ -22,8 +22,8 @@ class AuthCodeMailer implements AuthCodeMailerInterface
|
||||||
* @param string $supportUrl support URL to report any bugs
|
* @param string $supportUrl support URL to report any bugs
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private MailerInterface $mailer,
|
private readonly MailerInterface $mailer,
|
||||||
private Environment $twig,
|
private readonly Environment $twig,
|
||||||
private $senderEmail,
|
private $senderEmail,
|
||||||
private $senderName,
|
private $senderName,
|
||||||
private $supportUrl,
|
private $supportUrl,
|
||||||
|
|
|
@ -22,7 +22,7 @@ class UsernameFeedTokenConverter implements ParamConverterInterface
|
||||||
* @param ManagerRegistry $registry Manager registry
|
* @param ManagerRegistry $registry Manager registry
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ?ManagerRegistry $registry = null,
|
private readonly ?ManagerRegistry $registry = null,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ use Simpleue\Queue\RedisQueue;
|
||||||
class Producer implements ProducerInterface
|
class Producer implements ProducerInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RedisQueue $queue,
|
private readonly RedisQueue $queue,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ class SiteCredentialRepository extends ServiceEntityRepository
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
ManagerRegistry $registry,
|
ManagerRegistry $registry,
|
||||||
private CryptoProxy $cryptoProxy,
|
private readonly CryptoProxy $cryptoProxy,
|
||||||
) {
|
) {
|
||||||
parent::__construct($registry, SiteCredential::class);
|
parent::__construct($registry, SiteCredential::class);
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ class TagRepository extends ServiceEntityRepository
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
ManagerRegistry $registry,
|
ManagerRegistry $registry,
|
||||||
private string $tablePrefix,
|
private readonly string $tablePrefix,
|
||||||
) {
|
) {
|
||||||
parent::__construct($registry, Tag::class);
|
parent::__construct($registry, Tag::class);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@ class AdminVoter extends Voter
|
||||||
public const CREATE_IGNORE_ORIGIN_INSTANCE_RULES = 'CREATE_IGNORE_ORIGIN_INSTANCE_RULES';
|
public const CREATE_IGNORE_ORIGIN_INSTANCE_RULES = 'CREATE_IGNORE_ORIGIN_INSTANCE_RULES';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ class IgnoreOriginInstanceRuleVoter extends Voter
|
||||||
public const DELETE = 'DELETE';
|
public const DELETE = 'DELETE';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ class MainVoter extends Voter
|
||||||
public const EDIT_CONFIG = 'EDIT_CONFIG';
|
public const EDIT_CONFIG = 'EDIT_CONFIG';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ class TagVoter extends Voter
|
||||||
public const DELETE = 'DELETE';
|
public const DELETE = 'DELETE';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ class UserVoter extends Voter
|
||||||
public const DELETE = 'DELETE';
|
public const DELETE = 'DELETE';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Security $security,
|
private readonly Security $security,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
|
||||||
* GrabySiteConfigBuilder constructor.
|
* GrabySiteConfigBuilder constructor.
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private ConfigBuilder $grabyConfigBuilder,
|
private readonly ConfigBuilder $grabyConfigBuilder,
|
||||||
private TokenStorageInterface $token,
|
private readonly TokenStorageInterface $token,
|
||||||
private SiteCredentialRepository $credentialRepository,
|
private readonly SiteCredentialRepository $credentialRepository,
|
||||||
private LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,10 @@ use Wallabag\ExpressionLanguage\AuthenticatorProvider;
|
||||||
|
|
||||||
class LoginFormAuthenticator
|
class LoginFormAuthenticator
|
||||||
{
|
{
|
||||||
private ExpressionLanguage $expressionLanguage;
|
private readonly ExpressionLanguage $expressionLanguage;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private HttpBrowser $browser,
|
private readonly HttpBrowser $browser,
|
||||||
AuthenticatorProvider $authenticatorProvider,
|
AuthenticatorProvider $authenticatorProvider,
|
||||||
) {
|
) {
|
||||||
$this->expressionLanguage = new ExpressionLanguage(null, [$authenticatorProvider]);
|
$this->expressionLanguage = new ExpressionLanguage(null, [$authenticatorProvider]);
|
||||||
|
|
|
@ -16,13 +16,13 @@ use Wallabag\Repository\TagRepository;
|
||||||
class WallabagExtension extends AbstractExtension implements GlobalsInterface
|
class WallabagExtension extends AbstractExtension implements GlobalsInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntryRepository $entryRepository,
|
private readonly EntryRepository $entryRepository,
|
||||||
private AnnotationRepository $annotationRepository,
|
private readonly AnnotationRepository $annotationRepository,
|
||||||
private TagRepository $tagRepository,
|
private readonly TagRepository $tagRepository,
|
||||||
private TokenStorageInterface $tokenStorage,
|
private readonly TokenStorageInterface $tokenStorage,
|
||||||
private $lifeTime,
|
private $lifeTime,
|
||||||
private TranslatorInterface $translator,
|
private readonly TranslatorInterface $translator,
|
||||||
private string $projectDir,
|
private readonly string $projectDir,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue