forked from wallabag/wallabag
Move services and parameters to app services
This commit is contained in:
Yassine Guedidi
@ -2,9 +2,7 @@
|
||||
|
||||
namespace Wallabag\CoreBundle\DependencyInjection;
|
||||
|
||||
use Symfony\Component\Config\FileLocator;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Loader;
|
||||
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
|
||||
|
||||
class WallabagCoreExtension extends Extension
|
||||
@ -31,10 +29,6 @@ class WallabagCoreExtension extends Extension
|
||||
$container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
|
||||
$container->setParameter('wallabag_core.site_credentials.encryption_key_path', $config['encryption_key_path']);
|
||||
$container->setParameter('wallabag_core.default_ignore_origin_instance_rules', $config['default_ignore_origin_instance_rules']);
|
||||
|
||||
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
|
||||
$loader->load('services.yml');
|
||||
$loader->load('parameters.yml');
|
||||
}
|
||||
|
||||
public function getAlias()
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
parameters:
|
||||
addons_url:
|
||||
firefox: https://addons.mozilla.org/firefox/addon/wallabagger/
|
||||
chrome: https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj
|
||||
opera: https://addons.opera.com/en/extensions/details/wallabagger/?display=en
|
||||
f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
|
||||
google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
|
||||
ios: https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8
|
||||
windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646
|
||||
@ -1,246 +0,0 @@
|
||||
services:
|
||||
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%"
|
||||
tags:
|
||||
- { name: form.type }
|
||||
|
||||
Wallabag\CoreBundle\Form\Type\EntryFilterType:
|
||||
class: Wallabag\CoreBundle\Form\Type\EntryFilterType
|
||||
arguments:
|
||||
- '@Wallabag\CoreBundle\Repository\EntryRepository'
|
||||
- "@security.token_storage"
|
||||
tags:
|
||||
- { 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%'
|
||||
error_message_title: '%wallabag_core.fetching_error_message_title%'
|
||||
- "@wallabag_core.http_client"
|
||||
- '@Graby\SiteConfig\ConfigBuilder'
|
||||
calls:
|
||||
- [ setLogger, [ "@logger" ] ]
|
||||
tags:
|
||||
- { name: monolog.logger, channel: graby }
|
||||
|
||||
Graby\SiteConfig\ConfigBuilder:
|
||||
class: Graby\SiteConfig\ConfigBuilder
|
||||
arguments:
|
||||
- {}
|
||||
- "@logger"
|
||||
|
||||
wallabag_core.http_client:
|
||||
alias: 'httplug.client.wallabag_core'
|
||||
|
||||
Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder:
|
||||
class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
|
||||
arguments:
|
||||
- '@Graby\SiteConfig\ConfigBuilder'
|
||||
- "@security.token_storage"
|
||||
- '@Wallabag\CoreBundle\Repository\SiteCredentialRepository'
|
||||
- '@logger'
|
||||
tags:
|
||||
- { name: monolog.logger, channel: graby }
|
||||
|
||||
# service alias override
|
||||
bd_guzzle_site_authenticator.site_config_builder:
|
||||
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'')'
|
||||
- '@logger'
|
||||
calls:
|
||||
- ["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'
|
||||
- '@Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor'
|
||||
- "@validator"
|
||||
- "@logger"
|
||||
- '%wallabag_core.fetching_error_message%'
|
||||
- '@=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'
|
||||
- '@Wallabag\CoreBundle\Repository\EntryRepository'
|
||||
- "@logger"
|
||||
|
||||
Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor:
|
||||
class: Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor
|
||||
arguments:
|
||||
- "@rulerz"
|
||||
- "@logger"
|
||||
- '@Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository'
|
||||
|
||||
# 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'
|
||||
calls:
|
||||
- [ 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%'
|
||||
- web/img/appicon/apple-touch-icon-152.png
|
||||
- "@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%'
|
||||
host: '%redis_host%'
|
||||
port: '%redis_port%'
|
||||
path: '%redis_path%'
|
||||
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'
|
||||
- '@=service(''craue_config'').get(''download_images_enabled'')'
|
||||
- "@logger"
|
||||
tags:
|
||||
- { 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"
|
||||
- '%domain_name%'
|
||||
- "@logger"
|
||||
|
||||
wallabag_core.entry.download_images.client:
|
||||
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: ../../Command/*
|
||||
autoconfigure: true
|
||||
Reference in New Issue
Block a user