mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-25 21:10:00 +00:00
Code Issues Projects Releases Wiki Activity

Enable autowire and autoconfigure

Browse source
This commit is contained in:
Yassine Guedidi 2022-08-27 19:26:16 +02:00
parent 73bdd66c84
commit 76a5133545
3 changed files with 16 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
app/config/services.yml
View file

@ -7,13 +7,17 @@ parameters:
lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
services:
_defaults:
autowire: true
autoconfigure: true
public: true
Twig_Extensions_Extension_Text:
class: Twig_Extensions_Extension_Text
tags:
- { name: twig.extension }
Wallabag\CoreBundle\Twig\WallabagExtension:
class: Wallabag\CoreBundle\Twig\WallabagExtension
public: false
arguments:
- '@Wallabag\CoreBundle\Repository\EntryRepository'
@ -26,19 +30,16 @@ services:
- { name: twig.extension }
MatomoTwigExtension\MatomoTwigExtension:
class: MatomoTwigExtension\MatomoTwigExtension
public: false
tags:
- { name: twig.extension }
Wallabag\CoreBundle\Event\Listener\LocaleListener:
class: Wallabag\CoreBundle\Event\Listener\LocaleListener
arguments: ["%kernel.default_locale%"]
tags:
- { name: kernel.event_subscriber }
Wallabag\CoreBundle\Event\Listener\UserLocaleListener:
class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener
arguments: ["@session"]
tags:
- { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
@ -52,14 +53,12 @@ services:
- '%kernel.cache_dir%'
Wallabag\CoreBundle\Helper\DetectActiveTheme:
class: Wallabag\CoreBundle\Helper\DetectActiveTheme
arguments:
- "@security.token_storage"
- "%wallabag_core.theme%"
# custom form type
Wallabag\CoreBundle\Form\Type\ConfigType:
class: Wallabag\CoreBundle\Form\Type\ConfigType
arguments:
- "%liip_theme.themes%"
- "%wallabag_core.languages%"
@ -67,7 +66,6 @@ services:
- { name: form.type }
Wallabag\CoreBundle\Form\Type\EntryFilterType:
class: Wallabag\CoreBundle\Form\Type\EntryFilterType
arguments:
- '@Wallabag\CoreBundle\Repository\EntryRepository'
- "@security.token_storage"
@ -75,21 +73,18 @@ services:
- { name: form.type }
Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter:
class: Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter
tags:
- { name: request.param_converter, converter: username_feed_token_converter }
arguments:
- "@doctrine"
Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber:
class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber
arguments:
- "%database_table_prefix%"
tags:
- { name: doctrine.event_subscriber }
Graby\Graby:
class: Graby\Graby
arguments:
-
error_message: '%wallabag_core.fetching_error_message%'
@ -102,7 +97,6 @@ services:
- { name: monolog.logger, channel: graby }
Graby\SiteConfig\ConfigBuilder:
class: Graby\SiteConfig\ConfigBuilder
arguments:
- {}
- "@logger"
@ -111,7 +105,6 @@ services:
alias: 'httplug.client.wallabag_core'
Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder:
class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
arguments:
- '@Graby\SiteConfig\ConfigBuilder'
- "@security.token_storage"
@ -125,7 +118,6 @@ services:
alias: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
Wallabag\CoreBundle\Helper\HttpClientFactory:
class: Wallabag\CoreBundle\Helper\HttpClientFactory
arguments:
- '@Wallabag\CoreBundle\Helper\FileCookieJar'
- '@=service(''craue_config'').get(''restricted_access'')'
@ -134,13 +126,11 @@ services:
- ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]
Wallabag\CoreBundle\Helper\FileCookieJar:
class: Wallabag\CoreBundle\Helper\FileCookieJar
arguments:
- "@logger"
- "%kernel.cache_dir%/cookiejar.json"
Wallabag\CoreBundle\Helper\ContentProxy:
class: Wallabag\CoreBundle\Helper\ContentProxy
arguments:
- '@Graby\Graby'
- '@Wallabag\CoreBundle\Helper\RuleBasedTagger'
@ -151,12 +141,10 @@ services:
- '@=service(''craue_config'').get(''store_article_headers'')'
Wallabag\CoreBundle\Helper\TagsAssigner:
class: Wallabag\CoreBundle\Helper\TagsAssigner
arguments:
- '@Wallabag\CoreBundle\Repository\TagRepository'
Wallabag\CoreBundle\Helper\RuleBasedTagger:
class: Wallabag\CoreBundle\Helper\RuleBasedTagger
arguments:
- "@rulerz"
- '@Wallabag\CoreBundle\Repository\TagRepository'
@ -164,7 +152,6 @@ services:
- "@logger"
Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor:
class: Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor
arguments:
- "@rulerz"
- "@logger"
@ -172,19 +159,16 @@ services:
# repository as a service
Wallabag\CoreBundle\Repository\EntryRepository:
class: Wallabag\CoreBundle\Repository\EntryRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- 'Wallabag\CoreBundle\Entity\Entry'
Wallabag\CoreBundle\Repository\TagRepository:
class: Wallabag\CoreBundle\Repository\TagRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- 'Wallabag\CoreBundle\Entity\Tag'
Wallabag\CoreBundle\Repository\SiteCredentialRepository:
class: Wallabag\CoreBundle\Repository\SiteCredentialRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- 'Wallabag\CoreBundle\Entity\SiteCredential'
@ -192,13 +176,11 @@ services:
- [ setCrypto, [ '@Wallabag\CoreBundle\Helper\CryptoProxy' ] ]
Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository:
class: Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- 'Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule'
Wallabag\CoreBundle\Helper\EntriesExport:
class: Wallabag\CoreBundle\Helper\EntriesExport
arguments:
- "@translator"
- '%domain_name%'
@ -206,44 +188,36 @@ services:
- "@security.token_storage"
Wallabag\CoreBundle\Operator\PHP\Matches:
class: Wallabag\CoreBundle\Operator\PHP\Matches
tags:
- { name: rulerz.operator, target: native, operator: matches }
Wallabag\CoreBundle\Operator\Doctrine\Matches:
class: Wallabag\CoreBundle\Operator\Doctrine\Matches
tags:
- { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
Wallabag\CoreBundle\Operator\PHP\NotMatches:
class: Wallabag\CoreBundle\Operator\PHP\NotMatches
tags:
- { name: rulerz.operator, target: native, operator: notmatches }
Wallabag\CoreBundle\Operator\Doctrine\NotMatches:
class: Wallabag\CoreBundle\Operator\Doctrine\NotMatches
tags:
- { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
Wallabag\CoreBundle\Operator\PHP\PatternMatches:
class: Wallabag\CoreBundle\Operator\PHP\PatternMatches
tags:
- { name: rulerz.operator, target: native, operator: "~" }
Wallabag\CoreBundle\Helper\Redirect:
class: Wallabag\CoreBundle\Helper\Redirect
arguments:
- "@router"
- "@security.token_storage"
Wallabag\CoreBundle\Helper\PreparePagerForEntries:
class: Wallabag\CoreBundle\Helper\PreparePagerForEntries
arguments:
- "@security.token_storage"
- "@router"
Predis\Client:
class: Predis\Client
arguments:
-
scheme: '%redis_scheme%'
@ -253,21 +227,17 @@ services:
password: '%redis_password%'
Wallabag\CoreBundle\Controller\ExceptionController:
class: Wallabag\CoreBundle\Controller\ExceptionController
public: true
arguments:
- '@twig'
- '%kernel.debug%'
Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber
arguments:
- "@doctrine"
tags:
- { name: doctrine.event_subscriber }
Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber:
class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber
arguments:
- "@doctrine.orm.default_entity_manager"
- '@Wallabag\CoreBundle\Helper\DownloadImages'
@ -277,7 +247,6 @@ services:
- { name: kernel.event_subscriber }
Wallabag\CoreBundle\Helper\DownloadImages:
class: Wallabag\CoreBundle\Helper\DownloadImages
arguments:
- "@wallabag_core.entry.download_images.client"
- "%kernel.project_dir%/web/assets/images"
@ -288,17 +257,14 @@ services:
alias: 'httplug.client.wallabag_core.entry.download_images'
Wallabag\CoreBundle\Helper\CryptoProxy:
class: Wallabag\CoreBundle\Helper\CryptoProxy
arguments:
- "%wallabag_core.site_credentials.encryption_key_path%"
- "@logger"
Wallabag\CoreBundle\Command\:
resource: ../../src/Wallabag/CoreBundle/Command/*
autoconfigure: true
Wallabag\UserBundle\Mailer\AuthCodeMailer:
class: Wallabag\UserBundle\Mailer\AuthCodeMailer
arguments:
- "@mailer"
- "@twig"
@ -315,20 +281,17 @@ services:
- { name: kernel.event_subscriber }
Wallabag\UserBundle\EventListener\PasswordResettingListener:
class: Wallabag\UserBundle\EventListener\PasswordResettingListener
arguments:
- "@router"
tags:
- { name: kernel.event_subscriber }
Wallabag\UserBundle\Repository\UserRepository:
class: Wallabag\UserBundle\Repository\UserRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- 'Wallabag\UserBundle\Entity\User'
Wallabag\UserBundle\EventListener\CreateConfigListener:
class: Wallabag\UserBundle\EventListener\CreateConfigListener
arguments:
- "@doctrine.orm.entity_manager"
- "%wallabag_core.theme%"
@ -343,21 +306,18 @@ services:
- { name: kernel.event_subscriber }
Wallabag\UserBundle\EventListener\AuthenticationFailureListener:
class: Wallabag\UserBundle\EventListener\AuthenticationFailureListener
arguments:
- "@request_stack"
- "@logger"
tags:
- { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
Wallabag\ImportBundle\Import\ImportChain:
class: Wallabag\ImportBundle\Import\ImportChain
Wallabag\ImportBundle\Import\ImportChain: ~
wallabag_import.pocket.client:
alias: 'httplug.client.wallabag_import.pocket.client'
Wallabag\ImportBundle\Import\PocketImport:
class: Wallabag\ImportBundle\Import\PocketImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -370,7 +330,6 @@ services:
- { name: wallabag_import.import, alias: pocket }
Wallabag\ImportBundle\Import\WallabagV1Import:
class: Wallabag\ImportBundle\Import\WallabagV1Import
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -384,7 +343,6 @@ services:
- { name: wallabag_import.import, alias: wallabag_v1 }
Wallabag\ImportBundle\Import\WallabagV2Import:
class: Wallabag\ImportBundle\Import\WallabagV2Import
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -396,7 +354,6 @@ services:
- { name: wallabag_import.import, alias: wallabag_v2 }
Wallabag\ImportBundle\Import\ElcuratorImport:
class: Wallabag\ImportBundle\Import\ElcuratorImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -408,7 +365,6 @@ services:
- { name: wallabag_import.import, alias: elcurator }
Wallabag\ImportBundle\Import\ReadabilityImport:
class: Wallabag\ImportBundle\Import\ReadabilityImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -420,7 +376,6 @@ services:
- { name: wallabag_import.import, alias: readability }
Wallabag\ImportBundle\Import\InstapaperImport:
class: Wallabag\ImportBundle\Import\InstapaperImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -432,7 +387,6 @@ services:
- { name: wallabag_import.import, alias: instapaper }
Wallabag\ImportBundle\Import\PinboardImport:
class: Wallabag\ImportBundle\Import\PinboardImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -444,7 +398,6 @@ services:
- { name: wallabag_import.import, alias: pinboard }
Wallabag\ImportBundle\Import\DeliciousImport:
class: Wallabag\ImportBundle\Import\DeliciousImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -456,7 +409,6 @@ services:
- { name: wallabag_import.import, alias: delicious }
Wallabag\ImportBundle\Import\FirefoxImport:
class: Wallabag\ImportBundle\Import\FirefoxImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -468,7 +420,6 @@ services:
- { name: wallabag_import.import, alias: firefox }
Wallabag\ImportBundle\Import\ChromeImport:
class: Wallabag\ImportBundle\Import\ChromeImport
arguments:
- "@doctrine.orm.entity_manager"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
@ -481,4 +432,3 @@ services:
Wallabag\ImportBundle\Command\:
resource: ../../src/Wallabag/ImportBundle/Command/*
autoconfigure: true

5
app/config/services_rabbit.yml
View file

@ -1,5 +1,10 @@
# RabbitMQ stuff
services:
_defaults:
autowire: true
autoconfigure: true
public: true
wallabag_import.consumer.amqp.pocket:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
arguments:

5
app/config/services_redis.yml
View file

@ -1,5 +1,10 @@
# Redis stuff
services:
_defaults:
autowire: true
autoconfigure: true
public: true
# readability
wallabag_import.queue.redis.readability:
class: Simpleue\Queue\RedisQueue