From 0b44170e83a6279d327a4e0b1aa4a64531cd6d13 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 19 Feb 2024 01:30:12 +0100 Subject: [PATCH] Remove the CoreBundle namespace --- app/AppKernel.php | 2 +- .../Version20160401000000.php | 2 +- .../Version20160410190541.php | 2 +- .../Version20160812120952.php | 2 +- .../Version20160911214952.php | 2 +- .../Version20160916201049.php | 2 +- .../Version20161001072726.php | 2 +- .../Version20161022134138.php | 2 +- .../Version20161024212538.php | 2 +- .../Version20161031132655.php | 2 +- .../Version20161104073720.php | 2 +- .../Version20161106113822.php | 2 +- .../Version20161117071626.php | 2 +- .../Version20161118134328.php | 2 +- .../Version20161122144743.php | 2 +- .../Version20161122203647.php | 2 +- .../Version20161128084725.php | 2 +- .../Version20161128131503.php | 2 +- .../Version20161214094402.php | 2 +- .../Version20161214094403.php | 2 +- .../Version20170127093841.php | 2 +- .../Version20170327194233.php | 2 +- .../Version20170405182620.php | 2 +- .../Version20170407200919.php | 2 +- .../Version20170420134133.php | 2 +- .../Version20170501115751.php | 2 +- .../Version20170510082609.php | 2 +- .../Version20170511115400.php | 2 +- .../Version20170511211659.php | 2 +- .../Version20170602075214.php | 2 +- .../Version20170606155640.php | 2 +- .../Version20170719231144.php | 2 +- .../Version20170824113337.php | 2 +- .../Version20171008195606.php | 2 +- .../Version20171105202000.php | 2 +- .../Version20171120163128.php | 2 +- .../Version20171125164500.php | 2 +- .../Version20180405182455.php | 2 +- .../Version20181128203230.php | 2 +- .../Version20181202073750.php | 2 +- .../Version20190117131816.php | 2 +- .../Version20190129120000.php | 2 +- .../Version20190401105353.php | 2 +- .../Version20190425115043.php | 2 +- .../Version20190510141130.php | 2 +- .../Version20190511165128.php | 2 +- .../Version20190601125843.php | 2 +- .../Version20190619093534.php | 2 +- .../Version20190708122957.php | 2 +- .../Version20190806130304.php | 2 +- .../Version20190808124957.php | 2 +- .../Version20190826204730.php | 2 +- .../Version20200414120227.php | 2 +- .../Version20200428072628.php | 2 +- .../Version20221123132612.php | 2 +- .../Version20221221092957.php | 2 +- .../Version20230613121354.php | 2 +- .../Version20230728085538.php | 2 +- .../Version20230728091417.php | 2 +- .../Version20230728093912.php | 2 +- .../Version20230729093853.php | 2 +- app/config/config.yml | 22 ++--- app/config/routing.yml | 2 +- app/config/security.yml | 2 +- app/config/services.yml | 98 +++++++++---------- app/config/services_rabbit.yml | 50 +++++----- app/config/services_redis.yml | 72 +++++++------- app/config/services_test.yml | 6 +- composer.json | 4 +- phpstan-baseline.neon | 20 ++-- src/Command/CleanDownloadedImagesCommand.php | 6 +- src/Command/CleanDuplicatesCommand.php | 10 +- src/Command/ExportCommand.php | 8 +- src/Command/GenerateUrlHashesCommand.php | 10 +- src/Command/Import/ImportCommand.php | 28 +++--- src/Command/Import/RedisWorkerCommand.php | 2 +- src/Command/InstallCommand.php | 12 +-- src/Command/ListUserCommand.php | 4 +- src/Command/ReloadEntryCommand.php | 10 +- src/Command/ShowUserCommand.php | 6 +- src/Command/TagAllCommand.php | 8 +- src/Command/UpdatePicturesPathCommand.php | 4 +- src/Consumer/AMQPEntryConsumer.php | 2 +- src/Consumer/AbstractConsumer.php | 12 +-- src/Consumer/RabbitMQConsumerTotalProxy.php | 2 +- src/Consumer/RedisEntryConsumer.php | 2 +- src/Controller/AbstractController.php | 4 +- src/Controller/AnnotationController.php | 14 +-- .../Api/AnnotationRestController.php | 14 +-- src/Controller/Api/ConfigRestController.php | 2 +- src/Controller/Api/DeveloperController.php | 10 +- src/Controller/Api/EntryRestController.php | 22 ++--- src/Controller/Api/SearchRestController.php | 4 +- src/Controller/Api/TagRestController.php | 10 +- .../Api/TaggingRuleRestController.php | 2 +- src/Controller/Api/UserRestController.php | 8 +- src/Controller/Api/WallabagRestController.php | 6 +- src/Controller/ConfigController.php | 44 ++++----- src/Controller/EntryController.php | 28 +++--- src/Controller/ExportController.php | 8 +- src/Controller/FeedController.php | 20 ++-- .../IgnoreOriginInstanceRuleController.php | 8 +- src/Controller/Import/BrowserController.php | 8 +- src/Controller/Import/ChromeController.php | 6 +- src/Controller/Import/DeliciousController.php | 10 +- src/Controller/Import/ElcuratorController.php | 6 +- src/Controller/Import/FirefoxController.php | 6 +- src/Controller/Import/HtmlController.php | 8 +- src/Controller/Import/ImportController.php | 8 +- .../Import/InstapaperController.php | 10 +- src/Controller/Import/PinboardController.php | 10 +- src/Controller/Import/PocketController.php | 8 +- .../Import/PocketHtmlController.php | 6 +- .../Import/ReadabilityController.php | 10 +- src/Controller/Import/ShaarliController.php | 6 +- src/Controller/Import/WallabagController.php | 8 +- .../Import/WallabagV1Controller.php | 6 +- .../Import/WallabagV2Controller.php | 6 +- src/Controller/SiteCredentialController.php | 12 +-- src/Controller/StaticController.php | 2 +- src/Controller/TagController.php | 20 ++-- src/Controller/UserController.php | 12 +-- src/DataFixtures/AnnotationFixtures.php | 8 +- src/DataFixtures/ConfigFixtures.php | 6 +- src/DataFixtures/EntryFixtures.php | 8 +- .../IgnoreOriginInstanceRuleFixtures.php | 4 +- .../IgnoreOriginUserRuleFixtures.php | 6 +- src/DataFixtures/InternalSettingFixtures.php | 4 +- src/DataFixtures/SiteCredentialFixtures.php | 8 +- src/DataFixtures/TagFixtures.php | 4 +- src/DataFixtures/TaggingRuleFixtures.php | 6 +- src/DataFixtures/UserFixtures.php | 4 +- src/Doctrine/JsonArrayType.php | 2 +- src/Doctrine/WallabagMigration.php | 2 +- src/Entity/Annotation.php | 10 +- src/Entity/Api/AccessToken.php | 6 +- src/Entity/Api/ApplicationInfo.php | 2 +- src/Entity/Api/AuthCode.php | 6 +- src/Entity/Api/Client.php | 12 +-- src/Entity/Api/RefreshToken.php | 6 +- src/Entity/Config.php | 10 +- src/Entity/Entry.php | 14 +-- src/Entity/IgnoreOriginInstanceRule.php | 4 +- src/Entity/IgnoreOriginRuleInterface.php | 2 +- src/Entity/IgnoreOriginUserRule.php | 6 +- src/Entity/InternalSetting.php | 2 +- src/Entity/RuleInterface.php | 2 +- src/Entity/SiteCredential.php | 8 +- src/Entity/Tag.php | 4 +- src/Entity/TaggingRule.php | 6 +- src/Entity/User.php | 20 ++-- src/Event/ConfigUpdatedEvent.php | 4 +- src/Event/EntryDeletedEvent.php | 4 +- src/Event/EntrySavedEvent.php | 4 +- .../AuthenticationFailureListener.php | 2 +- src/Event/Listener/CreateConfigListener.php | 4 +- src/Event/Listener/LocaleListener.php | 2 +- .../Listener/PasswordResettingListener.php | 2 +- src/Event/Listener/RegistrationListener.php | 2 +- src/Event/Listener/UserLocaleListener.php | 4 +- .../CustomDoctrineORMSubscriber.php | 2 +- .../Subscriber/DownloadImagesSubscriber.php | 10 +- .../GenerateCustomCSSSubscriber.php | 4 +- .../SQLiteCascadeDeleteSubscriber.php | 4 +- .../Subscriber/TablePrefixSubscriber.php | 2 +- .../AuthenticatorProvider.php | 2 +- .../StringToListTransformer.php | 2 +- src/Form/Type/Api/ClientType.php | 4 +- src/Form/Type/ChangePasswordType.php | 2 +- src/Form/Type/ConfigType.php | 4 +- src/Form/Type/EditAnnotationType.php | 2 +- src/Form/Type/EditEntryType.php | 4 +- src/Form/Type/EntryFilterType.php | 6 +- src/Form/Type/FeedType.php | 4 +- .../Type/IgnoreOriginInstanceRuleType.php | 4 +- src/Form/Type/IgnoreOriginUserRuleType.php | 4 +- src/Form/Type/NewAnnotationType.php | 4 +- src/Form/Type/NewEntryType.php | 4 +- src/Form/Type/NewTagType.php | 4 +- src/Form/Type/NewUserType.php | 4 +- src/Form/Type/RangeType.php | 2 +- src/Form/Type/RenameTagType.php | 4 +- src/Form/Type/SearchEntryType.php | 2 +- src/Form/Type/SearchUserType.php | 2 +- src/Form/Type/SiteCredentialType.php | 4 +- src/Form/Type/TaggingRuleImportType.php | 2 +- src/Form/Type/TaggingRuleType.php | 6 +- src/Form/Type/UploadImportType.php | 2 +- src/Form/Type/UserInformationType.php | 4 +- src/Form/Type/UserType.php | 4 +- src/Guzzle/AuthenticatorSubscriber.php | 8 +- .../FixupMondeDiplomatiqueUriSubscriber.php | 2 +- src/Helper/ContentProxy.php | 6 +- src/Helper/CryptoProxy.php | 2 +- src/Helper/DownloadImages.php | 2 +- src/Helper/EntityTimestampsTrait.php | 2 +- src/Helper/EntriesExport.php | 6 +- src/Helper/FileCookieJar.php | 2 +- src/Helper/HttpClientFactory.php | 2 +- src/Helper/PreparePagerForEntries.php | 4 +- src/Helper/Redirect.php | 6 +- src/Helper/RuleBasedIgnoreOriginProcessor.php | 6 +- src/Helper/RuleBasedTagger.php | 14 +-- src/Helper/TagsAssigner.php | 8 +- src/Helper/UrlHasher.php | 2 +- src/Import/AbstractImport.php | 14 +-- src/Import/BrowserImport.php | 6 +- src/Import/ChromeImport.php | 2 +- src/Import/DeliciousImport.php | 4 +- src/Import/ElcuratorImport.php | 2 +- src/Import/FirefoxImport.php | 2 +- src/Import/HtmlImport.php | 6 +- src/Import/ImportChain.php | 2 +- src/Import/ImportCompilerPass.php | 2 +- src/Import/ImportInterface.php | 2 +- src/Import/InstapaperImport.php | 4 +- src/Import/PinboardImport.php | 4 +- src/Import/PocketHtmlImport.php | 2 +- src/Import/PocketImport.php | 4 +- src/Import/ReadabilityImport.php | 4 +- src/Import/ShaarliImport.php | 2 +- src/Import/WallabagImport.php | 4 +- src/Import/WallabagV1Import.php | 6 +- src/Import/WallabagV2Import.php | 2 +- src/Mailer/AuthCodeMailer.php | 2 +- src/Mailer/UserMailer.php | 2 +- src/Operator/Doctrine/Matches.php | 2 +- src/Operator/Doctrine/NotMatches.php | 2 +- src/Operator/PHP/Matches.php | 2 +- src/Operator/PHP/NotMatches.php | 2 +- src/Operator/PHP/PatternMatches.php | 2 +- .../UsernameFeedTokenConverter.php | 8 +- src/Redis/Producer.php | 2 +- src/Repository/AnnotationRepository.php | 6 +- src/Repository/Api/ClientRepository.php | 4 +- src/Repository/ConfigRepository.php | 4 +- src/Repository/EntryRepository.php | 12 +-- .../IgnoreOriginInstanceRuleRepository.php | 4 +- .../IgnoreOriginUserRuleRepository.php | 4 +- src/Repository/SiteCredentialRepository.php | 6 +- src/Repository/TagRepository.php | 4 +- src/Repository/TaggingRuleRepository.php | 4 +- src/Repository/UserRepository.php | 4 +- src/SiteConfig/ArraySiteConfigBuilder.php | 2 +- .../Authenticator/Authenticator.php | 2 +- src/SiteConfig/Authenticator/Factory.php | 4 +- .../Authenticator/LoginFormAuthenticator.php | 6 +- src/SiteConfig/GrabySiteConfigBuilder.php | 4 +- src/SiteConfig/SiteConfig.php | 2 +- src/SiteConfig/SiteConfigBuilder.php | 2 +- src/Tools/Utils.php | 2 +- src/Twig/WallabagExtension.php | 8 +- templates/Entry/entry.html.twig | 2 +- templates/Import/index.html.twig | 2 +- templates/layout.html.twig | 4 +- tests/Command/CleanDuplicatesCommandTest.php | 10 +- tests/Command/ExportCommandTest.php | 4 +- .../Command/GenerateUrlHashesCommandTest.php | 10 +- tests/Command/Import/ImportCommandTest.php | 4 +- .../Command/Import/RedisWorkerCommandTest.php | 4 +- tests/Command/InstallCommandTest.php | 6 +- tests/Command/ListUserCommandTest.php | 4 +- tests/Command/ReloadEntryCommandTest.php | 6 +- tests/Command/ShowUserCommandTest.php | 6 +- tests/Command/TagAllCommandTest.php | 4 +- .../Command/UpdatePicturesPathCommandTest.php | 8 +- tests/Consumer/AMQPEntryConsumerTest.php | 12 +-- tests/Consumer/RedisEntryConsumerTest.php | 12 +-- tests/Controller/AnnotationControllerTest.php | 10 +- .../Api/ConfigRestControllerTest.php | 2 +- .../Api/DeveloperControllerTest.php | 6 +- .../Api/EntryRestControllerTest.php | 10 +- .../Api/SearchRestControllerTest.php | 2 +- .../Controller/Api/TagRestControllerTest.php | 6 +- .../Api/TaggingRuleRestControllerTest.php | 2 +- .../Controller/Api/UserRestControllerTest.php | 2 +- tests/Controller/Api/WallabagApiTestCase.php | 4 +- .../Api/WallabagRestControllerTest.php | 2 +- tests/Controller/ConfigControllerTest.php | 18 ++-- tests/Controller/EntryControllerTest.php | 20 ++-- tests/Controller/ExportControllerTest.php | 6 +- tests/Controller/FeedControllerTest.php | 8 +- ...IgnoreOriginInstanceRuleControllerTest.php | 4 +- .../Import/ChromeControllerTest.php | 6 +- .../Import/DeliciousControllerTest.php | 6 +- .../Import/ElcuratorControllerTest.php | 6 +- .../Import/FirefoxControllerTest.php | 6 +- .../Import/ImportControllerTest.php | 4 +- .../Import/InstapaperControllerTest.php | 6 +- .../Import/PinboardControllerTest.php | 6 +- .../Import/PocketControllerTest.php | 6 +- .../Import/PocketHtmlControllerTest.php | 6 +- .../Import/ReadabilityControllerTest.php | 6 +- .../Import/ShaarliControllerTest.php | 6 +- .../Import/WallabagV1ControllerTest.php | 6 +- .../Import/WallabagV2ControllerTest.php | 6 +- tests/Controller/SecurityControllerTest.php | 6 +- tests/Controller/SettingsControllerTest.php | 4 +- .../SiteCredentialControllerTest.php | 6 +- tests/Controller/StaticControllerTest.php | 4 +- tests/Controller/TagControllerTest.php | 10 +- tests/Controller/UserControllerTest.php | 4 +- tests/Entity/EntryTest.php | 6 +- .../AuthenticationFailureListenerTest.php | 4 +- .../Listener/CreateConfigListenerTest.php | 8 +- tests/Event/Listener/LocaleListenerTest.php | 4 +- .../Event/Listener/UserLocaleListenerTest.php | 8 +- .../Subscriber/TablePrefixSubscriberTest.php | 8 +- .../StringToListTransformerTest.php | 4 +- tests/Guzzle/AuthenticatorSubscriberTest.php | 10 +- ...ixupMondeDiplomatiqueUriSubscriberTest.php | 4 +- tests/Helper/ContentProxyTest.php | 12 +-- tests/Helper/CryptoProxyTest.php | 4 +- tests/Helper/DownloadImagesTest.php | 4 +- tests/Helper/RedirectTest.php | 8 +- .../RuleBasedIgnoreOriginProcessorTest.php | 16 +-- tests/Helper/RuleBasedTaggerTest.php | 18 ++-- tests/Helper/TagsAssignerTest.php | 12 +-- tests/Import/ChromeImportTest.php | 16 +-- tests/Import/FirefoxImportTest.php | 16 +-- tests/Import/ImportChainTest.php | 6 +- tests/Import/ImportCompilerPassTest.php | 6 +- tests/Import/InstapaperImportTest.php | 16 +-- tests/Import/PocketHtmlImportTest.php | 16 +-- tests/Import/PocketImportTest.php | 18 ++-- tests/Import/ReadabilityImportTest.php | 16 +-- tests/Import/ShaarliImportTest.php | 16 +-- tests/Import/WallabagV1ImportTest.php | 16 +-- tests/Import/WallabagV2ImportTest.php | 16 +-- tests/Mailer/AuthCodeMailerTest.php | 6 +- .../UsernameFeedTokenConverterTest.php | 8 +- .../SiteConfig/ArraySiteConfigBuilderTest.php | 6 +- .../LoginFormAuthenticatorTest.php | 6 +- .../SiteConfig/GrabySiteConfigBuilderTest.php | 10 +- tests/SiteConfig/SiteConfigTest.php | 4 +- tests/Tools/UtilsTest.php | 4 +- tests/Twig/WallabagExtensionTest.php | 8 +- tests/WallabagCoreTestCase.php | 4 +- 338 files changed, 1061 insertions(+), 1061 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index ede8fec03..fa624eb9a 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -3,7 +3,7 @@ use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel; -use Wallabag\CoreBundle\Import\ImportCompilerPass; +use Wallabag\Import\ImportCompilerPass; class AppKernel extends Kernel { diff --git a/app/DoctrineMigrations/Version20160401000000.php b/app/DoctrineMigrations/Version20160401000000.php index c4b803104..ac9b52f0c 100644 --- a/app/DoctrineMigrations/Version20160401000000.php +++ b/app/DoctrineMigrations/Version20160401000000.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Initial database structure. diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index c00087875..e6374ae5f 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added foreign keys for account resetting. diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php index 9058679ab..c5cd03f63 100644 --- a/app/DoctrineMigrations/Version20160812120952.php +++ b/app/DoctrineMigrations/Version20160812120952.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added name field on wallabag_oauth2_clients. diff --git a/app/DoctrineMigrations/Version20160911214952.php b/app/DoctrineMigrations/Version20160911214952.php index 223cd45a0..2029a2445 100644 --- a/app/DoctrineMigrations/Version20160911214952.php +++ b/app/DoctrineMigrations/Version20160911214952.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added settings for RabbitMQ and Redis imports. diff --git a/app/DoctrineMigrations/Version20160916201049.php b/app/DoctrineMigrations/Version20160916201049.php index d1f93ebfa..bb7202fd6 100644 --- a/app/DoctrineMigrations/Version20160916201049.php +++ b/app/DoctrineMigrations/Version20160916201049.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added pocket_consumer_key field on wallabag_config. diff --git a/app/DoctrineMigrations/Version20161001072726.php b/app/DoctrineMigrations/Version20161001072726.php index bb15a420c..b8870fbc0 100644 --- a/app/DoctrineMigrations/Version20161001072726.php +++ b/app/DoctrineMigrations/Version20161001072726.php @@ -7,7 +7,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added pocket_consumer_key field on wallabag_config. diff --git a/app/DoctrineMigrations/Version20161022134138.php b/app/DoctrineMigrations/Version20161022134138.php index ee494b334..94b31cab5 100644 --- a/app/DoctrineMigrations/Version20161022134138.php +++ b/app/DoctrineMigrations/Version20161022134138.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Converted database to utf8mb4 encoding (for MySQL only). diff --git a/app/DoctrineMigrations/Version20161024212538.php b/app/DoctrineMigrations/Version20161024212538.php index a45e3224b..e29a498af 100644 --- a/app/DoctrineMigrations/Version20161024212538.php +++ b/app/DoctrineMigrations/Version20161024212538.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added user_id column on oauth2_clients to prevent users to delete API clients from other users. diff --git a/app/DoctrineMigrations/Version20161031132655.php b/app/DoctrineMigrations/Version20161031132655.php index ba95d1002..e5a3567ab 100644 --- a/app/DoctrineMigrations/Version20161031132655.php +++ b/app/DoctrineMigrations/Version20161031132655.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added the internal setting to enable/disable downloading pictures. diff --git a/app/DoctrineMigrations/Version20161104073720.php b/app/DoctrineMigrations/Version20161104073720.php index 375f7bc5c..763a77f9b 100644 --- a/app/DoctrineMigrations/Version20161104073720.php +++ b/app/DoctrineMigrations/Version20161104073720.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added created_at index on entry table. diff --git a/app/DoctrineMigrations/Version20161106113822.php b/app/DoctrineMigrations/Version20161106113822.php index cc1e5e718..0a06b44c3 100644 --- a/app/DoctrineMigrations/Version20161106113822.php +++ b/app/DoctrineMigrations/Version20161106113822.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added action_mark_as_read field on config table. diff --git a/app/DoctrineMigrations/Version20161117071626.php b/app/DoctrineMigrations/Version20161117071626.php index e832f6675..954fd4aa5 100644 --- a/app/DoctrineMigrations/Version20161117071626.php +++ b/app/DoctrineMigrations/Version20161117071626.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added the internal setting to share articles to unmark.it. diff --git a/app/DoctrineMigrations/Version20161118134328.php b/app/DoctrineMigrations/Version20161118134328.php index ab3e0068a..92ce4fbd6 100644 --- a/app/DoctrineMigrations/Version20161118134328.php +++ b/app/DoctrineMigrations/Version20161118134328.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add http_status in `entry_table`. diff --git a/app/DoctrineMigrations/Version20161122144743.php b/app/DoctrineMigrations/Version20161122144743.php index 3e85ac1b5..5082ecf3f 100644 --- a/app/DoctrineMigrations/Version20161122144743.php +++ b/app/DoctrineMigrations/Version20161122144743.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add the restricted_access internal setting for articles with paywall. diff --git a/app/DoctrineMigrations/Version20161122203647.php b/app/DoctrineMigrations/Version20161122203647.php index c3a2f5433..6161f359b 100644 --- a/app/DoctrineMigrations/Version20161122203647.php +++ b/app/DoctrineMigrations/Version20161122203647.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Methods and properties removed from `FOS\UserBundle\Model\User`. diff --git a/app/DoctrineMigrations/Version20161128084725.php b/app/DoctrineMigrations/Version20161128084725.php index 7eb6e60a6..3d42c5a13 100644 --- a/app/DoctrineMigrations/Version20161128084725.php +++ b/app/DoctrineMigrations/Version20161128084725.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added list_mode in user config. diff --git a/app/DoctrineMigrations/Version20161128131503.php b/app/DoctrineMigrations/Version20161128131503.php index 29032953a..99a960d8d 100644 --- a/app/DoctrineMigrations/Version20161128131503.php +++ b/app/DoctrineMigrations/Version20161128131503.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Removed locked, credentials_expire_at and expires_at. diff --git a/app/DoctrineMigrations/Version20161214094402.php b/app/DoctrineMigrations/Version20161214094402.php index 71bc06c69..90e5b13ca 100644 --- a/app/DoctrineMigrations/Version20161214094402.php +++ b/app/DoctrineMigrations/Version20161214094402.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Renamed uuid to uid in entry table. diff --git a/app/DoctrineMigrations/Version20161214094403.php b/app/DoctrineMigrations/Version20161214094403.php index 84ad4b815..9606340e4 100644 --- a/app/DoctrineMigrations/Version20161214094403.php +++ b/app/DoctrineMigrations/Version20161214094403.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added index on wallabag_entry.uid. diff --git a/app/DoctrineMigrations/Version20170127093841.php b/app/DoctrineMigrations/Version20170127093841.php index b4e887f21..b41ca1141 100644 --- a/app/DoctrineMigrations/Version20170127093841.php +++ b/app/DoctrineMigrations/Version20170127093841.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived. diff --git a/app/DoctrineMigrations/Version20170327194233.php b/app/DoctrineMigrations/Version20170327194233.php index b7ba9382e..a8d39ce9b 100644 --- a/app/DoctrineMigrations/Version20170327194233.php +++ b/app/DoctrineMigrations/Version20170327194233.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add the share_scuttle internal setting. diff --git a/app/DoctrineMigrations/Version20170405182620.php b/app/DoctrineMigrations/Version20170405182620.php index 5b17bf8db..866b49b34 100644 --- a/app/DoctrineMigrations/Version20170405182620.php +++ b/app/DoctrineMigrations/Version20170405182620.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add published_at and published_by in `entry` table. diff --git a/app/DoctrineMigrations/Version20170407200919.php b/app/DoctrineMigrations/Version20170407200919.php index 140bb826a..ae30f6f77 100644 --- a/app/DoctrineMigrations/Version20170407200919.php +++ b/app/DoctrineMigrations/Version20170407200919.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove isPublic in Entry Table. diff --git a/app/DoctrineMigrations/Version20170420134133.php b/app/DoctrineMigrations/Version20170420134133.php index e2b329f4b..de0e59f42 100644 --- a/app/DoctrineMigrations/Version20170420134133.php +++ b/app/DoctrineMigrations/Version20170420134133.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove download_pictures in craue_config_setting. diff --git a/app/DoctrineMigrations/Version20170501115751.php b/app/DoctrineMigrations/Version20170501115751.php index 4e744e1ad..9998dff69 100644 --- a/app/DoctrineMigrations/Version20170501115751.php +++ b/app/DoctrineMigrations/Version20170501115751.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add site credential table to store username & password for some website (behind authentication or paywall). diff --git a/app/DoctrineMigrations/Version20170510082609.php b/app/DoctrineMigrations/Version20170510082609.php index aa09ff9f6..f9e1b4f3c 100644 --- a/app/DoctrineMigrations/Version20170510082609.php +++ b/app/DoctrineMigrations/Version20170510082609.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table. diff --git a/app/DoctrineMigrations/Version20170511115400.php b/app/DoctrineMigrations/Version20170511115400.php index 33f262d13..2e5af8d93 100644 --- a/app/DoctrineMigrations/Version20170511115400.php +++ b/app/DoctrineMigrations/Version20170511115400.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added `headers` field in entry table. diff --git a/app/DoctrineMigrations/Version20170511211659.php b/app/DoctrineMigrations/Version20170511211659.php index 18c3c7691..8c93bc96e 100644 --- a/app/DoctrineMigrations/Version20170511211659.php +++ b/app/DoctrineMigrations/Version20170511211659.php @@ -7,7 +7,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Increase the length of the "quote" column of "annotation" table. diff --git a/app/DoctrineMigrations/Version20170602075214.php b/app/DoctrineMigrations/Version20170602075214.php index f13651d52..31267efab 100644 --- a/app/DoctrineMigrations/Version20170602075214.php +++ b/app/DoctrineMigrations/Version20170602075214.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add api_user_registration in craue_config_setting. diff --git a/app/DoctrineMigrations/Version20170606155640.php b/app/DoctrineMigrations/Version20170606155640.php index 4e0f2fffd..fb965acf6 100644 --- a/app/DoctrineMigrations/Version20170606155640.php +++ b/app/DoctrineMigrations/Version20170606155640.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove wallabag_url from craue_config_setting. diff --git a/app/DoctrineMigrations/Version20170719231144.php b/app/DoctrineMigrations/Version20170719231144.php index f47cf9b24..dc93ef829 100644 --- a/app/DoctrineMigrations/Version20170719231144.php +++ b/app/DoctrineMigrations/Version20170719231144.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Changed tags to lowercase. diff --git a/app/DoctrineMigrations/Version20170824113337.php b/app/DoctrineMigrations/Version20170824113337.php index 7526752f1..f1b15da31 100644 --- a/app/DoctrineMigrations/Version20170824113337.php +++ b/app/DoctrineMigrations/Version20170824113337.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add starred_at column and set its value to updated_at for is_starred entries. diff --git a/app/DoctrineMigrations/Version20171008195606.php b/app/DoctrineMigrations/Version20171008195606.php index 2d348c877..ceafbe23b 100644 --- a/app/DoctrineMigrations/Version20171008195606.php +++ b/app/DoctrineMigrations/Version20171008195606.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Changed reading_time field to prevent null value. diff --git a/app/DoctrineMigrations/Version20171105202000.php b/app/DoctrineMigrations/Version20171105202000.php index ce5e333cb..84efe7e21 100644 --- a/app/DoctrineMigrations/Version20171105202000.php +++ b/app/DoctrineMigrations/Version20171105202000.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add origin_url column. diff --git a/app/DoctrineMigrations/Version20171120163128.php b/app/DoctrineMigrations/Version20171120163128.php index 96cbe3b42..c3bb7ac95 100644 --- a/app/DoctrineMigrations/Version20171120163128.php +++ b/app/DoctrineMigrations/Version20171120163128.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add store_article_headers in craue_config_setting. diff --git a/app/DoctrineMigrations/Version20171125164500.php b/app/DoctrineMigrations/Version20171125164500.php index cdce4bad0..17b4fb3ce 100644 --- a/app/DoctrineMigrations/Version20171125164500.php +++ b/app/DoctrineMigrations/Version20171125164500.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add shaarli_share_origin_url in craue_config_setting. diff --git a/app/DoctrineMigrations/Version20180405182455.php b/app/DoctrineMigrations/Version20180405182455.php index d9fc4263f..09dcb362f 100755 --- a/app/DoctrineMigrations/Version20180405182455.php +++ b/app/DoctrineMigrations/Version20180405182455.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add archived_at column and set its value to updated_at for is_archived entries. diff --git a/app/DoctrineMigrations/Version20181128203230.php b/app/DoctrineMigrations/Version20181128203230.php index a384ba118..5ae66fb45 100644 --- a/app/DoctrineMigrations/Version20181128203230.php +++ b/app/DoctrineMigrations/Version20181128203230.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Fix varchar field from vendor to work with utf8mb4. diff --git a/app/DoctrineMigrations/Version20181202073750.php b/app/DoctrineMigrations/Version20181202073750.php index dffbed333..9661cb38e 100644 --- a/app/DoctrineMigrations/Version20181202073750.php +++ b/app/DoctrineMigrations/Version20181202073750.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add 2fa OTP stuff. diff --git a/app/DoctrineMigrations/Version20190117131816.php b/app/DoctrineMigrations/Version20190117131816.php index 6548b9fa3..d78ad17d4 100644 --- a/app/DoctrineMigrations/Version20190117131816.php +++ b/app/DoctrineMigrations/Version20190117131816.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add updated_at fields to site_credential table. diff --git a/app/DoctrineMigrations/Version20190129120000.php b/app/DoctrineMigrations/Version20190129120000.php index 38777b3a2..176f41d96 100644 --- a/app/DoctrineMigrations/Version20190129120000.php +++ b/app/DoctrineMigrations/Version20190129120000.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add missing entries in craue_config_setting. diff --git a/app/DoctrineMigrations/Version20190401105353.php b/app/DoctrineMigrations/Version20190401105353.php index cf0805142..06eff734d 100644 --- a/app/DoctrineMigrations/Version20190401105353.php +++ b/app/DoctrineMigrations/Version20190401105353.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add hashed_url in entry. diff --git a/app/DoctrineMigrations/Version20190425115043.php b/app/DoctrineMigrations/Version20190425115043.php index f7ed1e92f..f8b647e29 100644 --- a/app/DoctrineMigrations/Version20190425115043.php +++ b/app/DoctrineMigrations/Version20190425115043.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Rename rss_token & rss_limit to feed_token & feed_limit. diff --git a/app/DoctrineMigrations/Version20190510141130.php b/app/DoctrineMigrations/Version20190510141130.php index cc4e49e8e..9ac23b77a 100644 --- a/app/DoctrineMigrations/Version20190510141130.php +++ b/app/DoctrineMigrations/Version20190510141130.php @@ -7,7 +7,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Enable cascade delete when deleting a user on: diff --git a/app/DoctrineMigrations/Version20190511165128.php b/app/DoctrineMigrations/Version20190511165128.php index 35b76300f..1c44dead4 100644 --- a/app/DoctrineMigrations/Version20190511165128.php +++ b/app/DoctrineMigrations/Version20190511165128.php @@ -6,7 +6,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Convert tab label to utf8mb4_bin (MySQL only). diff --git a/app/DoctrineMigrations/Version20190601125843.php b/app/DoctrineMigrations/Version20190601125843.php index e2cdf9ac4..b20248d28 100644 --- a/app/DoctrineMigrations/Version20190601125843.php +++ b/app/DoctrineMigrations/Version20190601125843.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added `given_url` & `hashed_given_url` field in entry table. diff --git a/app/DoctrineMigrations/Version20190619093534.php b/app/DoctrineMigrations/Version20190619093534.php index ae1ad8a0b..ed9ecf12d 100644 --- a/app/DoctrineMigrations/Version20190619093534.php +++ b/app/DoctrineMigrations/Version20190619093534.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Change reading_time field on SQLite to be integer NOT NULL diff --git a/app/DoctrineMigrations/Version20190708122957.php b/app/DoctrineMigrations/Version20190708122957.php index 9585e997a..4fc7bee0c 100644 --- a/app/DoctrineMigrations/Version20190708122957.php +++ b/app/DoctrineMigrations/Version20190708122957.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Change reading speed value. diff --git a/app/DoctrineMigrations/Version20190806130304.php b/app/DoctrineMigrations/Version20190806130304.php index d569760e5..c4c30880b 100644 --- a/app/DoctrineMigrations/Version20190806130304.php +++ b/app/DoctrineMigrations/Version20190806130304.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Adding more index to kill some slow queries: diff --git a/app/DoctrineMigrations/Version20190808124957.php b/app/DoctrineMigrations/Version20190808124957.php index 92fd0291d..9d7a43d2c 100644 --- a/app/DoctrineMigrations/Version20190808124957.php +++ b/app/DoctrineMigrations/Version20190808124957.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Change the internal setting table name. diff --git a/app/DoctrineMigrations/Version20190826204730.php b/app/DoctrineMigrations/Version20190826204730.php index 94446d5d2..12ff52b58 100644 --- a/app/DoctrineMigrations/Version20190826204730.php +++ b/app/DoctrineMigrations/Version20190826204730.php @@ -6,7 +6,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add tables for the ignore origin rules. diff --git a/app/DoctrineMigrations/Version20200414120227.php b/app/DoctrineMigrations/Version20200414120227.php index a24ce45ee..e84d8d322 100644 --- a/app/DoctrineMigrations/Version20200414120227.php +++ b/app/DoctrineMigrations/Version20200414120227.php @@ -4,7 +4,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Migrations\SkipMigrationException; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove baggy theme. diff --git a/app/DoctrineMigrations/Version20200428072628.php b/app/DoctrineMigrations/Version20200428072628.php index 57fbebc23..4fdc94751 100644 --- a/app/DoctrineMigrations/Version20200428072628.php +++ b/app/DoctrineMigrations/Version20200428072628.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Renamed Piwik to Matomo in configuration. diff --git a/app/DoctrineMigrations/Version20221123132612.php b/app/DoctrineMigrations/Version20221123132612.php index cd7bb375f..a193bf020 100644 --- a/app/DoctrineMigrations/Version20221123132612.php +++ b/app/DoctrineMigrations/Version20221123132612.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Drop theme fields from config table. diff --git a/app/DoctrineMigrations/Version20221221092957.php b/app/DoctrineMigrations/Version20221221092957.php index 37e04d0e5..6ead522e1 100644 --- a/app/DoctrineMigrations/Version20221221092957.php +++ b/app/DoctrineMigrations/Version20221221092957.php @@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove the deprecated (and removed in DBAL v3) `json_array` type. diff --git a/app/DoctrineMigrations/Version20230613121354.php b/app/DoctrineMigrations/Version20230613121354.php index af881f8a9..7140bf6cd 100644 --- a/app/DoctrineMigrations/Version20230613121354.php +++ b/app/DoctrineMigrations/Version20230613121354.php @@ -3,7 +3,7 @@ namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Added a new setting to display or not thumbnails. diff --git a/app/DoctrineMigrations/Version20230728085538.php b/app/DoctrineMigrations/Version20230728085538.php index 0ee97bd58..81bfa938d 100644 --- a/app/DoctrineMigrations/Version20230728085538.php +++ b/app/DoctrineMigrations/Version20230728085538.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove demonstration mode settings. diff --git a/app/DoctrineMigrations/Version20230728091417.php b/app/DoctrineMigrations/Version20230728091417.php index 934a9c030..dcfd4ddba 100644 --- a/app/DoctrineMigrations/Version20230728091417.php +++ b/app/DoctrineMigrations/Version20230728091417.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Remove mobi export. diff --git a/app/DoctrineMigrations/Version20230728093912.php b/app/DoctrineMigrations/Version20230728093912.php index 3319f06d6..fffd22696 100644 --- a/app/DoctrineMigrations/Version20230728093912.php +++ b/app/DoctrineMigrations/Version20230728093912.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add is_not_parsed field to entry table. diff --git a/app/DoctrineMigrations/Version20230729093853.php b/app/DoctrineMigrations/Version20230729093853.php index 1a15e3955..97706b4fa 100644 --- a/app/DoctrineMigrations/Version20230729093853.php +++ b/app/DoctrineMigrations/Version20230729093853.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Application\Migrations; use Doctrine\DBAL\Schema\Schema; -use Wallabag\CoreBundle\Doctrine\WallabagMigration; +use Wallabag\Doctrine\WallabagMigration; /** * Add custom_css column to config table. diff --git a/app/config/config.yml b/app/config/config.yml index 3db473e98..b781565b4 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -61,7 +61,7 @@ doctrine: dbal: url: '%env(resolve:DATABASE_URL)%' types: - json_array: Wallabag\CoreBundle\Doctrine\JsonArrayType + json_array: Wallabag\Doctrine\JsonArrayType orm: auto_generate_proxy_classes: "%kernel.debug%" @@ -73,7 +73,7 @@ doctrine: type: annotation is_bundle: false dir: '%kernel.project_dir%/src/Entity' - prefix: 'Wallabag\CoreBundle\Entity' + prefix: 'Wallabag\Entity' alias: Wallabag stof_doctrine_extensions: @@ -177,7 +177,7 @@ nelmio_cors: fos_user: db_driver: orm firewall_name: secured_area - user_class: Wallabag\CoreBundle\Entity\User + user_class: Wallabag\Entity\User registration: confirmation: enabled: "%fosuser_confirmation%" @@ -185,14 +185,14 @@ fos_user: address: "%from_email%" sender_name: wallabag service: - mailer: Wallabag\CoreBundle\Mailer\UserMailer + mailer: Wallabag\Mailer\UserMailer fos_oauth_server: db_driver: orm - 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 + client_class: Wallabag\Entity\Api\Client + access_token_class: Wallabag\Entity\Api\AccessToken + refresh_token_class: Wallabag\Entity\Api\RefreshToken + auth_code_class: Wallabag\Entity\Api\AuthCode service: user_provider: fos_user.user_provider.username_email options: @@ -218,7 +218,7 @@ scheb_two_factor: sender_email: "%twofactor_sender%" digits: 6 template: "Authentication/form.html.twig" - mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer + mailer: Wallabag\Mailer\AuthCodeMailer rulerz: targets: @@ -433,7 +433,7 @@ sensio_framework_extra: httplug: clients: wallabag_core: - factory: Wallabag\CoreBundle\Helper\HttpClientFactory + factory: Wallabag\Helper\HttpClientFactory config: defaults: timeout: 10 @@ -443,7 +443,7 @@ httplug: # define custom entity so we can override length attribute to fix utf8mb4 issue craue_config: - entity_name: Wallabag\CoreBundle\Entity\InternalSetting + entity_name: Wallabag\Entity\InternalSetting when@dev: maker: diff --git a/app/config/routing.yml b/app/config/routing.yml index fc5a501b1..ad99f15b8 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -9,7 +9,7 @@ doc-api: homepage: path: "/{page}" defaults: - _controller: 'Wallabag\CoreBundle\Controller\EntryController::showUnreadAction' + _controller: 'Wallabag\Controller\EntryController::showUnreadAction' page : 1 requirements: page: \d+ diff --git a/app/config/security.yml b/app/config/security.yml index 2c7bf8677..474774d41 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -9,7 +9,7 @@ security: providers: administrators: entity: - class: 'Wallabag\CoreBundle\Entity\User' + class: 'Wallabag\Entity\User' property: username fos_userbundle: id: fos_user.user_provider.username_email diff --git a/app/config/services.yml b/app/config/services.yml index b063a1a1f..655fb78e8 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -4,7 +4,7 @@ imports: - { resource: parameters_addons.yml } parameters: - spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber + spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\Event\Subscriber\CustomDoctrineORMSubscriber services: _defaults: @@ -32,73 +32,73 @@ services: $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')' $fonts: '%wallabag_core.fonts%' - Wallabag\CoreBundle\: + Wallabag\: resource: '../../src/*' exclude: ['../../src/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/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\CoreBundle\Controller\: + Wallabag\Controller\: resource: '../../src/Controller/' tags: ['controller.service_arguments'] # inject alias service into controllers - Wallabag\CoreBundle\Controller\Import\ChromeController: + Wallabag\Controller\Import\ChromeController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer' $redisProducer: '@wallabag_core.producer.redis.chrome' - Wallabag\CoreBundle\Controller\Import\DeliciousController: + Wallabag\Controller\Import\DeliciousController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer' $redisProducer: '@wallabag_core.producer.redis.delicious' - Wallabag\CoreBundle\Controller\Import\ElcuratorController: + Wallabag\Controller\Import\ElcuratorController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer' $redisProducer: '@wallabag_core.producer.redis.elcurator' - Wallabag\CoreBundle\Controller\Import\FirefoxController: + Wallabag\Controller\Import\FirefoxController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer' $redisProducer: '@wallabag_core.producer.redis.firefox' - Wallabag\CoreBundle\Controller\Import\InstapaperController: + Wallabag\Controller\Import\InstapaperController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer' $redisProducer: '@wallabag_core.producer.redis.instapaper' - Wallabag\CoreBundle\Controller\Import\PinboardController: + Wallabag\Controller\Import\PinboardController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer' $redisProducer: '@wallabag_core.producer.redis.pinboard' - Wallabag\CoreBundle\Controller\Import\PocketController: + Wallabag\Controller\Import\PocketController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer' $redisProducer: '@wallabag_core.producer.redis.pocket' - Wallabag\CoreBundle\Controller\Import\ReadabilityController: + Wallabag\Controller\Import\ReadabilityController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer' $redisProducer: '@wallabag_core.producer.redis.readability' - Wallabag\CoreBundle\Controller\Import\WallabagV1Controller: + Wallabag\Controller\Import\WallabagV1Controller: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer' $redisProducer: '@wallabag_core.producer.redis.wallabag_v1' - Wallabag\CoreBundle\Controller\Import\WallabagV2Controller: + Wallabag\Controller\Import\WallabagV2Controller: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer' $redisProducer: '@wallabag_core.producer.redis.wallabag_v2' - Wallabag\CoreBundle\Controller\Import\ShaarliController: + Wallabag\Controller\Import\ShaarliController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer' $redisProducer: '@wallabag_core.producer.redis.shaarli' - Wallabag\CoreBundle\Controller\Import\PocketHtmlController: + Wallabag\Controller\Import\PocketHtmlController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer' $redisProducer: '@wallabag_core.producer.redis.pocket_html' @@ -154,7 +154,7 @@ services: ScssPhp\ScssPhp\Compiler: public: false - Wallabag\CoreBundle\Event\Listener\UserLocaleListener: + Wallabag\Event\Listener\UserLocaleListener: tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } @@ -166,11 +166,11 @@ services: $defaultLifetime: 0 $directory: '%kernel.cache_dir%' - Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter: + Wallabag\ParamConverter\UsernameFeedTokenConverter: tags: - { name: request.param_converter, converter: username_feed_token_converter } - Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber: + Wallabag\Event\Subscriber\TablePrefixSubscriber: tags: - { name: doctrine.event_subscriber } @@ -191,42 +191,42 @@ services: wallabag_core.http_client: alias: 'httplug.client.wallabag_core' - Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder: + Wallabag\SiteConfig\GrabySiteConfigBuilder: tags: - { name: monolog.logger, channel: graby } # service alias override - Wallabag\CoreBundle\SiteConfig\SiteConfigBuilder: - alias: Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder + Wallabag\SiteConfig\SiteConfigBuilder: + alias: Wallabag\SiteConfig\GrabySiteConfigBuilder GuzzleHttp\Cookie\CookieJar: - alias: 'Wallabag\CoreBundle\Helper\FileCookieJar' + alias: 'Wallabag\Helper\FileCookieJar' - Wallabag\CoreBundle\Helper\HttpClientFactory: + Wallabag\Helper\HttpClientFactory: calls: - - ['addSubscriber', ['@Wallabag\CoreBundle\Guzzle\AuthenticatorSubscriber']] - - ['addSubscriber', ['@Wallabag\CoreBundle\Guzzle\FixupMondeDiplomatiqueUriSubscriber']] + - ['addSubscriber', ['@Wallabag\Guzzle\AuthenticatorSubscriber']] + - ['addSubscriber', ['@Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber']] RulerZ\RulerZ: alias: rulerz - Wallabag\CoreBundle\Operator\PHP\Matches: + Wallabag\Operator\PHP\Matches: tags: - { name: rulerz.operator, target: native, operator: matches } - Wallabag\CoreBundle\Operator\Doctrine\Matches: + Wallabag\Operator\Doctrine\Matches: tags: - { name: rulerz.operator, target: doctrine, operator: matches, inline: true } - Wallabag\CoreBundle\Operator\PHP\NotMatches: + Wallabag\Operator\PHP\NotMatches: tags: - { name: rulerz.operator, target: native, operator: notmatches } - Wallabag\CoreBundle\Operator\Doctrine\NotMatches: + Wallabag\Operator\Doctrine\NotMatches: tags: - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } - Wallabag\CoreBundle\Operator\PHP\PatternMatches: + Wallabag\Operator\PHP\PatternMatches: tags: - { name: rulerz.operator, target: native, operator: "~" } @@ -239,26 +239,26 @@ services: path: '%redis_path%' password: '%redis_password%' - Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber: + Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber: tags: - { name: doctrine.event_subscriber } - Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber: + Wallabag\Event\Subscriber\DownloadImagesSubscriber: arguments: $enabled: '@=service(''craue_config'').get(''download_images_enabled'')' - Wallabag\CoreBundle\Helper\DownloadImages: + Wallabag\Helper\DownloadImages: arguments: $baseFolder: "%kernel.project_dir%/web/assets/images" - Wallabag\CoreBundle\Command\InstallCommand: + Wallabag\Command\InstallCommand: arguments: $databaseDriver: '%database_driver%' $databaseName: '%database_name%' $defaultSettings: '%wallabag_core.default_internal_settings%' $defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%' - Wallabag\CoreBundle\Mailer\UserMailer: + Wallabag\Mailer\UserMailer: arguments: $parameters: template: @@ -268,7 +268,7 @@ services: confirmation: '%fos_user.registration.confirmation.from_email%' resetting: '%fos_user.resetting.email.from_email%' - Wallabag\CoreBundle\Event\Listener\CreateConfigListener: + Wallabag\Event\Listener\CreateConfigListener: arguments: $itemsOnPage: "%wallabag_core.items_on_page%" $feedLimit: "%wallabag_core.feed_limit%" @@ -278,57 +278,57 @@ services: $listMode: "%wallabag_core.list_mode%" $displayThumbnails: "%wallabag_core.display_thumbnails%" - Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener: + Wallabag\Event\Listener\AuthenticationFailureListener: tags: - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure } - Wallabag\CoreBundle\Import\PocketImport: + Wallabag\Import\PocketImport: calls: - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ] tags: - { name: wallabag_core.import, alias: pocket } - Wallabag\CoreBundle\Import\WallabagV1Import: + Wallabag\Import\WallabagV1Import: tags: - { name: wallabag_core.import, alias: wallabag_v1 } - Wallabag\CoreBundle\Import\WallabagV2Import: + Wallabag\Import\WallabagV2Import: tags: - { name: wallabag_core.import, alias: wallabag_v2 } - Wallabag\CoreBundle\Import\ElcuratorImport: + Wallabag\Import\ElcuratorImport: tags: - { name: wallabag_core.import, alias: elcurator } - Wallabag\CoreBundle\Import\ReadabilityImport: + Wallabag\Import\ReadabilityImport: tags: - { name: wallabag_core.import, alias: readability } - Wallabag\CoreBundle\Import\InstapaperImport: + Wallabag\Import\InstapaperImport: tags: - { name: wallabag_core.import, alias: instapaper } - Wallabag\CoreBundle\Import\PinboardImport: + Wallabag\Import\PinboardImport: tags: - { name: wallabag_core.import, alias: pinboard } - Wallabag\CoreBundle\Import\DeliciousImport: + Wallabag\Import\DeliciousImport: tags: - { name: wallabag_core.import, alias: delicious } - Wallabag\CoreBundle\Import\FirefoxImport: + Wallabag\Import\FirefoxImport: tags: - { name: wallabag_core.import, alias: firefox } - Wallabag\CoreBundle\Import\ChromeImport: + Wallabag\Import\ChromeImport: tags: - { name: wallabag_core.import, alias: chrome } - Wallabag\CoreBundle\Import\ShaarliImport: + Wallabag\Import\ShaarliImport: tags: - { name: wallabag_core.import, alias: shaarli } - Wallabag\CoreBundle\Import\PocketHtmlImport: + Wallabag\Import\PocketHtmlImport: tags: - { name: wallabag_core.import, alias: pocket_html } diff --git a/app/config/services_rabbit.yml b/app/config/services_rabbit.yml index 1a475370e..585ed0f6a 100644 --- a/app/config/services_rabbit.yml +++ b/app/config/services_rabbit.yml @@ -5,7 +5,7 @@ services: autoconfigure: true public: true - Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy: + Wallabag\Consumer\RabbitMQConsumerTotalProxy: arguments: $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer' $readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer' @@ -21,61 +21,61 @@ services: $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer' wallabag_core.consumer.amqp.pocket: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\PocketImport' + $import: '@Wallabag\Import\PocketImport' wallabag_core.consumer.amqp.readability: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ReadabilityImport' + $import: '@Wallabag\Import\ReadabilityImport' wallabag_core.consumer.amqp.instapaper: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\InstapaperImport' + $import: '@Wallabag\Import\InstapaperImport' wallabag_core.consumer.amqp.pinboard: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\PinboardImport' + $import: '@Wallabag\Import\PinboardImport' wallabag_core.consumer.amqp.delicious: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\DeliciousImport' + $import: '@Wallabag\Import\DeliciousImport' wallabag_core.consumer.amqp.wallabag_v1: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\WallabagV1Import' + $import: '@Wallabag\Import\WallabagV1Import' wallabag_core.consumer.amqp.wallabag_v2: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\WallabagV2Import' + $import: '@Wallabag\Import\WallabagV2Import' wallabag_core.consumer.amqp.elcurator: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ElcuratorImport' + $import: '@Wallabag\Import\ElcuratorImport' wallabag_core.consumer.amqp.firefox: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\FirefoxImport' + $import: '@Wallabag\Import\FirefoxImport' wallabag_core.consumer.amqp.chrome: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ChromeImport' + $import: '@Wallabag\Import\ChromeImport' wallabag_core.consumer.amqp.shaarli: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ShaarliImport' + $import: '@Wallabag\Import\ShaarliImport' wallabag_core.consumer.amqp.pocket_html: - class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer + class: Wallabag\Consumer\AMQPEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport' + $import: '@Wallabag\Import\PocketHtmlImport' diff --git a/app/config/services_redis.yml b/app/config/services_redis.yml index 3f052b293..86c4f8324 100644 --- a/app/config/services_redis.yml +++ b/app/config/services_redis.yml @@ -12,14 +12,14 @@ services: $queueName: "wallabag.import.readability" wallabag_core.producer.redis.readability: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.readability" wallabag_core.consumer.redis.readability: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ReadabilityImport' + $import: '@Wallabag\Import\ReadabilityImport' # instapaper wallabag_core.queue.redis.instapaper: @@ -28,14 +28,14 @@ services: $queueName: "wallabag.import.instapaper" wallabag_core.producer.redis.instapaper: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.instapaper" wallabag_core.consumer.redis.instapaper: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\InstapaperImport' + $import: '@Wallabag\Import\InstapaperImport' # pinboard wallabag_core.queue.redis.pinboard: @@ -44,14 +44,14 @@ services: $queueName: "wallabag.import.pinboard" wallabag_core.producer.redis.pinboard: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.pinboard" wallabag_core.consumer.redis.pinboard: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\PinboardImport' + $import: '@Wallabag\Import\PinboardImport' # delicious wallabag_core.queue.redis.delicious: @@ -60,14 +60,14 @@ services: $queueName: "wallabag.import.delicious" wallabag_core.producer.redis.delicious: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.delicious" wallabag_core.consumer.redis.delicious: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\DeliciousImport' + $import: '@Wallabag\Import\DeliciousImport' # pocket wallabag_core.queue.redis.pocket: @@ -76,14 +76,14 @@ services: $queueName: "wallabag.import.pocket" wallabag_core.producer.redis.pocket: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.pocket" wallabag_core.consumer.redis.pocket: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\PocketImport' + $import: '@Wallabag\Import\PocketImport' # wallabag v1 wallabag_core.queue.redis.wallabag_v1: @@ -92,14 +92,14 @@ services: $queueName: "wallabag.import.wallabag_v1" wallabag_core.producer.redis.wallabag_v1: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.wallabag_v1" wallabag_core.consumer.redis.wallabag_v1: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\WallabagV1Import' + $import: '@Wallabag\Import\WallabagV1Import' # wallabag v2 wallabag_core.queue.redis.wallabag_v2: @@ -108,14 +108,14 @@ services: $queueName: "wallabag.import.wallabag_v2" wallabag_core.producer.redis.wallabag_v2: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.wallabag_v2" wallabag_core.consumer.redis.wallabag_v2: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\WallabagV2Import' + $import: '@Wallabag\Import\WallabagV2Import' # elcurator wallabag_core.queue.redis.elcurator: @@ -124,14 +124,14 @@ services: $queueName: "wallabag.import.elcurator" wallabag_core.producer.redis.elcurator: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.elcurator" wallabag_core.consumer.redis.elcurator: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ElcuratorImport' + $import: '@Wallabag\Import\ElcuratorImport' # firefox wallabag_core.queue.redis.firefox: @@ -140,14 +140,14 @@ services: $queueName: "wallabag.import.firefox" wallabag_core.producer.redis.firefox: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.firefox" wallabag_core.consumer.redis.firefox: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\FirefoxImport' + $import: '@Wallabag\Import\FirefoxImport' # chrome wallabag_core.queue.redis.chrome: @@ -156,14 +156,14 @@ services: $queueName: "wallabag.import.chrome" wallabag_core.producer.redis.chrome: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.chrome" wallabag_core.consumer.redis.chrome: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ChromeImport' + $import: '@Wallabag\Import\ChromeImport' # shaarli wallabag_core.queue.redis.shaarli: @@ -172,14 +172,14 @@ services: $queueName: "wallabag.import.shaarli" wallabag_core.producer.redis.shaarli: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.shaarli" wallabag_core.consumer.redis.shaarli: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\ShaarliImport' + $import: '@Wallabag\Import\ShaarliImport' # pocket html wallabag_core.queue.redis.pocket_html: @@ -188,11 +188,11 @@ services: $queueName: "wallabag.import.pocket_html" wallabag_core.producer.redis.pocket_html: - class: Wallabag\CoreBundle\Redis\Producer + class: Wallabag\Redis\Producer arguments: - "@wallabag_core.queue.redis.pocket_html" wallabag_core.consumer.redis.pocket_html: - class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer + class: Wallabag\Consumer\RedisEntryConsumer arguments: - $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport' + $import: '@Wallabag\Import\PocketHtmlImport' diff --git a/app/config/services_test.yml b/app/config/services_test.yml index d34ae4642..6808f3986 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -9,11 +9,11 @@ services: public: true wallabag_core.entry_repository.test: - alias: Wallabag\CoreBundle\Repository\EntryRepository + alias: Wallabag\Repository\EntryRepository public: true wallabag_user.user_repository.test: - alias: Wallabag\CoreBundle\Repository\UserRepository + alias: Wallabag\Repository\UserRepository public: true filesystem_cache: @@ -22,7 +22,7 @@ services: - "%kernel.cache_dir%/doctrine/metadata" # fixtures - Wallabag\CoreBundle\DataFixtures\: + Wallabag\DataFixtures\: resource: '../../src/DataFixtures/*' tags: ['doctrine.fixture.orm'] autowire: true diff --git a/composer.json b/composer.json index d7f8e7751..3fb175238 100644 --- a/composer.json +++ b/composer.json @@ -191,7 +191,7 @@ "prefer-stable": true, "autoload": { "psr-4": { - "Wallabag\\CoreBundle\\": "src/" + "Wallabag\\": "src/" }, "classmap": [ "app/AppKernel.php", @@ -200,7 +200,7 @@ }, "autoload-dev": { "psr-4": { - "Tests\\Wallabag\\CoreBundle\\": "tests/" + "Tests\\Wallabag\\": "tests/" }, "files": [ "tests/functions.php" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 48987c3a2..a3a1e281f 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,17 +1,17 @@ parameters: ignoreErrors: - - message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" + message: "#^Method Wallabag\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" count: 1 path: src/Controller/AnnotationController.php - - message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" + message: "#^Method Wallabag\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" count: 1 path: src/Controller/AnnotationController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#" count: 1 path: src/Controller/ConfigController.php @@ -21,32 +21,32 @@ parameters: path: src/Controller/ConfigController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 path: src/Controller/Import/BrowserController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" count: 1 path: src/Controller/Import/BrowserController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 path: src/Controller/Import/HtmlController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" count: 1 path: src/Controller/Import/HtmlController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 path: src/Controller/Import/WallabagController.php - - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" + message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" count: 1 path: src/Controller/Import/WallabagController.php @@ -66,7 +66,7 @@ parameters: path: src/Mailer/AuthCodeMailer.php - - 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\\.$#" + message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#" count: 1 path: src/Mailer/UserMailer.php diff --git a/src/Command/CleanDownloadedImagesCommand.php b/src/Command/CleanDownloadedImagesCommand.php index 015a446bf..c1122dd95 100644 --- a/src/Command/CleanDownloadedImagesCommand.php +++ b/src/Command/CleanDownloadedImagesCommand.php @@ -1,6 +1,6 @@ io->section('Step 4 of 4: Config setup.'); // cleanup before insert new stuff - $this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\InternalSetting')->execute(); - $this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule')->execute(); + $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\InternalSetting')->execute(); + $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\IgnoreOriginInstanceRule')->execute(); foreach ($this->defaultSettings as $setting) { $newSetting = new InternalSetting(); diff --git a/src/Command/ListUserCommand.php b/src/Command/ListUserCommand.php index 69a209767..ac44f5115 100644 --- a/src/Command/ListUserCommand.php +++ b/src/Command/ListUserCommand.php @@ -1,6 +1,6 @@ validateAuthentication(); - return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::getAnnotationsAction', [ + return $this->forward('Wallabag\Controller\AnnotationController::getAnnotationsAction', [ 'entry' => $entry, ]); } @@ -108,7 +108,7 @@ class AnnotationRestController extends WallabagRestController { $this->validateAuthentication(); - return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::postAnnotationAction', [ + return $this->forward('Wallabag\Controller\AnnotationController::postAnnotationAction', [ 'request' => $request, 'entry' => $entry, ]); @@ -144,7 +144,7 @@ class AnnotationRestController extends WallabagRestController { $this->validateAuthentication(); - return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::putAnnotationAction', [ + return $this->forward('Wallabag\Controller\AnnotationController::putAnnotationAction', [ 'annotation' => $annotation, 'request' => $request, ]); @@ -180,7 +180,7 @@ class AnnotationRestController extends WallabagRestController { $this->validateAuthentication(); - return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::deleteAnnotationAction', [ + return $this->forward('Wallabag\Controller\AnnotationController::deleteAnnotationAction', [ 'annotation' => $annotation, ]); } diff --git a/src/Controller/Api/ConfigRestController.php b/src/Controller/Api/ConfigRestController.php index ec4d84b61..272d5cd75 100644 --- a/src/Controller/Api/ConfigRestController.php +++ b/src/Controller/Api/ConfigRestController.php @@ -1,6 +1,6 @@ * - * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\TaggingRule", mappedBy="config", cascade={"remove"}) + * @ORM\OneToMany(targetEntity="Wallabag\Entity\TaggingRule", mappedBy="config", cascade={"remove"}) * @ORM\OrderBy({"id" = "ASC"}) */ private $taggingRules; @@ -184,7 +184,7 @@ class Config /** * @var ArrayCollection * - * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\IgnoreOriginUserRule", mappedBy="config", cascade={"remove"}) + * @ORM\OneToMany(targetEntity="Wallabag\Entity\IgnoreOriginUserRule", mappedBy="config", cascade={"remove"}) * @ORM\OrderBy({"id" = "ASC"}) */ private $ignoreOriginRules; diff --git a/src/Entity/Entry.php b/src/Entity/Entry.php index a14166e3e..71722b61c 100644 --- a/src/Entity/Entry.php +++ b/src/Entity/Entry.php @@ -1,6 +1,6 @@ + * @var ArrayCollection&iterable<\Wallabag\Entity\SiteCredential> * - * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\SiteCredential", mappedBy="user", cascade={"remove"}) + * @ORM\OneToMany(targetEntity="Wallabag\Entity\SiteCredential", mappedBy="user", cascade={"remove"}) */ protected $siteCredentials; /** - * @var ArrayCollection&iterable<\Wallabag\CoreBundle\Entity\Api\Client> + * @var ArrayCollection&iterable<\Wallabag\Entity\Api\Client> * - * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", mappedBy="user", cascade={"remove"}) + * @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\Client", mappedBy="user", cascade={"remove"}) */ protected $clients; diff --git a/src/Event/ConfigUpdatedEvent.php b/src/Event/ConfigUpdatedEvent.php index 2b28c6302..d1806a57f 100644 --- a/src/Event/ConfigUpdatedEvent.php +++ b/src/Event/ConfigUpdatedEvent.php @@ -1,9 +1,9 @@ registry->getManagerForClass($configuration->getClass()); // Check, if class name is what we need - if (null !== $em && 'Wallabag\CoreBundle\Entity\User' !== $em->getClassMetadata($configuration->getClass())->getName()) { + if (null !== $em && 'Wallabag\Entity\User' !== $em->getClassMetadata($configuration->getClass())->getName()) { return false; } diff --git a/src/Redis/Producer.php b/src/Redis/Producer.php index fbab0265a..9cc64aae3 100644 --- a/src/Redis/Producer.php +++ b/src/Redis/Producer.php @@ -1,6 +1,6 @@ getEntityManager() - ->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Annotation a WHERE a.user = :userId') + ->createQuery('DELETE FROM Wallabag\Entity\Annotation a WHERE a.user = :userId') ->setParameter('userId', $userId) ->execute(); } diff --git a/src/Repository/Api/ClientRepository.php b/src/Repository/Api/ClientRepository.php index a12b40b91..28ed7389c 100644 --- a/src/Repository/Api/ClientRepository.php +++ b/src/Repository/Api/ClientRepository.php @@ -1,10 +1,10 @@ getEntityManager() - ->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.user = :userId') + ->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.user = :userId') ->setParameter('userId', $userId) ->execute(); } @@ -609,7 +609,7 @@ class EntryRepository extends ServiceEntityRepository public function removeArchivedByUserId($userId) { $this->getEntityManager() - ->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.user = :userId AND e.isArchived = TRUE') + ->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.user = :userId AND e.isArchived = TRUE') ->setParameter('userId', $userId) ->execute(); } diff --git a/src/Repository/IgnoreOriginInstanceRuleRepository.php b/src/Repository/IgnoreOriginInstanceRuleRepository.php index ccf321174..da28934a8 100644 --- a/src/Repository/IgnoreOriginInstanceRuleRepository.php +++ b/src/Repository/IgnoreOriginInstanceRuleRepository.php @@ -1,10 +1,10 @@ diff --git a/templates/Import/index.html.twig b/templates/Import/index.html.twig index bd28f2340..5816c297b 100644 --- a/templates/Import/index.html.twig +++ b/templates/Import/index.html.twig @@ -3,7 +3,7 @@ {% block title %}{{ 'import.page_title'|trans }}{% endblock %} {% block messages %} - {{ render(controller('Wallabag\\CoreBundle\\Controller\\Import\\ImportController::checkQueueAction')) }} + {{ render(controller('Wallabag\\Controller\\Import\\ImportController::checkQueueAction')) }} {{ parent() }} {% endblock %} diff --git a/templates/layout.html.twig b/templates/layout.html.twig index 06f68376e..bf2753049 100644 --- a/templates/layout.html.twig +++ b/templates/layout.html.twig @@ -156,8 +156,8 @@ - {{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::searchFormAction', {'currentRoute': current_route})) }} - {{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::addEntryFormAction')) }} + {{ render(controller('Wallabag\\Controller\\EntryController::searchFormAction', {'currentRoute': current_route})) }} + {{ render(controller('Wallabag\\Controller\\EntryController::addEntryFormAction')) }} {% endblock %} diff --git a/tests/Command/CleanDuplicatesCommandTest.php b/tests/Command/CleanDuplicatesCommandTest.php index 6bb731e3a..d7d7ba3c5 100644 --- a/tests/Command/CleanDuplicatesCommandTest.php +++ b/tests/Command/CleanDuplicatesCommandTest.php @@ -1,13 +1,13 @@ getRepository(Entry::class)->findAllByUrlAndUserId($url, $this->getLoggedInUserId()); $this->assertCount(1, $nbEntries); - $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url'); + $query = $em->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.url = :url'); $query->setParameter('url', $url); $query->execute(); } diff --git a/tests/Command/ExportCommandTest.php b/tests/Command/ExportCommandTest.php index abad7cf74..c8d5ef13a 100644 --- a/tests/Command/ExportCommandTest.php +++ b/tests/Command/ExportCommandTest.php @@ -1,11 +1,11 @@ assertSame($entry->getHashedUrl(), hash('sha1', $url)); - $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url'); + $query = $em->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.url = :url'); $query->setParameter('url', $url); $query->execute(); } diff --git a/tests/Command/Import/ImportCommandTest.php b/tests/Command/Import/ImportCommandTest.php index 5f112acf4..3187131f1 100644 --- a/tests/Command/Import/ImportCommandTest.php +++ b/tests/Command/Import/ImportCommandTest.php @@ -1,13 +1,13 @@ getRepository(Entry::class)->findOneByUrl($url); $this->assertSame($entry->getPreviewPicture(), $client->getContainer()->getParameter('domain_name') . '/mypicture.jpg'); - $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url'); + $query = $em->createQuery('DELETE FROM Wallabag\Entity\Entry e WHERE e.url = :url'); $query->setParameter('url', $url); $query->execute(); } diff --git a/tests/Consumer/AMQPEntryConsumerTest.php b/tests/Consumer/AMQPEntryConsumerTest.php index 57bd6bfda..b12aa0f6b 100644 --- a/tests/Consumer/AMQPEntryConsumerTest.php +++ b/tests/Consumer/AMQPEntryConsumerTest.php @@ -1,16 +1,16 @@ setPrimaryTable(['name' => 'entry']); $metaClass->mapManyToMany([ 'fieldName' => 'tags', diff --git a/tests/Form/DataTransformer/StringToListTransformerTest.php b/tests/Form/DataTransformer/StringToListTransformerTest.php index ef058a8c0..1a09c3c1e 100644 --- a/tests/Form/DataTransformer/StringToListTransformerTest.php +++ b/tests/Form/DataTransformer/StringToListTransformerTest.php @@ -1,9 +1,9 @@