mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-09 08:49:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7151 from yguedidi/one-bundle

Browse source 
Move to one bundle
This commit is contained in:
Yassine Guedidi 2024-01-25 21:52:53 +01:00 committed by GitHub
parent eb36d692aa a7fe79dacd
commit 2fd1f23833
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
235 changed files with 787 additions and 1185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/AppKernel.php
View file

@ -38,10 +38,6 @@ class AppKernel extends Kernel
// wallabag bundles
new Wallabag\CoreBundle\WallabagCoreBundle(),
new Wallabag\ApiBundle\WallabagApiBundle(),
new Wallabag\UserBundle\WallabagUserBundle(),
new Wallabag\ImportBundle\WallabagImportBundle(),
new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
];
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

44
app/config/config.yml
View file

@ -160,7 +160,7 @@ nelmio_cors:
fos_user:
db_driver: orm
firewall_name: secured_area
user_class: Wallabag\UserBundle\Entity\User
user_class: Wallabag\CoreBundle\Entity\User
registration:
confirmation:
enabled: "%fosuser_confirmation%"
@ -168,14 +168,14 @@ fos_user:
address: "%from_email%"
sender_name: wallabag
service:
mailer: Wallabag\UserBundle\Mailer\UserMailer
mailer: Wallabag\CoreBundle\Mailer\UserMailer
fos_oauth_server:
db_driver: orm
client_class: Wallabag\ApiBundle\Entity\Client
access_token_class: Wallabag\ApiBundle\Entity\AccessToken
refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
client_class: Wallabag\CoreBundle\Entity\Api\Client
access_token_class: Wallabag\CoreBundle\Entity\Api\AccessToken
refresh_token_class: Wallabag\CoreBundle\Entity\Api\RefreshToken
auth_code_class: Wallabag\CoreBundle\Entity\Api\AuthCode
service:
user_provider: fos_user.user_provider.username_email
options:
@ -194,14 +194,14 @@ scheb_two_factor:
google:
enabled: true
issuer: "%server_name%"
template: "@WallabagUser/Authentication/form.html.twig"
template: "@WallabagCore/Authentication/form.html.twig"
email:
enabled: true
sender_email: "%twofactor_sender%"
digits: 6
template: "@WallabagUser/Authentication/form.html.twig"
mailer: Wallabag\UserBundle\Mailer\AuthCodeMailer
template: "@WallabagCore/Authentication/form.html.twig"
mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer
rulerz:
targets:
@ -285,7 +285,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.pocket'
callback: wallabag_import.consumer.amqp.pocket
callback: wallabag_core.consumer.amqp.pocket
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_readability:
connection: default
@ -294,7 +294,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.readability'
callback: wallabag_import.consumer.amqp.readability
callback: wallabag_core.consumer.amqp.readability
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_instapaper:
connection: default
@ -303,7 +303,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.instapaper'
callback: wallabag_import.consumer.amqp.instapaper
callback: wallabag_core.consumer.amqp.instapaper
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_pinboard:
connection: default
@ -312,7 +312,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.pinboard'
callback: wallabag_import.consumer.amqp.pinboard
callback: wallabag_core.consumer.amqp.pinboard
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_delicious:
connection: default
@ -321,7 +321,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.delicious'
callback: wallabag_import.consumer.amqp.delicious
callback: wallabag_core.consumer.amqp.delicious
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_wallabag_v1:
connection: default
@ -330,7 +330,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.wallabag_v1'
callback: wallabag_import.consumer.amqp.wallabag_v1
callback: wallabag_core.consumer.amqp.wallabag_v1
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_wallabag_v2:
connection: default
@ -339,7 +339,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.wallabag_v2'
callback: wallabag_import.consumer.amqp.wallabag_v2
callback: wallabag_core.consumer.amqp.wallabag_v2
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_elcurator:
connection: default
@ -348,7 +348,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.elcurator'
callback: wallabag_import.consumer.amqp.elcurator
callback: wallabag_core.consumer.amqp.elcurator
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_firefox:
connection: default
@ -357,7 +357,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.firefox'
callback: wallabag_import.consumer.amqp.firefox
callback: wallabag_core.consumer.amqp.firefox
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_chrome:
connection: default
@ -366,7 +366,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.chrome'
callback: wallabag_import.consumer.amqp.chrome
callback: wallabag_core.consumer.amqp.chrome
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_shaarli:
connection: default
@ -375,7 +375,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.shaarli'
callback: wallabag_import.consumer.amqp.shaarli
callback: wallabag_core.consumer.amqp.shaarli
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_pocket_html:
connection: default
@ -384,7 +384,7 @@ old_sound_rabbit_mq:
type: topic
queue_options:
name: 'wallabag.import.pocket_html'
callback: wallabag_import.consumer.amqp.pocket_html
callback: wallabag_core.consumer.amqp.pocket_html
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
fos_js_routing:
@ -424,7 +424,7 @@ httplug:
wallabag_core.entry.download_images:
factory: 'httplug.factory.auto'
plugins: ['httplug.plugin.logger']
wallabag_import.pocket.client:
wallabag_core.pocket.client:
factory: 'httplug.factory.auto'
plugins:
- 'httplug.plugin.logger'

20
app/config/routing.yml
View file

@ -1,23 +1,3 @@
wallabag_annotation:
resource: "@WallabagAnnotationBundle/Controller/"
type: annotation
prefix: /
wallabag_import:
resource: "@WallabagImportBundle/Controller/"
type: annotation
prefix: /import
wallabag_user:
resource: "@WallabagUserBundle/Controller/"
type: annotation
prefix: /users
wallabag_api:
resource: "@WallabagApiBundle/Controller/"
type: annotation
prefix: /
app:
resource: "@WallabagCoreBundle/Controller/"
type: annotation

2
app/config/security.yml
View file

@ -9,7 +9,7 @@ security:
providers:
administrators:
entity:
class: 'Wallabag\UserBundle\Entity\User'
class: 'Wallabag\CoreBundle\Entity\User'
property: username
fos_userbundle:
id: fos_user.user_provider.username_email

144
app/config/services.yml
View file

@ -32,108 +32,76 @@ services:
$supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
$fonts: '%wallabag_core.fonts%'
Wallabag\AnnotationBundle\:
resource: '../../src/Wallabag/AnnotationBundle/*'
exclude: '../../src/Wallabag/AnnotationBundle/{Controller,Entity,DataFixtures}'
Wallabag\ApiBundle\:
resource: '../../src/Wallabag/ApiBundle/*'
exclude: '../../src/Wallabag/ApiBundle/{Controller,Entity}'
Wallabag\CoreBundle\:
resource: '../../src/Wallabag/CoreBundle/*'
exclude: ['../../src/Wallabag/CoreBundle/{Controller,Entity,DataFixtures}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,DataFixtures,Redis}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
# controllers are imported separately to make sure services can be injected
# as action arguments even if you don't extend any base controller class
Wallabag\AnnotationBundle\Controller\:
resource: '../../src/Wallabag/AnnotationBundle/Controller/'
tags: ['controller.service_arguments']
Wallabag\ApiBundle\Controller\:
resource: '../../src/Wallabag/ApiBundle/Controller/'
tags: ['controller.service_arguments']
Wallabag\CoreBundle\Controller\:
resource: '../../src/Wallabag/CoreBundle/Controller/'
tags: ['controller.service_arguments']
Wallabag\ImportBundle\Controller\:
resource: '../../src/Wallabag/ImportBundle/Controller/'
tags: ['controller.service_arguments']
Wallabag\UserBundle\Controller\:
resource: '../../src/Wallabag/UserBundle/Controller/'
tags: ['controller.service_arguments']
# inject alias service into controllers
Wallabag\ImportBundle\Controller\ChromeController:
Wallabag\CoreBundle\Controller\Import\ChromeController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
$redisProducer: '@wallabag_import.producer.redis.chrome'
$redisProducer: '@wallabag_core.producer.redis.chrome'
Wallabag\ImportBundle\Controller\DeliciousController:
Wallabag\CoreBundle\Controller\Import\DeliciousController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
$redisProducer: '@wallabag_import.producer.redis.delicious'
$redisProducer: '@wallabag_core.producer.redis.delicious'
Wallabag\ImportBundle\Controller\ElcuratorController:
Wallabag\CoreBundle\Controller\Import\ElcuratorController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
$redisProducer: '@wallabag_import.producer.redis.elcurator'
$redisProducer: '@wallabag_core.producer.redis.elcurator'
Wallabag\ImportBundle\Controller\FirefoxController:
Wallabag\CoreBundle\Controller\Import\FirefoxController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
$redisProducer: '@wallabag_import.producer.redis.firefox'
$redisProducer: '@wallabag_core.producer.redis.firefox'
Wallabag\ImportBundle\Controller\InstapaperController:
Wallabag\CoreBundle\Controller\Import\InstapaperController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
$redisProducer: '@wallabag_import.producer.redis.instapaper'
$redisProducer: '@wallabag_core.producer.redis.instapaper'
Wallabag\ImportBundle\Controller\PinboardController:
Wallabag\CoreBundle\Controller\Import\PinboardController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
$redisProducer: '@wallabag_import.producer.redis.pinboard'
$redisProducer: '@wallabag_core.producer.redis.pinboard'
Wallabag\ImportBundle\Controller\PocketController:
Wallabag\CoreBundle\Controller\Import\PocketController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
$redisProducer: '@wallabag_import.producer.redis.pocket'
$redisProducer: '@wallabag_core.producer.redis.pocket'
Wallabag\ImportBundle\Controller\ReadabilityController:
Wallabag\CoreBundle\Controller\Import\ReadabilityController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
$redisProducer: '@wallabag_import.producer.redis.readability'
$redisProducer: '@wallabag_core.producer.redis.readability'
Wallabag\ImportBundle\Controller\WallabagV1Controller:
Wallabag\CoreBundle\Controller\Import\WallabagV1Controller:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
$redisProducer: '@wallabag_import.producer.redis.wallabag_v1'
$redisProducer: '@wallabag_core.producer.redis.wallabag_v1'
Wallabag\ImportBundle\Controller\WallabagV2Controller:
Wallabag\CoreBundle\Controller\Import\WallabagV2Controller:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
$redisProducer: '@wallabag_import.producer.redis.wallabag_v2'
$redisProducer: '@wallabag_core.producer.redis.wallabag_v2'
Wallabag\ImportBundle\Controller\ShaarliController:
Wallabag\CoreBundle\Controller\Import\ShaarliController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
$redisProducer: '@wallabag_import.producer.redis.shaarli'
$redisProducer: '@wallabag_core.producer.redis.shaarli'
Wallabag\ImportBundle\Controller\PocketHtmlController:
Wallabag\CoreBundle\Controller\Import\PocketHtmlController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
$redisProducer: '@wallabag_import.producer.redis.pocket_html'
Wallabag\ImportBundle\:
resource: '../../src/Wallabag/ImportBundle/*'
exclude: '../../src/Wallabag/ImportBundle/{Consumer,Controller,Redis}'
Wallabag\UserBundle\:
resource: '../../src/Wallabag/UserBundle/*'
exclude: '../../src/Wallabag/UserBundle/{Controller,Entity,DataFixtures}'
$redisProducer: '@wallabag_core.producer.redis.pocket_html'
Doctrine\DBAL\Connection:
alias: doctrine.dbal.default_connection
@ -323,14 +291,14 @@ services:
tags:
- { name: console.command, command: 'wallabag:tag:all' }
Wallabag\ImportBundle\Command\ImportCommand:
Wallabag\CoreBundle\Command\Import\ImportCommand:
tags:
- { name: console.command, command: 'wallabag:import' }
wallabag_core.entry.download_images.client:
alias: 'httplug.client.wallabag_core.entry.download_images'
Wallabag\UserBundle\Mailer\UserMailer:
Wallabag\CoreBundle\Mailer\UserMailer:
arguments:
$parameters:
template:
@ -340,7 +308,7 @@ services:
confirmation: '%fos_user.registration.confirmation.from_email%'
resetting: '%fos_user.resetting.email.from_email%'
Wallabag\UserBundle\EventListener\CreateConfigListener:
Wallabag\CoreBundle\Event\Listener\CreateConfigListener:
arguments:
$itemsOnPage: "%wallabag_core.items_on_page%"
$feedLimit: "%wallabag_core.feed_limit%"
@ -350,62 +318,62 @@ services:
$listMode: "%wallabag_core.list_mode%"
$displayThumbnails: "%wallabag_core.display_thumbnails%"
Wallabag\UserBundle\EventListener\AuthenticationFailureListener:
Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener:
tags:
- { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
wallabag_import.pocket.client:
alias: 'httplug.client.wallabag_import.pocket.client'
wallabag_core.pocket.client:
alias: 'httplug.client.wallabag_core.pocket.client'
Wallabag\ImportBundle\Import\PocketImport:
Wallabag\CoreBundle\Import\PocketImport:
calls:
- [ setClient, [ "@wallabag_import.pocket.client" ] ]
- [ setClient, [ "@wallabag_core.pocket.client" ] ]
tags:
- { name: wallabag_import.import, alias: pocket }
- { name: wallabag_core.import, alias: pocket }
Wallabag\ImportBundle\Import\WallabagV1Import:
Wallabag\CoreBundle\Import\WallabagV1Import:
tags:
- { name: wallabag_import.import, alias: wallabag_v1 }
- { name: wallabag_core.import, alias: wallabag_v1 }
Wallabag\ImportBundle\Import\WallabagV2Import:
Wallabag\CoreBundle\Import\WallabagV2Import:
tags:
- { name: wallabag_import.import, alias: wallabag_v2 }
- { name: wallabag_core.import, alias: wallabag_v2 }
Wallabag\ImportBundle\Import\ElcuratorImport:
Wallabag\CoreBundle\Import\ElcuratorImport:
tags:
- { name: wallabag_import.import, alias: elcurator }
- { name: wallabag_core.import, alias: elcurator }
Wallabag\ImportBundle\Import\ReadabilityImport:
Wallabag\CoreBundle\Import\ReadabilityImport:
tags:
- { name: wallabag_import.import, alias: readability }
- { name: wallabag_core.import, alias: readability }
Wallabag\ImportBundle\Import\InstapaperImport:
Wallabag\CoreBundle\Import\InstapaperImport:
tags:
- { name: wallabag_import.import, alias: instapaper }
- { name: wallabag_core.import, alias: instapaper }
Wallabag\ImportBundle\Import\PinboardImport:
Wallabag\CoreBundle\Import\PinboardImport:
tags:
- { name: wallabag_import.import, alias: pinboard }
- { name: wallabag_core.import, alias: pinboard }
Wallabag\ImportBundle\Import\DeliciousImport:
Wallabag\CoreBundle\Import\DeliciousImport:
tags:
- { name: wallabag_import.import, alias: delicious }
- { name: wallabag_core.import, alias: delicious }
Wallabag\ImportBundle\Import\FirefoxImport:
Wallabag\CoreBundle\Import\FirefoxImport:
tags:
- { name: wallabag_import.import, alias: firefox }
- { name: wallabag_core.import, alias: firefox }
Wallabag\ImportBundle\Import\ChromeImport:
Wallabag\CoreBundle\Import\ChromeImport:
tags:
- { name: wallabag_import.import, alias: chrome }
- { name: wallabag_core.import, alias: chrome }
Wallabag\ImportBundle\Import\ShaarliImport:
Wallabag\CoreBundle\Import\ShaarliImport:
tags:
- { name: wallabag_import.import, alias: shaarli }
- { name: wallabag_core.import, alias: shaarli }
Wallabag\ImportBundle\Import\PocketHtmlImport:
Wallabag\CoreBundle\Import\PocketHtmlImport:
tags:
- { name: wallabag_import.import, alias: pocket_html }
- { name: wallabag_core.import, alias: pocket_html }
# to factorize the proximity and bypass translation for prev & next
pagerfanta.view.default_wallabag:

74
app/config/services_rabbit.yml
View file

@ -5,7 +5,7 @@ services:
autoconfigure: true
public: true
Wallabag\ImportBundle\Consumer\RabbitMQConsumerTotalProxy:
Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy:
arguments:
$pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer'
$readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer'
@ -20,62 +20,62 @@ services:
$shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer'
$pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
wallabag_import.consumer.amqp.pocket:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.pocket:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\PocketImport'
$import: '@Wallabag\CoreBundle\Import\PocketImport'
wallabag_import.consumer.amqp.readability:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.readability:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
$import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
wallabag_import.consumer.amqp.instapaper:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.instapaper:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\InstapaperImport'
$import: '@Wallabag\CoreBundle\Import\InstapaperImport'
wallabag_import.consumer.amqp.pinboard:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.pinboard:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\PinboardImport'
$import: '@Wallabag\CoreBundle\Import\PinboardImport'
wallabag_import.consumer.amqp.delicious:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.delicious:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\DeliciousImport'
$import: '@Wallabag\CoreBundle\Import\DeliciousImport'
wallabag_import.consumer.amqp.wallabag_v1:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.wallabag_v1:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
$import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
wallabag_import.consumer.amqp.wallabag_v2:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.wallabag_v2:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
$import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
wallabag_import.consumer.amqp.elcurator:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.elcurator:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
$import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
wallabag_import.consumer.amqp.firefox:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.firefox:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\FirefoxImport'
$import: '@Wallabag\CoreBundle\Import\FirefoxImport'
wallabag_import.consumer.amqp.chrome:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.chrome:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ChromeImport'
$import: '@Wallabag\CoreBundle\Import\ChromeImport'
wallabag_import.consumer.amqp.shaarli:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.shaarli:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ShaarliImport'
$import: '@Wallabag\CoreBundle\Import\ShaarliImport'
wallabag_import.consumer.amqp.pocket_html:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
wallabag_core.consumer.amqp.pocket_html:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'
$import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'

168
app/config/services_redis.yml
View file

@ -6,193 +6,193 @@ services:
public: true
# readability
wallabag_import.queue.redis.readability:
wallabag_core.queue.redis.readability:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.readability"
wallabag_import.producer.redis.readability:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.readability:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.readability"
- "@wallabag_core.queue.redis.readability"
wallabag_import.consumer.redis.readability:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.readability:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
$import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
# instapaper
wallabag_import.queue.redis.instapaper:
wallabag_core.queue.redis.instapaper:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.instapaper"
wallabag_import.producer.redis.instapaper:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.instapaper:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.instapaper"
- "@wallabag_core.queue.redis.instapaper"
wallabag_import.consumer.redis.instapaper:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.instapaper:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\InstapaperImport'
$import: '@Wallabag\CoreBundle\Import\InstapaperImport'
# pinboard
wallabag_import.queue.redis.pinboard:
wallabag_core.queue.redis.pinboard:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.pinboard"
wallabag_import.producer.redis.pinboard:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.pinboard:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.pinboard"
- "@wallabag_core.queue.redis.pinboard"
wallabag_import.consumer.redis.pinboard:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.pinboard:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\PinboardImport'
$import: '@Wallabag\CoreBundle\Import\PinboardImport'
# delicious
wallabag_import.queue.redis.delicious:
wallabag_core.queue.redis.delicious:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.delicious"
wallabag_import.producer.redis.delicious:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.delicious:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.delicious"
- "@wallabag_core.queue.redis.delicious"
wallabag_import.consumer.redis.delicious:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.delicious:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\DeliciousImport'
$import: '@Wallabag\CoreBundle\Import\DeliciousImport'
# pocket
wallabag_import.queue.redis.pocket:
wallabag_core.queue.redis.pocket:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.pocket"
wallabag_import.producer.redis.pocket:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.pocket:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.pocket"
- "@wallabag_core.queue.redis.pocket"
wallabag_import.consumer.redis.pocket:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.pocket:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\PocketImport'
$import: '@Wallabag\CoreBundle\Import\PocketImport'
# wallabag v1
wallabag_import.queue.redis.wallabag_v1:
wallabag_core.queue.redis.wallabag_v1:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.wallabag_v1"
wallabag_import.producer.redis.wallabag_v1:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.wallabag_v1:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.wallabag_v1"
- "@wallabag_core.queue.redis.wallabag_v1"
wallabag_import.consumer.redis.wallabag_v1:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.wallabag_v1:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
$import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
# wallabag v2
wallabag_import.queue.redis.wallabag_v2:
wallabag_core.queue.redis.wallabag_v2:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.wallabag_v2"
wallabag_import.producer.redis.wallabag_v2:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.wallabag_v2:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.wallabag_v2"
- "@wallabag_core.queue.redis.wallabag_v2"
wallabag_import.consumer.redis.wallabag_v2:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.wallabag_v2:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
$import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
# elcurator
wallabag_import.queue.redis.elcurator:
wallabag_core.queue.redis.elcurator:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.elcurator"
wallabag_import.producer.redis.elcurator:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.elcurator:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.elcurator"
- "@wallabag_core.queue.redis.elcurator"
wallabag_import.consumer.redis.elcurator:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.elcurator:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
$import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
# firefox
wallabag_import.queue.redis.firefox:
wallabag_core.queue.redis.firefox:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.firefox"
wallabag_import.producer.redis.firefox:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.firefox:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.firefox"
- "@wallabag_core.queue.redis.firefox"
wallabag_import.consumer.redis.firefox:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.firefox:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\FirefoxImport'
$import: '@Wallabag\CoreBundle\Import\FirefoxImport'
# chrome
wallabag_import.queue.redis.chrome:
wallabag_core.queue.redis.chrome:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.chrome"
wallabag_import.producer.redis.chrome:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.chrome:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.chrome"
- "@wallabag_core.queue.redis.chrome"
wallabag_import.consumer.redis.chrome:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.chrome:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ChromeImport'
$import: '@Wallabag\CoreBundle\Import\ChromeImport'
# shaarli
wallabag_import.queue.redis.shaarli:
wallabag_core.queue.redis.shaarli:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.shaarli"
wallabag_import.producer.redis.shaarli:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.shaarli:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.shaarli"
- "@wallabag_core.queue.redis.shaarli"
wallabag_import.consumer.redis.shaarli:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.shaarli:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\ShaarliImport'
$import: '@Wallabag\CoreBundle\Import\ShaarliImport'
# pocket html
wallabag_import.queue.redis.pocket_html:
wallabag_core.queue.redis.pocket_html:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.pocket_html"
wallabag_import.producer.redis.pocket_html:
class: Wallabag\ImportBundle\Redis\Producer
wallabag_core.producer.redis.pocket_html:
class: Wallabag\CoreBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.pocket_html"
- "@wallabag_core.queue.redis.pocket_html"
wallabag_import.consumer.redis.pocket_html:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
wallabag_core.consumer.redis.pocket_html:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'
$import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'

12
app/config/services_test.yml
View file

@ -13,7 +13,7 @@ services:
public: true
wallabag_user.user_repository.test:
alias: Wallabag\UserBundle\Repository\UserRepository
alias: Wallabag\CoreBundle\Repository\UserRepository
public: true
filesystem_cache:
@ -22,17 +22,7 @@ services:
- "%kernel.cache_dir%/doctrine/metadata"
# fixtures
Wallabag\UserBundle\DataFixtures\:
resource: '../../src/Wallabag/UserBundle/DataFixtures/*'
tags: ['doctrine.fixture.orm']
autowire: true
Wallabag\CoreBundle\DataFixtures\:
resource: '../../src/Wallabag/CoreBundle/DataFixtures/*'
tags: ['doctrine.fixture.orm']
autowire: true
Wallabag\AnnotationBundle\DataFixtures\:
resource: '../../src/Wallabag/AnnotationBundle/DataFixtures/*'
tags: ['doctrine.fixture.orm']
autowire: true

2
app/config/wallabag.yml
View file

@ -162,7 +162,5 @@ wallabag_core:
- 'Montserrat'
- 'OpenDyslexicRegular'
- 'Oswald'
wallabag_import:
allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
resource_dir: "%kernel.project_dir%/web/uploads/import"

74
phpstan-baseline.neon
View file

@ -1,14 +1,14 @@
parameters:
ignoreErrors:
-
message: "#^Method Wallabag\\\\AnnotationBundle\\\\Controller\\\\WallabagAnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<mixed\\>\\.$#"
message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<mixed\\>\\.$#"
count: 1
path: src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
path: src/Wallabag/CoreBundle/Controller/AnnotationController.php
-
message: "#^Method Wallabag\\\\AnnotationBundle\\\\Controller\\\\WallabagAnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<null\\>\\.$#"
message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<null\\>\\.$#"
count: 1
path: src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
path: src/Wallabag/CoreBundle/Controller/AnnotationController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#"
@ -20,6 +20,36 @@ parameters:
count: 6
path: src/Wallabag/CoreBundle/Controller/ConfigController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1
path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1
path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1
path: src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1
path: src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1
path: src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
-
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1
path: src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
-
message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpressionBuilder\\(\\)\\.$#"
count: 1
@ -30,45 +60,15 @@ parameters:
count: 10
path: src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
-
message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1
path: src/Wallabag/ImportBundle/Controller/BrowserController.php
-
message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1
path: src/Wallabag/ImportBundle/Controller/BrowserController.php
-
message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1
path: src/Wallabag/ImportBundle/Controller/HtmlController.php
-
message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1
path: src/Wallabag/ImportBundle/Controller/HtmlController.php
-
message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1
path: src/Wallabag/ImportBundle/Controller/WallabagController.php
-
message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1
path: src/Wallabag/ImportBundle/Controller/WallabagController.php
-
message: "#^Call to an undefined method Scheb\\\\TwoFactorBundle\\\\Model\\\\Email\\\\TwoFactorInterface\\:\\:getName\\(\\)\\.$#"
count: 2
path: src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
path: src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
-
message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\UserBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\CoreBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
count: 1
path: src/Wallabag/UserBundle/Mailer/UserMailer.php
path: src/Wallabag/CoreBundle/Mailer/UserMailer.php
-
message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#"

14
src/Wallabag/AnnotationBundle/DependencyInjection/Configuration.php
View file

@ -1,14 +0,0 @@
<?php
namespace Wallabag\AnnotationBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
class Configuration implements ConfigurationInterface
{
public function getConfigTreeBuilder()
{
return new TreeBuilder('wallabag_annotation');
}
}

15
src/Wallabag/AnnotationBundle/DependencyInjection/WallabagAnnotationExtension.php
View file

@ -1,15 +0,0 @@
<?php
namespace Wallabag\AnnotationBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
class WallabagAnnotationExtension extends Extension
{
public function load(array $configs, ContainerBuilder $container)
{
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
}
}

9
src/Wallabag/AnnotationBundle/WallabagAnnotationBundle.php
View file

@ -1,9 +0,0 @@
<?php
namespace Wallabag\AnnotationBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
class WallabagAnnotationBundle extends Bundle
{
}

19
src/Wallabag/ApiBundle/DependencyInjection/Configuration.php
View file

@ -1,19 +0,0 @@
<?php
namespace Wallabag\ApiBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
/**
* This is the class that validates and merges configuration from your app/config files.
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
*/
class Configuration implements ConfigurationInterface
{
public function getConfigTreeBuilder()
{
return new TreeBuilder('wallabag_api');
}
}

20
src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php
View file

@ -1,20 +0,0 @@
<?php
namespace Wallabag\ApiBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
class WallabagApiExtension extends Extension
{
public function load(array $configs, ContainerBuilder $container)
{
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
}
public function getAlias()
{
return 'wallabag_api';
}
}

39
src/Wallabag/ApiBundle/Resources/config/routing_rest.yml
View file

@ -1,39 +0,0 @@
entry:
type: rest
resource: 'Wallabag\ApiBundle\Controller\EntryRestController'
name_prefix: api_
search:
type: rest
resource: 'Wallabag\ApiBundle\Controller\SearchRestController'
name_prefix: api_
tag:
type: rest
resource: 'Wallabag\ApiBundle\Controller\TagRestController'
name_prefix: api_
tagging_rule:
type: rest
resource: 'Wallabag\ApiBundle\Controller\TaggingRuleRestController'
name_prefix: api_
annotation:
type: rest
resource: 'Wallabag\ApiBundle\Controller\AnnotationRestController'
name_prefix: api_
misc:
type: rest
resource: 'Wallabag\ApiBundle\Controller\WallabagRestController'
name_prefix: api_
user:
type: rest
resource: 'Wallabag\ApiBundle\Controller\UserRestController'
name_prefix: api_
config:
type: rest
resource: 'Wallabag\ApiBundle\Controller\ConfigRestController'
name_prefix: api_

9
src/Wallabag/ApiBundle/WallabagApiBundle.php
View file

@ -1,9 +0,0 @@
<?php
namespace Wallabag\ApiBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
class WallabagApiBundle extends Bundle
{
}

4
src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
View file

@ -10,9 +10,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
class CleanDuplicatesCommand extends Command
{

2
src/Wallabag/CoreBundle/Command/ExportCommand.php
View file

@ -10,7 +10,7 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Helper\EntriesExport;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
class ExportCommand extends Command
{

4
src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
View file

@ -8,10 +8,10 @@ use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Helper\UrlHasher;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
class GenerateUrlHashesCommand extends Command
{

28
src/Wallabag/ImportBundle/Command/ImportCommand.php → src/Wallabag/CoreBundle/Command/Import/ImportCommand.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Command;
namespace Wallabag\CoreBundle\Command\Import;
use Doctrine\DBAL\Driver\Middleware;
use Doctrine\DBAL\Logging\Middleware as LoggingMiddleware;
@ -13,19 +13,19 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Wallabag\ImportBundle\Import\ChromeImport;
use Wallabag\ImportBundle\Import\DeliciousImport;
use Wallabag\ImportBundle\Import\ElcuratorImport;
use Wallabag\ImportBundle\Import\FirefoxImport;
use Wallabag\ImportBundle\Import\InstapaperImport;
use Wallabag\ImportBundle\Import\PinboardImport;
use Wallabag\ImportBundle\Import\PocketHtmlImport;
use Wallabag\ImportBundle\Import\ReadabilityImport;
use Wallabag\ImportBundle\Import\ShaarliImport;
use Wallabag\ImportBundle\Import\WallabagV1Import;
use Wallabag\ImportBundle\Import\WallabagV2Import;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Import\ChromeImport;
use Wallabag\CoreBundle\Import\DeliciousImport;
use Wallabag\CoreBundle\Import\ElcuratorImport;
use Wallabag\CoreBundle\Import\FirefoxImport;
use Wallabag\CoreBundle\Import\InstapaperImport;
use Wallabag\CoreBundle\Import\PinboardImport;
use Wallabag\CoreBundle\Import\PocketHtmlImport;
use Wallabag\CoreBundle\Import\ReadabilityImport;
use Wallabag\CoreBundle\Import\ShaarliImport;
use Wallabag\CoreBundle\Import\WallabagV1Import;
use Wallabag\CoreBundle\Import\WallabagV2Import;
use Wallabag\CoreBundle\Repository\UserRepository;
class ImportCommand extends Command
{

8
src/Wallabag/ImportBundle/Command/RedisWorkerCommand.php → src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Command;
namespace Wallabag\CoreBundle\Command\Import;
use Simpleue\Worker\QueueWorker;
use Symfony\Component\Config\Definition\Exception\Exception;
@ -39,13 +39,13 @@ class RedisWorkerCommand extends Command
$serviceName = $input->getArgument('serviceName');
if (!$this->container->has('wallabag_import.queue.redis.' . $serviceName) || !$this->container->has('wallabag_import.consumer.redis.' . $serviceName)) {
if (!$this->container->has('wallabag_core.queue.redis.' . $serviceName) || !$this->container->has('wallabag_core.consumer.redis.' . $serviceName)) {
throw new Exception(sprintf('No queue or consumer found for service name: "%s"', $input->getArgument('serviceName')));
}
$worker = new QueueWorker(
$this->container->get('wallabag_import.queue.redis.' . $serviceName),
$this->container->get('wallabag_import.consumer.redis.' . $serviceName),
$this->container->get('wallabag_core.queue.redis.' . $serviceName),
$this->container->get('wallabag_core.consumer.redis.' . $serviceName),
(int) $input->getOption('maxIterations')
);

2
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -22,7 +22,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
use Wallabag\CoreBundle\Entity\InternalSetting;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class InstallCommand extends Command
{

2
src/Wallabag/CoreBundle/Command/ListUserCommand.php
View file

@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
class ListUserCommand extends Command
{

2
src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
View file

@ -14,7 +14,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Helper\ContentProxy;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
class ReloadEntryCommand extends Command
{

4
src/Wallabag/CoreBundle/Command/ShowUserCommand.php
View file

@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Repository\UserRepository;
class ShowUserCommand extends Command
{

4
src/Wallabag/CoreBundle/Command/TagAllCommand.php
View file

@ -9,9 +9,9 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Helper\RuleBasedTagger;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
class TagAllCommand extends Command
{

2
src/Wallabag/ImportBundle/Consumer/AMQPEntryConsumer.php → src/Wallabag/CoreBundle/Consumer/AMQPEntryConsumer.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Consumer;
namespace Wallabag\CoreBundle\Consumer;
use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
use PhpAmqpLib\Message\AMQPMessage;

6
src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php → src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Consumer;
namespace Wallabag\CoreBundle\Consumer;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
@ -9,8 +9,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Event\EntrySavedEvent;
use Wallabag\ImportBundle\Import\AbstractImport;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Import\AbstractImport;
use Wallabag\CoreBundle\Repository\UserRepository;
abstract class AbstractConsumer
{

2
src/Wallabag/ImportBundle/Consumer/RabbitMQConsumerTotalProxy.php → src/Wallabag/CoreBundle/Consumer/RabbitMQConsumerTotalProxy.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Consumer;
namespace Wallabag\CoreBundle\Consumer;
use OldSound\RabbitMqBundle\RabbitMq\Consumer;

2
src/Wallabag/ImportBundle/Consumer/RedisEntryConsumer.php → src/Wallabag/CoreBundle/Consumer/RedisEntryConsumer.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Consumer;
namespace Wallabag\CoreBundle\Consumer;
use Simpleue\Job\Job;

2
src/Wallabag/CoreBundle/Controller/AbstractController.php
View file

@ -3,7 +3,7 @@
namespace Wallabag\CoreBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
abstract class AbstractController extends BaseAbstractController
{

22
src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php → src/Wallabag/CoreBundle/Controller/AnnotationController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\AnnotationBundle\Controller;
namespace Wallabag\CoreBundle\Controller;
use Doctrine\ORM\EntityManagerInterface;
use FOS\RestBundle\Controller\AbstractFOSRestController;
@ -10,14 +10,14 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\AnnotationBundle\Form\EditAnnotationType;
use Wallabag\AnnotationBundle\Form\NewAnnotationType;
use Wallabag\AnnotationBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Form\Type\EditAnnotationType;
use Wallabag\CoreBundle\Form\Type\NewAnnotationType;
use Wallabag\CoreBundle\Repository\AnnotationRepository;
class WallabagAnnotationController extends AbstractFOSRestController
class AnnotationController extends AbstractFOSRestController
{
protected EntityManagerInterface $entityManager;
protected SerializerInterface $serializer;
@ -33,7 +33,7 @@ class WallabagAnnotationController extends AbstractFOSRestController
/**
* Retrieve annotations for an entry.
*
* @see Wallabag\ApiBundle\Controller\WallabagRestController
* @see Api\WallabagRestController
*
* @Route("/annotations/{entry}.{_format}", methods={"GET"}, name="annotations_get_annotations", defaults={"_format": "json"})
*
@ -54,7 +54,7 @@ class WallabagAnnotationController extends AbstractFOSRestController
/**
* Creates a new annotation.
*
* @see Wallabag\ApiBundle\Controller\WallabagRestController
* @see Api\WallabagRestController
*
* @Route("/annotations/{entry}.{_format}", methods={"POST"}, name="annotations_post_annotation", defaults={"_format": "json"})
*
@ -88,7 +88,7 @@ class WallabagAnnotationController extends AbstractFOSRestController
/**
* Updates an annotation.
*
* @see Wallabag\ApiBundle\Controller\WallabagRestController
* @see Api\WallabagRestController
*
* @Route("/annotations/{annotation}.{_format}", methods={"PUT"}, name="annotations_put_annotation", defaults={"_format": "json"})
*
@ -125,7 +125,7 @@ class WallabagAnnotationController extends AbstractFOSRestController
/**
* Removes an annotation.
*
* @see Wallabag\ApiBundle\Controller\WallabagRestController
* @see Api\WallabagRestController
*
* @Route("/annotations/{annotation}.{_format}", methods={"DELETE"}, name="annotations_delete_annotation", defaults={"_format": "json"})
*

12
src/Wallabag/ApiBundle/Controller/AnnotationRestController.php → src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php
View file

@ -1,13 +1,13 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Nelmio\ApiDocBundle\Annotation\Operation;
use OpenApi\Annotations as OA;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Entry;
class AnnotationRestController extends WallabagRestController
@ -42,7 +42,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::getAnnotationsAction', [
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::getAnnotationsAction', [
'entry' => $entry,
]);
}
@ -108,7 +108,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::postAnnotationAction', [
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::postAnnotationAction', [
'request' => $request,
'entry' => $entry,
]);
@ -144,7 +144,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::putAnnotationAction', [
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::putAnnotationAction', [
'annotation' => $annotation,
'request' => $request,
]);
@ -180,7 +180,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::deleteAnnotationAction', [
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::deleteAnnotationAction', [
'annotation' => $annotation,
]);
}

2
src/Wallabag/ApiBundle/Controller/ConfigRestController.php → src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerInterface;

8
src/Wallabag/ApiBundle/Controller/DeveloperController.php → src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
@ -8,10 +8,10 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ApiBundle\Entity\Client;
use Wallabag\ApiBundle\Form\Type\ClientType;
use Wallabag\ApiBundle\Repository\ClientRepository;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\CoreBundle\Entity\Api\Client;
use Wallabag\CoreBundle\Form\Type\Api\ClientType;
use Wallabag\CoreBundle\Repository\Api\ClientRepository;
class DeveloperController extends AbstractController
{

2
src/Wallabag/ApiBundle/Controller/EntryRestController.php → src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Hateoas\Configuration\Route as HateoasRoute;
use Hateoas\Representation\Factory\PagerfantaFactory;

2
src/Wallabag/ApiBundle/Controller/SearchRestController.php → src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Hateoas\Configuration\Route as HateoasRoute;
use Hateoas\Representation\Factory\PagerfantaFactory;

2
src/Wallabag/ApiBundle/Controller/TagRestController.php → src/Wallabag/CoreBundle/Controller/Api/TagRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Nelmio\ApiDocBundle\Annotation\Operation;
use OpenApi\Annotations as OA;

2
src/Wallabag/ApiBundle/Controller/TaggingRuleRestController.php → src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerBuilder;

8
src/Wallabag/ApiBundle/Controller/UserRestController.php → src/Wallabag/CoreBundle/Controller/Api/UserRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Craue\ConfigBundle\Util\Config;
use Doctrine\ORM\EntityManagerInterface;
@ -15,9 +15,9 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ApiBundle\Entity\Client;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\NewUserType;
use Wallabag\CoreBundle\Entity\Api\Client;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Form\Type\NewUserType;
class UserRestController extends WallabagRestController
{

6
src/Wallabag/ApiBundle/Controller/WallabagRestController.php → src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Api;
use Craue\ConfigBundle\Util\Config;
use Doctrine\ORM\EntityManagerInterface;
@ -16,8 +16,8 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ApiBundle\Entity\ApplicationInfo;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Api\ApplicationInfo;
use Wallabag\CoreBundle\Entity\User;
class WallabagRestController extends AbstractFOSRestController
{

4
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -20,7 +20,6 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Wallabag\AnnotationBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
use Wallabag\CoreBundle\Entity\RuleInterface;
@ -34,13 +33,14 @@ use Wallabag\CoreBundle\Form\Type\TaggingRuleImportType;
use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
use Wallabag\CoreBundle\Form\Type\UserInformationType;
use Wallabag\CoreBundle\Helper\Redirect;
use Wallabag\CoreBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Repository\ConfigRepository;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository;
use Wallabag\CoreBundle\Repository\TaggingRuleRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
use Wallabag\CoreBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Tools\Utils;
use Wallabag\UserBundle\Repository\UserRepository;
class ConfigController extends AbstractController
{

12
src/Wallabag/CoreBundle/Controller/FeedController.php
View file

@ -13,9 +13,9 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Entity\User;
class FeedController extends AbstractController
{
@ -31,7 +31,7 @@ class FeedController extends AbstractController
*
* @Route("/feed/{username}/{token}/unread/{page}", name="unread_feed", defaults={"page"=1, "_format"="xml"})
*
* @ParamConverter("user", class="Wallabag\UserBundle\Entity\User", converter="username_feed_token_converter")
* @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
*
* @return Response
*/
@ -45,7 +45,7 @@ class FeedController extends AbstractController
*
* @Route("/feed/{username}/{token}/archive/{page}", name="archive_feed", defaults={"page"=1, "_format"="xml"})
*
* @ParamConverter("user", class="Wallabag\UserBundle\Entity\User", converter="username_feed_token_converter")
* @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
*
* @return Response
*/
@ -59,7 +59,7 @@ class FeedController extends AbstractController
*
* @Route("/feed/{username}/{token}/starred/{page}", name="starred_feed", defaults={"page"=1, "_format"="xml"})
*
* @ParamConverter("user", class="Wallabag\UserBundle\Entity\User", converter="username_feed_token_converter")
* @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
*
* @return Response
*/
@ -73,7 +73,7 @@ class FeedController extends AbstractController
*
* @Route("/feed/{username}/{token}/all/{page}", name="all_feed", defaults={"page"=1, "_format"="xml"})
*
* @ParamConverter("user", class="Wallabag\UserBundle\Entity\User", converter="username_feed_token_converter")
* @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
*
* @return Response
*/
@ -87,7 +87,7 @@ class FeedController extends AbstractController
*
* @Route("/feed/{username}/{token}/tags/{slug}/{page}", name="tag_feed", defaults={"page"=1, "_format"="xml"})
*
* @ParamConverter("user", class="Wallabag\UserBundle\Entity\User", converter="username_feed_token_converter")
* @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
* @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
*
* @return Response

14
src/Wallabag/ImportBundle/Controller/BrowserController.php → src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
View file

@ -1,19 +1,19 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ImportInterface;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\ImportInterface;
abstract class BrowserController extends AbstractController
{
/**
* @Route("/browser", name="import_browser")
* @Route("/import/browser", name="import_browser")
*
* @return Response
*/
@ -30,9 +30,9 @@ abstract class BrowserController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = $this->getUser()->getId() . '.json';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $wallabag
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -51,7 +51,7 @@ abstract class BrowserController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);

10
src/Wallabag/ImportBundle/Controller/ChromeController.php → src/Wallabag/CoreBundle/Controller/Import/ChromeController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\ChromeImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\ChromeImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class ChromeController extends BrowserController
{
@ -26,7 +26,7 @@ class ChromeController extends BrowserController
}
/**
* @Route("/chrome", name="import_chrome")
* @Route("/import/chrome", name="import_chrome")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class ChromeController extends BrowserController
protected function getImportTemplate()
{
return '@WallabagImport/Chrome/index.html.twig';
return '@WallabagCore/Import/Chrome/index.html.twig';
}
}

18
src/Wallabag/ImportBundle/Controller/DeliciousController.php → src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -8,9 +8,9 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\DeliciousImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\DeliciousImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class DeliciousController extends AbstractController
{
@ -24,7 +24,7 @@ class DeliciousController extends AbstractController
}
/**
* @Route("/delicious", name="import_delicious")
* @Route("/import/delicious", name="import_delicious")
*/
public function indexAction(Request $request, DeliciousImport $delicious, Config $craueConfig, TranslatorInterface $translator)
{
@ -44,9 +44,9 @@ class DeliciousController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'delicious_' . $this->getUser()->getId() . '.json';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $delicious
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -65,7 +65,7 @@ class DeliciousController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);
@ -76,7 +76,7 @@ class DeliciousController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Delicious/index.html.twig', [
return $this->render('@WallabagCore/Import/Delicious/index.html.twig', [
'form' => $form->createView(),
'import' => $delicious,
]);

10
src/Wallabag/ImportBundle/Controller/ElcuratorController.php → src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\ElcuratorImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\ElcuratorImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class ElcuratorController extends WallabagController
{
@ -26,7 +26,7 @@ class ElcuratorController extends WallabagController
}
/**
* @Route("/elcurator", name="import_elcurator")
* @Route("/import/elcurator", name="import_elcurator")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class ElcuratorController extends WallabagController
protected function getImportTemplate()
{
return '@WallabagImport/Elcurator/index.html.twig';
return '@WallabagCore/Import/Elcurator/index.html.twig';
}
}

10
src/Wallabag/ImportBundle/Controller/FirefoxController.php → src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\FirefoxImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\FirefoxImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class FirefoxController extends BrowserController
{
@ -26,7 +26,7 @@ class FirefoxController extends BrowserController
}
/**
* @Route("/firefox", name="import_firefox")
* @Route("/import/firefox", name="import_firefox")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class FirefoxController extends BrowserController
protected function getImportTemplate()
{
return '@WallabagImport/Firefox/index.html.twig';
return '@WallabagCore/Import/Firefox/index.html.twig';
}
}

14
src/Wallabag/ImportBundle/Controller/HtmlController.php → src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
View file

@ -1,19 +1,19 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ImportInterface;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\ImportInterface;
abstract class HtmlController extends AbstractController
{
/**
* @Route("/html", name="import_html")
* @Route("/import/html", name="import_html")
*
* @return Response
*/
@ -30,9 +30,9 @@ abstract class HtmlController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = $this->getUser()->getId() . '.html';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $wallabag
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -51,7 +51,7 @@ abstract class HtmlController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);

14
src/Wallabag/ImportBundle/Controller/ImportController.php → src/Wallabag/CoreBundle/Controller/Import/ImportController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use Predis\Client;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Consumer\RabbitMQConsumerTotalProxy;
use Wallabag\ImportBundle\Import\ImportChain;
use Wallabag\CoreBundle\Import\ImportChain;
class ImportController extends AbstractController
{
@ -20,11 +20,11 @@ class ImportController extends AbstractController
}
/**
* @Route("/", name="import")
* @Route("/import/", name="import")
*/
public function importAction(ImportChain $importChain)
{
return $this->render('@WallabagImport/Import/index.html.twig', [
return $this->render('@WallabagCore/Import/index.html.twig', [
'imports' => $importChain->getAll(),
]);
}
@ -41,7 +41,7 @@ class ImportController extends AbstractController
$rabbitNotInstalled = false;
if (!$authorizationChecker->isGranted('ROLE_SUPER_ADMIN')) {
return $this->render('@WallabagImport/Import/check_queue.html.twig');
return $this->render('@WallabagCore/Import/check_queue.html.twig');
}
if ($craueConfig->get('import_with_rabbitmq')) {
@ -85,7 +85,7 @@ class ImportController extends AbstractController
}
}
return $this->render('@WallabagImport/Import/check_queue.html.twig', [
return $this->render('@WallabagCore/Import/check_queue.html.twig', [
'nbRedisMessages' => $nbRedisMessages,
'nbRabbitMessages' => $nbRabbitMessages,
'redisNotInstalled' => $redisNotInstalled,

18
src/Wallabag/ImportBundle/Controller/InstapaperController.php → src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -8,9 +8,9 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\InstapaperImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\InstapaperImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class InstapaperController extends AbstractController
{
@ -24,7 +24,7 @@ class InstapaperController extends AbstractController
}
/**
* @Route("/instapaper", name="import_instapaper")
* @Route("/import/instapaper", name="import_instapaper")
*/
public function indexAction(Request $request, InstapaperImport $instapaper, Config $craueConfig, TranslatorInterface $translator)
{
@ -44,9 +44,9 @@ class InstapaperController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'instapaper_' . $this->getUser()->getId() . '.csv';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $instapaper
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -65,7 +65,7 @@ class InstapaperController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);
@ -76,7 +76,7 @@ class InstapaperController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Instapaper/index.html.twig', [
return $this->render('@WallabagCore/Import/Instapaper/index.html.twig', [
'form' => $form->createView(),
'import' => $instapaper,
]);

18
src/Wallabag/ImportBundle/Controller/PinboardController.php → src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -8,9 +8,9 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\PinboardImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\PinboardImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class PinboardController extends AbstractController
{
@ -24,7 +24,7 @@ class PinboardController extends AbstractController
}
/**
* @Route("/pinboard", name="import_pinboard")
* @Route("/import/pinboard", name="import_pinboard")
*/
public function indexAction(Request $request, PinboardImport $pinboard, Config $craueConfig, TranslatorInterface $translator)
{
@ -44,9 +44,9 @@ class PinboardController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'pinboard_' . $this->getUser()->getId() . '.json';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $pinboard
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -65,7 +65,7 @@ class PinboardController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);
@ -76,7 +76,7 @@ class PinboardController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Pinboard/index.html.twig', [
return $this->render('@WallabagCore/Import/Pinboard/index.html.twig', [
'form' => $form->createView(),
'import' => $pinboard,
]);

14
src/Wallabag/ImportBundle/Controller/PocketController.php → src/Wallabag/CoreBundle/Controller/Import/PocketController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -11,8 +11,8 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Import\PocketImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\PocketImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class PocketController extends AbstractController
{
@ -30,7 +30,7 @@ class PocketController extends AbstractController
}
/**
* @Route("/pocket", name="import_pocket")
* @Route("/import/pocket", name="import_pocket")
*/
public function indexAction(PocketImport $pocketImport)
{
@ -43,7 +43,7 @@ class PocketController extends AbstractController
])
->getForm();
return $this->render('@WallabagImport/Pocket/index.html.twig', [
return $this->render('@WallabagCore/Import/Pocket/index.html.twig', [
'import' => $pocket,
'has_consumer_key' => '' === trim($this->getUser()->getConfig()->getPocketConsumerKey()) ? false : true,
'form' => $form->createView(),
@ -51,7 +51,7 @@ class PocketController extends AbstractController
}
/**
* @Route("/pocket/auth", name="import_pocket_auth")
* @Route("/import/pocket/auth", name="import_pocket_auth")
*/
public function authAction(Request $request, PocketImport $pocketImport)
{
@ -81,7 +81,7 @@ class PocketController extends AbstractController
}
/**
* @Route("/pocket/callback", name="import_pocket_callback")
* @Route("/import/pocket/callback", name="import_pocket_callback")
*/
public function callbackAction(PocketImport $pocketImport, TranslatorInterface $translator)
{

10
src/Wallabag/ImportBundle/Controller/PocketHtmlController.php → src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\PocketHtmlImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\PocketHtmlImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class PocketHtmlController extends HtmlController
{
@ -26,7 +26,7 @@ class PocketHtmlController extends HtmlController
}
/**
* @Route("/pocket_html", name="import_pocket_html")
* @Route("/import/pocket_html", name="import_pocket_html")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class PocketHtmlController extends HtmlController
protected function getImportTemplate()
{
return '@WallabagImport/PocketHtml/index.html.twig';
return '@WallabagCore/Import/PocketHtml/index.html.twig';
}
}

18
src/Wallabag/ImportBundle/Controller/ReadabilityController.php → src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@ -8,9 +8,9 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ReadabilityImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\ReadabilityImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class ReadabilityController extends AbstractController
{
@ -24,7 +24,7 @@ class ReadabilityController extends AbstractController
}
/**
* @Route("/readability", name="import_readability")
* @Route("/import/readability", name="import_readability")
*/
public function indexAction(Request $request, ReadabilityImport $readability, Config $craueConfig, TranslatorInterface $translator)
{
@ -44,9 +44,9 @@ class ReadabilityController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = 'readability_' . $this->getUser()->getId() . '.json';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $readability
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -65,7 +65,7 @@ class ReadabilityController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);
@ -76,7 +76,7 @@ class ReadabilityController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file');
}
return $this->render('@WallabagImport/Readability/index.html.twig', [
return $this->render('@WallabagCore/Import/Readability/index.html.twig', [
'form' => $form->createView(),
'import' => $readability,
]);

10
src/Wallabag/ImportBundle/Controller/ShaarliController.php → src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\ShaarliImport;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\ShaarliImport;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class ShaarliController extends HtmlController
{
@ -26,7 +26,7 @@ class ShaarliController extends HtmlController
}
/**
* @Route("/shaarli", name="import_shaarli")
* @Route("/import/shaarli", name="import_shaarli")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class ShaarliController extends HtmlController
protected function getImportTemplate()
{
return '@WallabagImport/Shaarli/index.html.twig';
return '@WallabagCore/Import/Shaarli/index.html.twig';
}
}

12
src/Wallabag/ImportBundle/Controller/WallabagController.php → src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ImportInterface;
use Wallabag\CoreBundle\Form\Type\UploadImportType;
use Wallabag\CoreBundle\Import\ImportInterface;
/**
* Define Wallabag import for v1 and v2, since there are very similar.
@ -33,9 +33,9 @@ abstract class WallabagController extends AbstractController
$markAsRead = $form->get('mark_as_read')->getData();
$name = $this->getUser()->getId() . '.json';
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
$res = $wallabag
->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
->setMarkAsRead($markAsRead)
->import();
@ -54,7 +54,7 @@ abstract class WallabagController extends AbstractController
]);
}
unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
}
$this->addFlash('notice', $message);

10
src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php → src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\WallabagV1Import;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\WallabagV1Import;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class WallabagV1Controller extends WallabagController
{
@ -26,7 +26,7 @@ class WallabagV1Controller extends WallabagController
}
/**
* @Route("/wallabag-v1", name="import_wallabag_v1")
* @Route("/import/wallabag-v1", name="import_wallabag_v1")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class WallabagV1Controller extends WallabagController
protected function getImportTemplate()
{
return '@WallabagImport/WallabagV1/index.html.twig';
return '@WallabagCore/Import/WallabagV1/index.html.twig';
}
}

10
src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php → src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php
View file

@ -1,14 +1,14 @@
<?php
namespace Wallabag\ImportBundle\Controller;
namespace Wallabag\CoreBundle\Controller\Import;
use Craue\ConfigBundle\Util\Config;
use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\ImportBundle\Import\WallabagV2Import;
use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
use Wallabag\CoreBundle\Import\WallabagV2Import;
use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
class WallabagV2Controller extends WallabagController
{
@ -26,7 +26,7 @@ class WallabagV2Controller extends WallabagController
}
/**
* @Route("/wallabag-v2", name="import_wallabag_v2")
* @Route("/import/wallabag-v2", name="import_wallabag_v2")
*/
public function indexAction(Request $request, TranslatorInterface $translator)
{
@ -46,6 +46,6 @@ class WallabagV2Controller extends WallabagController
protected function getImportTemplate()
{
return '@WallabagImport/WallabagV2/index.html.twig';
return '@WallabagCore/Import/WallabagV2/index.html.twig';
}
}

2
src/Wallabag/CoreBundle/Controller/SiteCredentialController.php
View file

@ -12,10 +12,10 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\SiteCredential;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Form\Type\SiteCredentialType;
use Wallabag\CoreBundle\Helper\CryptoProxy;
use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
use Wallabag\UserBundle\Entity\User;
/**
* SiteCredential controller.

29
src/Wallabag/UserBundle/Controller/ManageController.php → src/Wallabag/CoreBundle/Controller/UserController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Controller;
namespace Wallabag\CoreBundle\Controller;
use Doctrine\ORM\EntityManagerInterface;
use FOS\UserBundle\Event\UserEvent;
@ -17,17 +17,16 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\NewUserType;
use Wallabag\UserBundle\Form\SearchUserType;
use Wallabag\UserBundle\Form\UserType;
use Wallabag\UserBundle\Repository\UserRepository;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Form\Type\NewUserType;
use Wallabag\CoreBundle\Form\Type\SearchUserType;
use Wallabag\CoreBundle\Form\Type\UserType;
use Wallabag\CoreBundle\Repository\UserRepository;
/**
* User controller.
*/
class ManageController extends AbstractController
class UserController extends AbstractController
{
private EntityManagerInterface $entityManager;
private TranslatorInterface $translator;
@ -41,7 +40,7 @@ class ManageController extends AbstractController
/**
* Creates a new User entity.
*
* @Route("/new", name="user_new", methods={"GET", "POST"})
* @Route("/users/new", name="user_new", methods={"GET", "POST"})
*/
public function newAction(Request $request, UserManagerInterface $userManager, EventDispatcherInterface $eventDispatcher)
{
@ -68,7 +67,7 @@ class ManageController extends AbstractController
return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
}
return $this->render('@WallabagUser/Manage/new.html.twig', [
return $this->render('@WallabagCore/User/new.html.twig', [
'user' => $user,
'form' => $form->createView(),
]);
@ -77,7 +76,7 @@ class ManageController extends AbstractController
/**
* Displays a form to edit an existing User entity.
*
* @Route("/{id}/edit", name="user_edit", methods={"GET", "POST"})
* @Route("/users/{id}/edit", name="user_edit", methods={"GET", "POST"})
*/
public function editAction(Request $request, User $user, UserManagerInterface $userManager, GoogleAuthenticatorInterface $googleAuthenticator)
{
@ -109,7 +108,7 @@ class ManageController extends AbstractController
return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
}
return $this->render('@WallabagUser/Manage/edit.html.twig', [
return $this->render('@WallabagCore/User/edit.html.twig', [
'user' => $user,
'edit_form' => $form->createView(),
'delete_form' => $deleteForm->createView(),
@ -119,7 +118,7 @@ class ManageController extends AbstractController
/**
* Deletes a User entity.
*
* @Route("/{id}", name="user_delete", methods={"DELETE"})
* @Route("/users/{id}", name="user_delete", methods={"DELETE"})
*/
public function deleteAction(Request $request, User $user)
{
@ -142,7 +141,7 @@ class ManageController extends AbstractController
/**
* @param int $page
*
* @Route("/list/{page}", name="user_index", defaults={"page" = 1})
* @Route("/users/list/{page}", name="user_index", defaults={"page" = 1})
*
* Default parameter for page is hardcoded (in duplication of the defaults from the Route)
* because this controller is also called inside the layout template without any page as argument
@ -174,7 +173,7 @@ class ManageController extends AbstractController
}
}
return $this->render('@WallabagUser/Manage/index.html.twig', [
return $this->render('@WallabagCore/User/index.html.twig', [
'searchForm' => $form->createView(),
'users' => $pagerFanta,
]);

8
src/Wallabag/AnnotationBundle/DataFixtures/AnnotationFixtures.php → src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php
View file

@ -1,15 +1,13 @@
<?php
namespace Wallabag\AnnotationBundle\DataFixtures;
namespace Wallabag\CoreBundle\DataFixtures;
use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\Persistence\ObjectManager;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\CoreBundle\DataFixtures\EntryFixtures;
use Wallabag\CoreBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\DataFixtures\UserFixtures;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class AnnotationFixtures extends Fixture implements DependentFixtureInterface
{

3
src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php
View file

@ -6,8 +6,7 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\Persistence\ObjectManager;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\UserBundle\DataFixtures\UserFixtures;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class ConfigFixtures extends Fixture implements DependentFixtureInterface
{

3
src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
View file

@ -7,8 +7,7 @@ use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\Persistence\ObjectManager;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\UserBundle\DataFixtures\UserFixtures;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class EntryFixtures extends Fixture implements DependentFixtureInterface
{

3
src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php
View file

@ -6,8 +6,7 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\Persistence\ObjectManager;
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
use Wallabag\UserBundle\DataFixtures\UserFixtures;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureInterface
{

3
src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php
View file

@ -8,9 +8,8 @@ use Doctrine\Persistence\ObjectManager;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Wallabag\CoreBundle\Entity\SiteCredential;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Helper\CryptoProxy;
use Wallabag\UserBundle\DataFixtures\UserFixtures;
use Wallabag\UserBundle\Entity\User;
class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface, ContainerAwareInterface
{

4
src/Wallabag/UserBundle/DataFixtures/UserFixtures.php → src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php
View file

@ -1,10 +1,10 @@
<?php
namespace Wallabag\UserBundle\DataFixtures;
namespace Wallabag\CoreBundle\DataFixtures;
use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Persistence\ObjectManager;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class UserFixtures extends Fixture
{

5
src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
View file

@ -75,6 +75,11 @@ class Configuration implements ConfigurationInterface
->arrayNode('fonts')
->prototype('scalar')->end()
->end()
->arrayNode('allow_mimetypes')
->prototype('scalar')->end()
->end()
->scalarNode('resource_dir')
->end()
->end()
;

2
src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
View file

@ -30,6 +30,8 @@ class WallabagCoreExtension extends Extension
$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']);
$container->setParameter('wallabag_core.fonts', $config['fonts']);
$container->setParameter('wallabag_core.allow_mimetypes', $config['allow_mimetypes']);
$container->setParameter('wallabag_core.resource_dir', $config['resource_dir']);
}
public function getAlias()

8
src/Wallabag/AnnotationBundle/Entity/Annotation.php → src/Wallabag/CoreBundle/Entity/Annotation.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\AnnotationBundle\Entity;
namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation\Exclude;
@ -9,15 +9,13 @@ use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\SerializedName;
use JMS\Serializer\Annotation\VirtualProperty;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\UserBundle\Entity\User;
/**
* Annotation.
*
* @ORM\Table(name="annotation")
* @ORM\Entity(repositoryClass="Wallabag\AnnotationBundle\Repository\AnnotationRepository")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\AnnotationRepository")
* @ORM\HasLifecycleCallbacks()
* @ExclusionPolicy("none")
*/
@ -82,7 +80,7 @@ class Annotation
/**
* @Exclude
*
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
*/
private $user;

6
src/Wallabag/ApiBundle/Entity/AccessToken.php → src/Wallabag/CoreBundle/Entity/Api/AccessToken.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Entity;
namespace Wallabag\CoreBundle\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
@ -35,13 +35,13 @@ class AccessToken extends BaseAccessToken
protected $id;
/**
* @ORM\ManyToOne(targetEntity="Client", inversedBy="accessTokens")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", inversedBy="accessTokens")
* @ORM\JoinColumn(nullable=false)
*/
protected $client;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $user;

2
src/Wallabag/ApiBundle/Entity/ApplicationInfo.php → src/Wallabag/CoreBundle/Entity/Api/ApplicationInfo.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Entity;
namespace Wallabag\CoreBundle\Entity\Api;
use OpenApi\Annotations as OA;

6
src/Wallabag/ApiBundle/Entity/AuthCode.php → src/Wallabag/CoreBundle/Entity/Api/AuthCode.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Entity;
namespace Wallabag\CoreBundle\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
@ -35,13 +35,13 @@ class AuthCode extends BaseAuthCode
protected $id;
/**
* @ORM\ManyToOne(targetEntity="Client")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client")
* @ORM\JoinColumn(nullable=false)
*/
protected $client;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $user;

12
src/Wallabag/ApiBundle/Entity/Client.php → src/Wallabag/CoreBundle/Entity/Api/Client.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Entity;
namespace Wallabag\CoreBundle\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\Client as BaseClient;
@ -8,11 +8,11 @@ use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\SerializedName;
use JMS\Serializer\Annotation\VirtualProperty;
use OpenApi\Annotations as OA;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
/**
* @ORM\Table("oauth2_clients")
* @ORM\Entity(repositoryClass="Wallabag\ApiBundle\Repository\ClientRepository")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\Api\ClientRepository")
*/
class Client extends BaseClient
{
@ -39,12 +39,12 @@ class Client extends BaseClient
protected $name;
/**
* @ORM\OneToMany(targetEntity="RefreshToken", mappedBy="client", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\RefreshToken", mappedBy="client", cascade={"remove"})
*/
protected $refreshTokens;
/**
* @ORM\OneToMany(targetEntity="AccessToken", mappedBy="client", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\AccessToken", mappedBy="client", cascade={"remove"})
*/
protected $accessTokens;
@ -63,7 +63,7 @@ class Client extends BaseClient
protected $secret;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="clients")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="clients")
*/
private $user;

6
src/Wallabag/ApiBundle/Entity/RefreshToken.php → src/Wallabag/CoreBundle/Entity/Api/RefreshToken.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Entity;
namespace Wallabag\CoreBundle\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
@ -35,13 +35,13 @@ class RefreshToken extends BaseRefreshToken
protected $id;
/**
* @ORM\ManyToOne(targetEntity="Client", inversedBy="refreshTokens")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", inversedBy="refreshTokens")
* @ORM\JoinColumn(nullable=false)
*/
protected $client;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $user;

3
src/Wallabag/CoreBundle/Entity/Config.php
View file

@ -6,7 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation\Groups;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\UserBundle\Entity\User;
/**
* Config.
@ -170,7 +169,7 @@ class Config
private $customCSS;
/**
* @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config")
* @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="config")
*/
private $user;

8
src/Wallabag/CoreBundle/Entity/Entry.php
View file

@ -11,10 +11,8 @@ use JMS\Serializer\Annotation\SerializedName;
use JMS\Serializer\Annotation\VirtualProperty;
use JMS\Serializer\Annotation\XmlRoot;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\CoreBundle\Helper\UrlHasher;
use Wallabag\UserBundle\Entity\User;
/**
* Entry.
@ -206,7 +204,7 @@ class Entry
private $starredAt;
/**
* @ORM\OneToMany(targetEntity="Wallabag\AnnotationBundle\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
* @ORM\JoinTable
*
* @Groups({"entries_for_user", "export_all"})
@ -290,14 +288,14 @@ class Entry
/**
* @Exclude
*
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="entries")
*
* @Groups({"export_all"})
*/
private $user;
/**
* @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist"})
* @ORM\ManyToMany(targetEntity="Wallabag\CoreBundle\Entity\Tag", inversedBy="entries", cascade={"persist"})
* @ORM\JoinTable(
* name="entry_tag",
* joinColumns={

3
src/Wallabag/CoreBundle/Entity/SiteCredential.php
View file

@ -5,7 +5,6 @@ namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\UserBundle\Entity\User;
/**
* SiteCredential.
@ -67,7 +66,7 @@ class SiteCredential
private $updatedAt;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="siteCredentials")
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="siteCredentials")
*/
private $user;

12
src/Wallabag/UserBundle/Entity/User.php → src/Wallabag/CoreBundle/Entity/User.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Entity;
namespace Wallabag\CoreBundle\Entity;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
@ -14,16 +14,14 @@ use Scheb\TwoFactorBundle\Model\BackupCodeInterface;
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface as EmailTwoFactorInterface;
use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface as GoogleTwoFactorInterface;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Wallabag\ApiBundle\Entity\Client;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Api\Client;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
/**
* User.
*
* @XmlRoot("user")
* @ORM\Entity(repositoryClass="Wallabag\UserBundle\Repository\UserRepository")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
* @ORM\Table(name="`user`")
* @ORM\HasLifecycleCallbacks()
*
@ -141,9 +139,9 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
protected $siteCredentials;
/**
* @var ArrayCollection&iterable<\Wallabag\ApiBundle\Entity\Client>
* @var ArrayCollection&iterable<\Wallabag\CoreBundle\Entity\Api\Client>
*
* @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", mappedBy="user", cascade={"remove"})
*/
protected $clients;

2
src/Wallabag/UserBundle/EventListener/AuthenticationFailureListener.php → src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\EventListener;
namespace Wallabag\CoreBundle\Event\Listener;
use Psr\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;

2
src/Wallabag/UserBundle/EventListener/CreateConfigListener.php → src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\EventListener;
namespace Wallabag\CoreBundle\Event\Listener;
use Doctrine\ORM\EntityManagerInterface;
use FOS\UserBundle\Event\UserEvent;

2
src/Wallabag/UserBundle/EventListener/PasswordResettingListener.php → src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\EventListener;
namespace Wallabag\CoreBundle\Event\Listener;
use FOS\UserBundle\Event\FormEvent;
use FOS\UserBundle\FOSUserEvents;

2
src/Wallabag/UserBundle/EventListener/RegistrationListener.php → src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\EventListener;
namespace Wallabag\CoreBundle\Event\Listener;
use FOS\UserBundle\Event\GetResponseUserEvent;
use FOS\UserBundle\FOSUserEvents;

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

@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Event\Listener;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
/**
* Stores the locale of the user in the session after the login.

4
src/Wallabag/ApiBundle/Form/Type/ClientType.php → src/Wallabag/CoreBundle/Form/Type/Api/ClientType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ApiBundle\Form\Type;
namespace Wallabag\CoreBundle\Form\Type\Api;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\CallbackTransformer;
@ -9,7 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\UrlType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\ApiBundle\Entity\Client;
use Wallabag\CoreBundle\Entity\Api\Client;
class ClientType extends AbstractType
{

2
src/Wallabag/AnnotationBundle/Form/EditAnnotationType.php → src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\AnnotationBundle\Form;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;

2
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
View file

@ -15,8 +15,8 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Entity\User;
class EntryFilterType extends AbstractType
{

4
src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php → src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php
View file

@ -1,12 +1,12 @@
<?php
namespace Wallabag\AnnotationBundle\Form;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\AnnotationBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Annotation;
class NewAnnotationType extends AbstractType
{

4
src/Wallabag/UserBundle/Form/NewUserType.php → src/Wallabag/CoreBundle/Form/Type/NewUserType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Form;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
@ -12,7 +12,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\NotBlank;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class NewUserType extends AbstractType
{

2
src/Wallabag/AnnotationBundle/Form/RangeType.php → src/Wallabag/CoreBundle/Form/Type/RangeType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\AnnotationBundle\Form;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;

2
src/Wallabag/UserBundle/Form/SearchUserType.php → src/Wallabag/CoreBundle/Form/Type/SearchUserType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Form;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextType;

2
src/Wallabag/ImportBundle/Form/Type/UploadImportType.php → src/Wallabag/CoreBundle/Form/Type/UploadImportType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Form\Type;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;

2
src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
View file

@ -9,7 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class UserInformationType extends AbstractType
{

4
src/Wallabag/UserBundle/Form/UserType.php → src/Wallabag/CoreBundle/Form/Type/UserType.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Form;
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@ -9,7 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class UserType extends AbstractType
{

2
src/Wallabag/CoreBundle/Helper/EntriesExport.php
View file

@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
/**
* This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.

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

@ -6,7 +6,7 @@ use Pagerfanta\Adapter\AdapterInterface;
use Pagerfanta\Adapter\NullAdapter;
use Pagerfanta\Pagerfanta;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
class PreparePagerForEntries
{

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

@ -6,7 +6,7 @@ use GuzzleHttp\Psr7\Uri;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\User;
/**
* Manage redirections to avoid redirecting to empty routes.

2
src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
View file

@ -8,9 +8,9 @@ use RulerZ\RulerZ;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\TaggingRule;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
use Wallabag\UserBundle\Entity\User;
class RuleBasedTagger
{

4
src/Wallabag/ImportBundle/Import/AbstractImport.php → src/Wallabag/CoreBundle/Import/AbstractImport.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\ImportBundle\Import;
namespace Wallabag\CoreBundle\Import;
use Doctrine\ORM\EntityManagerInterface;
use OldSound\RabbitMqBundle\RabbitMq\ProducerInterface;
@ -8,10 +8,10 @@ use Psr\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\CoreBundle\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Helper\ContentProxy;
use Wallabag\CoreBundle\Helper\TagsAssigner;
use Wallabag\UserBundle\Entity\User;
abstract class AbstractImport implements ImportInterface
{

Some files were not shown because too many files have changed in this diff Show more