From a37b385c236f8a348927c995bd9bd536a3402bd4 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 19 Feb 2024 00:39:48 +0100 Subject: [PATCH 1/7] Move source files directly under src/ directory --- .gitignore | 2 -- app/config/services.yml | 6 ++-- app/config/services_test.yml | 2 +- composer.json | 2 +- phpstan-baseline.neon | 28 +++++++++---------- .../Command/CleanDownloadedImagesCommand.php | 0 .../Command/CleanDuplicatesCommand.php | 0 .../CoreBundle => }/Command/ExportCommand.php | 0 .../Command/GenerateUrlHashesCommand.php | 0 .../Command/Import/ImportCommand.php | 0 .../Command/Import/RedisWorkerCommand.php | 0 .../Command/InstallCommand.php | 0 .../Command/ListUserCommand.php | 0 .../Command/ReloadEntryCommand.php | 0 .../Command/ShowUserCommand.php | 0 .../CoreBundle => }/Command/TagAllCommand.php | 0 .../Command/UpdatePicturesPathCommand.php | 0 .../Consumer/AMQPEntryConsumer.php | 0 .../Consumer/AbstractConsumer.php | 0 .../Consumer/RabbitMQConsumerTotalProxy.php | 0 .../Consumer/RedisEntryConsumer.php | 0 .../Controller/AbstractController.php | 0 .../Controller/AnnotationController.php | 0 .../Api/AnnotationRestController.php | 0 .../Controller/Api/ConfigRestController.php | 0 .../Controller/Api/DeveloperController.php | 0 .../Controller/Api/EntryRestController.php | 0 .../Controller/Api/SearchRestController.php | 0 .../Controller/Api/TagRestController.php | 0 .../Api/TaggingRuleRestController.php | 0 .../Controller/Api/UserRestController.php | 0 .../Controller/Api/WallabagRestController.php | 0 .../Controller/ConfigController.php | 0 .../Controller/EntryController.php | 0 .../Controller/ExportController.php | 0 .../Controller/FeedController.php | 0 .../IgnoreOriginInstanceRuleController.php | 0 .../Controller/Import/BrowserController.php | 0 .../Controller/Import/ChromeController.php | 0 .../Controller/Import/DeliciousController.php | 0 .../Controller/Import/ElcuratorController.php | 0 .../Controller/Import/FirefoxController.php | 0 .../Controller/Import/HtmlController.php | 0 .../Controller/Import/ImportController.php | 0 .../Import/InstapaperController.php | 0 .../Controller/Import/PinboardController.php | 0 .../Controller/Import/PocketController.php | 0 .../Import/PocketHtmlController.php | 0 .../Import/ReadabilityController.php | 0 .../Controller/Import/ShaarliController.php | 0 .../Controller/Import/WallabagController.php | 0 .../Import/WallabagV1Controller.php | 0 .../Import/WallabagV2Controller.php | 0 .../Controller/SiteCredentialController.php | 0 .../Controller/StaticController.php | 0 .../Controller/TagController.php | 0 .../Controller/UserController.php | 0 .../DataFixtures/AnnotationFixtures.php | 0 .../DataFixtures/ConfigFixtures.php | 0 .../DataFixtures/EntryFixtures.php | 0 .../IgnoreOriginInstanceRuleFixtures.php | 0 .../IgnoreOriginUserRuleFixtures.php | 0 .../DataFixtures/InternalSettingFixtures.php | 0 .../DataFixtures/SiteCredentialFixtures.php | 0 .../DataFixtures/TagFixtures.php | 0 .../DataFixtures/TaggingRuleFixtures.php | 0 .../DataFixtures/UserFixtures.php | 0 .../DependencyInjection/Configuration.php | 0 .../WallabagCoreExtension.php | 0 .../Doctrine/JsonArrayType.php | 0 .../Doctrine/WallabagMigration.php | 0 .../CoreBundle => }/Entity/Annotation.php | 0 .../Entity/Api/AccessToken.php | 0 .../Entity/Api/ApplicationInfo.php | 0 .../CoreBundle => }/Entity/Api/AuthCode.php | 0 .../CoreBundle => }/Entity/Api/Client.php | 0 .../Entity/Api/RefreshToken.php | 0 .../CoreBundle => }/Entity/Config.php | 0 .../CoreBundle => }/Entity/Entry.php | 0 .../Entity/IgnoreOriginInstanceRule.php | 0 .../Entity/IgnoreOriginRuleInterface.php | 0 .../Entity/IgnoreOriginUserRule.php | 0 .../Entity/InternalSetting.php | 0 .../CoreBundle => }/Entity/RuleInterface.php | 0 .../CoreBundle => }/Entity/SiteCredential.php | 0 src/{Wallabag/CoreBundle => }/Entity/Tag.php | 0 .../CoreBundle => }/Entity/TaggingRule.php | 0 src/{Wallabag/CoreBundle => }/Entity/User.php | 0 .../Event/ConfigUpdatedEvent.php | 0 .../Event/EntryDeletedEvent.php | 0 .../CoreBundle => }/Event/EntrySavedEvent.php | 0 .../AuthenticationFailureListener.php | 0 .../Event/Listener/CreateConfigListener.php | 0 .../Event/Listener/LocaleListener.php | 0 .../Listener/PasswordResettingListener.php | 0 .../Event/Listener/RegistrationListener.php | 0 .../Event/Listener/UserLocaleListener.php | 0 .../CustomDoctrineORMSubscriber.php | 0 .../Subscriber/DownloadImagesSubscriber.php | 0 .../GenerateCustomCSSSubscriber.php | 0 .../SQLiteCascadeDeleteSubscriber.php | 0 .../Subscriber/TablePrefixSubscriber.php | 0 .../AuthenticatorProvider.php | 0 .../StringToListTransformer.php | 0 .../Form/Type/Api/ClientType.php | 0 .../Form/Type/ChangePasswordType.php | 0 .../CoreBundle => }/Form/Type/ConfigType.php | 0 .../Form/Type/EditAnnotationType.php | 0 .../Form/Type/EditEntryType.php | 0 .../Form/Type/EntryFilterType.php | 0 .../CoreBundle => }/Form/Type/FeedType.php | 0 .../Type/IgnoreOriginInstanceRuleType.php | 0 .../Form/Type/IgnoreOriginUserRuleType.php | 0 .../Form/Type/NewAnnotationType.php | 0 .../Form/Type/NewEntryType.php | 0 .../CoreBundle => }/Form/Type/NewTagType.php | 0 .../CoreBundle => }/Form/Type/NewUserType.php | 0 .../CoreBundle => }/Form/Type/RangeType.php | 0 .../Form/Type/RenameTagType.php | 0 .../Form/Type/SearchEntryType.php | 0 .../Form/Type/SearchUserType.php | 0 .../Form/Type/SiteCredentialType.php | 0 .../Form/Type/TaggingRuleImportType.php | 0 .../Form/Type/TaggingRuleType.php | 0 .../Form/Type/UploadImportType.php | 0 .../Form/Type/UserInformationType.php | 0 .../CoreBundle => }/Form/Type/UserType.php | 0 .../Guzzle/AuthenticatorSubscriber.php | 0 .../FixupMondeDiplomatiqueUriSubscriber.php | 0 .../CoreBundle => }/Helper/ContentProxy.php | 0 .../CoreBundle => }/Helper/CryptoProxy.php | 0 .../CoreBundle => }/Helper/DownloadImages.php | 0 .../Helper/EntityTimestampsTrait.php | 0 .../CoreBundle => }/Helper/EntriesExport.php | 0 .../CoreBundle => }/Helper/FileCookieJar.php | 0 .../Helper/HttpClientFactory.php | 0 .../Helper/PreparePagerForEntries.php | 0 .../CoreBundle => }/Helper/Redirect.php | 0 .../Helper/RuleBasedIgnoreOriginProcessor.php | 0 .../Helper/RuleBasedTagger.php | 0 .../CoreBundle => }/Helper/TagsAssigner.php | 0 .../CoreBundle => }/Helper/UrlHasher.php | 0 .../CoreBundle => }/Import/AbstractImport.php | 0 .../CoreBundle => }/Import/BrowserImport.php | 0 .../CoreBundle => }/Import/ChromeImport.php | 0 .../Import/DeliciousImport.php | 0 .../Import/ElcuratorImport.php | 0 .../CoreBundle => }/Import/FirefoxImport.php | 0 .../CoreBundle => }/Import/HtmlImport.php | 0 .../CoreBundle => }/Import/ImportChain.php | 0 .../Import/ImportCompilerPass.php | 0 .../Import/ImportInterface.php | 0 .../Import/InstapaperImport.php | 0 .../CoreBundle => }/Import/PinboardImport.php | 0 .../Import/PocketHtmlImport.php | 0 .../CoreBundle => }/Import/PocketImport.php | 0 .../Import/ReadabilityImport.php | 0 .../CoreBundle => }/Import/ShaarliImport.php | 0 .../CoreBundle => }/Import/WallabagImport.php | 0 .../Import/WallabagV1Import.php | 0 .../Import/WallabagV2Import.php | 0 .../CoreBundle => }/Mailer/AuthCodeMailer.php | 0 .../CoreBundle => }/Mailer/UserMailer.php | 0 .../Operator/Doctrine/Matches.php | 0 .../Operator/Doctrine/NotMatches.php | 0 .../CoreBundle => }/Operator/PHP/Matches.php | 0 .../Operator/PHP/NotMatches.php | 0 .../Operator/PHP/PatternMatches.php | 0 .../UsernameFeedTokenConverter.php | 0 .../CoreBundle => }/Redis/Producer.php | 0 .../Repository/AnnotationRepository.php | 0 .../Repository/Api/ClientRepository.php | 0 .../Repository/ConfigRepository.php | 0 .../Repository/EntryRepository.php | 0 .../IgnoreOriginInstanceRuleRepository.php | 0 .../IgnoreOriginUserRuleRepository.php | 0 .../Repository/SiteCredentialRepository.php | 0 .../Repository/TagRepository.php | 0 .../Repository/TaggingRuleRepository.php | 0 .../Repository/UserRepository.php | 0 .../SiteConfig/ArraySiteConfigBuilder.php | 0 .../Authenticator/Authenticator.php | 0 .../SiteConfig/Authenticator/Factory.php | 0 .../Authenticator/LoginFormAuthenticator.php | 0 .../SiteConfig/GrabySiteConfigBuilder.php | 0 .../CoreBundle => }/SiteConfig/SiteConfig.php | 0 .../SiteConfig/SiteConfigBuilder.php | 0 src/{Wallabag/CoreBundle => }/Tools/Utils.php | 0 .../Twig/WallabagExtension.php | 0 .../CoreBundle => }/WallabagCoreBundle.php | 0 190 files changed, 19 insertions(+), 21 deletions(-) rename src/{Wallabag/CoreBundle => }/Command/CleanDownloadedImagesCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/CleanDuplicatesCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/ExportCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/GenerateUrlHashesCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/Import/ImportCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/Import/RedisWorkerCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/InstallCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/ListUserCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/ReloadEntryCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/ShowUserCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/TagAllCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Command/UpdatePicturesPathCommand.php (100%) rename src/{Wallabag/CoreBundle => }/Consumer/AMQPEntryConsumer.php (100%) rename src/{Wallabag/CoreBundle => }/Consumer/AbstractConsumer.php (100%) rename src/{Wallabag/CoreBundle => }/Consumer/RabbitMQConsumerTotalProxy.php (100%) rename src/{Wallabag/CoreBundle => }/Consumer/RedisEntryConsumer.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/AbstractController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/AnnotationController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/AnnotationRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/ConfigRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/DeveloperController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/EntryRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/SearchRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/TagRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/TaggingRuleRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/UserRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Api/WallabagRestController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/ConfigController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/EntryController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/ExportController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/FeedController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/IgnoreOriginInstanceRuleController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/BrowserController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/ChromeController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/DeliciousController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/ElcuratorController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/FirefoxController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/HtmlController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/ImportController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/InstapaperController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/PinboardController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/PocketController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/PocketHtmlController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/ReadabilityController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/ShaarliController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/WallabagController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/WallabagV1Controller.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/Import/WallabagV2Controller.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/SiteCredentialController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/StaticController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/TagController.php (100%) rename src/{Wallabag/CoreBundle => }/Controller/UserController.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/AnnotationFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/ConfigFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/EntryFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/IgnoreOriginInstanceRuleFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/IgnoreOriginUserRuleFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/InternalSettingFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/SiteCredentialFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/TagFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/TaggingRuleFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DataFixtures/UserFixtures.php (100%) rename src/{Wallabag/CoreBundle => }/DependencyInjection/Configuration.php (100%) rename src/{Wallabag/CoreBundle => }/DependencyInjection/WallabagCoreExtension.php (100%) rename src/{Wallabag/CoreBundle => }/Doctrine/JsonArrayType.php (100%) rename src/{Wallabag/CoreBundle => }/Doctrine/WallabagMigration.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Annotation.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Api/AccessToken.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Api/ApplicationInfo.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Api/AuthCode.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Api/Client.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Api/RefreshToken.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Config.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Entry.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/IgnoreOriginInstanceRule.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/IgnoreOriginRuleInterface.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/IgnoreOriginUserRule.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/InternalSetting.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/RuleInterface.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/SiteCredential.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/Tag.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/TaggingRule.php (100%) rename src/{Wallabag/CoreBundle => }/Entity/User.php (100%) rename src/{Wallabag/CoreBundle => }/Event/ConfigUpdatedEvent.php (100%) rename src/{Wallabag/CoreBundle => }/Event/EntryDeletedEvent.php (100%) rename src/{Wallabag/CoreBundle => }/Event/EntrySavedEvent.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Listener/AuthenticationFailureListener.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Listener/CreateConfigListener.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Listener/LocaleListener.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Listener/PasswordResettingListener.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Listener/RegistrationListener.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Listener/UserLocaleListener.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Subscriber/CustomDoctrineORMSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Subscriber/DownloadImagesSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Subscriber/GenerateCustomCSSSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/Event/Subscriber/TablePrefixSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/ExpressionLanguage/AuthenticatorProvider.php (100%) rename src/{Wallabag/CoreBundle => }/Form/DataTransformer/StringToListTransformer.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/Api/ClientType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/ChangePasswordType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/ConfigType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/EditAnnotationType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/EditEntryType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/EntryFilterType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/FeedType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/IgnoreOriginInstanceRuleType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/IgnoreOriginUserRuleType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/NewAnnotationType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/NewEntryType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/NewTagType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/NewUserType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/RangeType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/RenameTagType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/SearchEntryType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/SearchUserType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/SiteCredentialType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/TaggingRuleImportType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/TaggingRuleType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/UploadImportType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/UserInformationType.php (100%) rename src/{Wallabag/CoreBundle => }/Form/Type/UserType.php (100%) rename src/{Wallabag/CoreBundle => }/Guzzle/AuthenticatorSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/ContentProxy.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/CryptoProxy.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/DownloadImages.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/EntityTimestampsTrait.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/EntriesExport.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/FileCookieJar.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/HttpClientFactory.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/PreparePagerForEntries.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/Redirect.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/RuleBasedIgnoreOriginProcessor.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/RuleBasedTagger.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/TagsAssigner.php (100%) rename src/{Wallabag/CoreBundle => }/Helper/UrlHasher.php (100%) rename src/{Wallabag/CoreBundle => }/Import/AbstractImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/BrowserImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ChromeImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/DeliciousImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ElcuratorImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/FirefoxImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/HtmlImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ImportChain.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ImportCompilerPass.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ImportInterface.php (100%) rename src/{Wallabag/CoreBundle => }/Import/InstapaperImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/PinboardImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/PocketHtmlImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/PocketImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ReadabilityImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/ShaarliImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/WallabagImport.php (100%) rename src/{Wallabag/CoreBundle => }/Import/WallabagV1Import.php (100%) rename src/{Wallabag/CoreBundle => }/Import/WallabagV2Import.php (100%) rename src/{Wallabag/CoreBundle => }/Mailer/AuthCodeMailer.php (100%) rename src/{Wallabag/CoreBundle => }/Mailer/UserMailer.php (100%) rename src/{Wallabag/CoreBundle => }/Operator/Doctrine/Matches.php (100%) rename src/{Wallabag/CoreBundle => }/Operator/Doctrine/NotMatches.php (100%) rename src/{Wallabag/CoreBundle => }/Operator/PHP/Matches.php (100%) rename src/{Wallabag/CoreBundle => }/Operator/PHP/NotMatches.php (100%) rename src/{Wallabag/CoreBundle => }/Operator/PHP/PatternMatches.php (100%) rename src/{Wallabag/CoreBundle => }/ParamConverter/UsernameFeedTokenConverter.php (100%) rename src/{Wallabag/CoreBundle => }/Redis/Producer.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/AnnotationRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/Api/ClientRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/ConfigRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/EntryRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/IgnoreOriginInstanceRuleRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/IgnoreOriginUserRuleRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/SiteCredentialRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/TagRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/TaggingRuleRepository.php (100%) rename src/{Wallabag/CoreBundle => }/Repository/UserRepository.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/ArraySiteConfigBuilder.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/Authenticator/Authenticator.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/Authenticator/Factory.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/Authenticator/LoginFormAuthenticator.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/GrabySiteConfigBuilder.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/SiteConfig.php (100%) rename src/{Wallabag/CoreBundle => }/SiteConfig/SiteConfigBuilder.php (100%) rename src/{Wallabag/CoreBundle => }/Tools/Utils.php (100%) rename src/{Wallabag/CoreBundle => }/Twig/WallabagExtension.php (100%) rename src/{Wallabag/CoreBundle => }/WallabagCoreBundle.php (100%) diff --git a/.gitignore b/.gitignore index b5b395ca2..0f2969783 100644 --- a/.gitignore +++ b/.gitignore @@ -49,8 +49,6 @@ data/db/wallabag*.sqlite node_modules/ bin app/Resources/build/ -!/src/Wallabag/CoreBundle/Resources/public -/src/Wallabag/CoreBundle/Resources/public/* package-lock.json # Test-generated files diff --git a/app/config/services.yml b/app/config/services.yml index 7a47cb073..b063a1a1f 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -33,13 +33,13 @@ services: $fonts: '%wallabag_core.fonts%' Wallabag\CoreBundle\: - resource: '../../src/Wallabag/CoreBundle/*' - exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Wallabag/CoreBundle/Event/*Event.php'] + 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\: - resource: '../../src/Wallabag/CoreBundle/Controller/' + resource: '../../src/Controller/' tags: ['controller.service_arguments'] # inject alias service into controllers diff --git a/app/config/services_test.yml b/app/config/services_test.yml index 749207ce8..d34ae4642 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -23,6 +23,6 @@ services: # fixtures Wallabag\CoreBundle\DataFixtures\: - resource: '../../src/Wallabag/CoreBundle/DataFixtures/*' + resource: '../../src/DataFixtures/*' tags: ['doctrine.fixture.orm'] autowire: true diff --git a/composer.json b/composer.json index 795b19b1c..dab745dc2 100644 --- a/composer.json +++ b/composer.json @@ -191,7 +191,7 @@ "prefer-stable": true, "autoload": { "psr-4": { - "Wallabag\\": "src/Wallabag/" + "Wallabag\\CoreBundle\\": "src/" }, "classmap": [ "app/AppKernel.php", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 9ebbc1c5f..57b935b4e 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -3,72 +3,72 @@ parameters: - message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/AnnotationController.php + path: src/Controller/AnnotationController.php - message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/AnnotationController.php + path: src/Controller/AnnotationController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/ConfigController.php + path: src/Controller/ConfigController.php - message: "#^Method FOS\\\\UserBundle\\\\Model\\\\UserManagerInterface\\:\\:updateUser\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 6 - path: src/Wallabag/CoreBundle/Controller/ConfigController.php + path: src/Controller/ConfigController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php + path: src/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 + path: src/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 + path: src/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 + path: src/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 + path: src/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 + path: src/Controller/Import/WallabagController.php - message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpressionBuilder\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php + path: src/Event/Subscriber/CustomDoctrineORMSubscriber.php - message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpr\\(\\)\\.$#" count: 10 - path: src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php + path: src/Form/Type/EntryFilterType.php - message: "#^Call to an undefined method Scheb\\\\TwoFactorBundle\\\\Model\\\\Email\\\\TwoFactorInterface\\:\\:getName\\(\\)\\.$#" count: 2 - path: src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php + 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\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Mailer/UserMailer.php + path: src/Mailer/UserMailer.php - message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#" diff --git a/src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php b/src/Command/CleanDownloadedImagesCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php rename to src/Command/CleanDownloadedImagesCommand.php diff --git a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php b/src/Command/CleanDuplicatesCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php rename to src/Command/CleanDuplicatesCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Command/ExportCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ExportCommand.php rename to src/Command/ExportCommand.php diff --git a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php b/src/Command/GenerateUrlHashesCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php rename to src/Command/GenerateUrlHashesCommand.php diff --git a/src/Wallabag/CoreBundle/Command/Import/ImportCommand.php b/src/Command/Import/ImportCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/Import/ImportCommand.php rename to src/Command/Import/ImportCommand.php diff --git a/src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php b/src/Command/Import/RedisWorkerCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php rename to src/Command/Import/RedisWorkerCommand.php diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Command/InstallCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/InstallCommand.php rename to src/Command/InstallCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ListUserCommand.php b/src/Command/ListUserCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ListUserCommand.php rename to src/Command/ListUserCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php b/src/Command/ReloadEntryCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php rename to src/Command/ReloadEntryCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php b/src/Command/ShowUserCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ShowUserCommand.php rename to src/Command/ShowUserCommand.php diff --git a/src/Wallabag/CoreBundle/Command/TagAllCommand.php b/src/Command/TagAllCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/TagAllCommand.php rename to src/Command/TagAllCommand.php diff --git a/src/Wallabag/CoreBundle/Command/UpdatePicturesPathCommand.php b/src/Command/UpdatePicturesPathCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/UpdatePicturesPathCommand.php rename to src/Command/UpdatePicturesPathCommand.php diff --git a/src/Wallabag/CoreBundle/Consumer/AMQPEntryConsumer.php b/src/Consumer/AMQPEntryConsumer.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/AMQPEntryConsumer.php rename to src/Consumer/AMQPEntryConsumer.php diff --git a/src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php b/src/Consumer/AbstractConsumer.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php rename to src/Consumer/AbstractConsumer.php diff --git a/src/Wallabag/CoreBundle/Consumer/RabbitMQConsumerTotalProxy.php b/src/Consumer/RabbitMQConsumerTotalProxy.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/RabbitMQConsumerTotalProxy.php rename to src/Consumer/RabbitMQConsumerTotalProxy.php diff --git a/src/Wallabag/CoreBundle/Consumer/RedisEntryConsumer.php b/src/Consumer/RedisEntryConsumer.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/RedisEntryConsumer.php rename to src/Consumer/RedisEntryConsumer.php diff --git a/src/Wallabag/CoreBundle/Controller/AbstractController.php b/src/Controller/AbstractController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/AbstractController.php rename to src/Controller/AbstractController.php diff --git a/src/Wallabag/CoreBundle/Controller/AnnotationController.php b/src/Controller/AnnotationController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/AnnotationController.php rename to src/Controller/AnnotationController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php b/src/Controller/Api/AnnotationRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php rename to src/Controller/Api/AnnotationRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php b/src/Controller/Api/ConfigRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php rename to src/Controller/Api/ConfigRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php b/src/Controller/Api/DeveloperController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php rename to src/Controller/Api/DeveloperController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php b/src/Controller/Api/EntryRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php rename to src/Controller/Api/EntryRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php b/src/Controller/Api/SearchRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php rename to src/Controller/Api/SearchRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/TagRestController.php b/src/Controller/Api/TagRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/TagRestController.php rename to src/Controller/Api/TagRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php b/src/Controller/Api/TaggingRuleRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php rename to src/Controller/Api/TaggingRuleRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/UserRestController.php b/src/Controller/Api/UserRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/UserRestController.php rename to src/Controller/Api/UserRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php b/src/Controller/Api/WallabagRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php rename to src/Controller/Api/WallabagRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Controller/ConfigController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/ConfigController.php rename to src/Controller/ConfigController.php diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Controller/EntryController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/EntryController.php rename to src/Controller/EntryController.php diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Controller/ExportController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/ExportController.php rename to src/Controller/ExportController.php diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Controller/FeedController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/FeedController.php rename to src/Controller/FeedController.php diff --git a/src/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleController.php b/src/Controller/IgnoreOriginInstanceRuleController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleController.php rename to src/Controller/IgnoreOriginInstanceRuleController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php b/src/Controller/Import/BrowserController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/BrowserController.php rename to src/Controller/Import/BrowserController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ChromeController.php b/src/Controller/Import/ChromeController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ChromeController.php rename to src/Controller/Import/ChromeController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php b/src/Controller/Import/DeliciousController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php rename to src/Controller/Import/DeliciousController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php b/src/Controller/Import/ElcuratorController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php rename to src/Controller/Import/ElcuratorController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php b/src/Controller/Import/FirefoxController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php rename to src/Controller/Import/FirefoxController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php b/src/Controller/Import/HtmlController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/HtmlController.php rename to src/Controller/Import/HtmlController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ImportController.php b/src/Controller/Import/ImportController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ImportController.php rename to src/Controller/Import/ImportController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php b/src/Controller/Import/InstapaperController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php rename to src/Controller/Import/InstapaperController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php b/src/Controller/Import/PinboardController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/PinboardController.php rename to src/Controller/Import/PinboardController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/PocketController.php b/src/Controller/Import/PocketController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/PocketController.php rename to src/Controller/Import/PocketController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php b/src/Controller/Import/PocketHtmlController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php rename to src/Controller/Import/PocketHtmlController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php b/src/Controller/Import/ReadabilityController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php rename to src/Controller/Import/ReadabilityController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php b/src/Controller/Import/ShaarliController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php rename to src/Controller/Import/ShaarliController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php b/src/Controller/Import/WallabagController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/WallabagController.php rename to src/Controller/Import/WallabagController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php b/src/Controller/Import/WallabagV1Controller.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php rename to src/Controller/Import/WallabagV1Controller.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php b/src/Controller/Import/WallabagV2Controller.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php rename to src/Controller/Import/WallabagV2Controller.php diff --git a/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php b/src/Controller/SiteCredentialController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/SiteCredentialController.php rename to src/Controller/SiteCredentialController.php diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Controller/StaticController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/StaticController.php rename to src/Controller/StaticController.php diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Controller/TagController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/TagController.php rename to src/Controller/TagController.php diff --git a/src/Wallabag/CoreBundle/Controller/UserController.php b/src/Controller/UserController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/UserController.php rename to src/Controller/UserController.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php b/src/DataFixtures/AnnotationFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php rename to src/DataFixtures/AnnotationFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php b/src/DataFixtures/ConfigFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php rename to src/DataFixtures/ConfigFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php b/src/DataFixtures/EntryFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php rename to src/DataFixtures/EntryFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php b/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php rename to src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php b/src/DataFixtures/IgnoreOriginUserRuleFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php rename to src/DataFixtures/IgnoreOriginUserRuleFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php b/src/DataFixtures/InternalSettingFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php rename to src/DataFixtures/InternalSettingFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php b/src/DataFixtures/SiteCredentialFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php rename to src/DataFixtures/SiteCredentialFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php b/src/DataFixtures/TagFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php rename to src/DataFixtures/TagFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php b/src/DataFixtures/TaggingRuleFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php rename to src/DataFixtures/TaggingRuleFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php rename to src/DataFixtures/UserFixtures.php diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php similarity index 100% rename from src/Wallabag/CoreBundle/DependencyInjection/Configuration.php rename to src/DependencyInjection/Configuration.php diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/DependencyInjection/WallabagCoreExtension.php similarity index 100% rename from src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php rename to src/DependencyInjection/WallabagCoreExtension.php diff --git a/src/Wallabag/CoreBundle/Doctrine/JsonArrayType.php b/src/Doctrine/JsonArrayType.php similarity index 100% rename from src/Wallabag/CoreBundle/Doctrine/JsonArrayType.php rename to src/Doctrine/JsonArrayType.php diff --git a/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php b/src/Doctrine/WallabagMigration.php similarity index 100% rename from src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php rename to src/Doctrine/WallabagMigration.php diff --git a/src/Wallabag/CoreBundle/Entity/Annotation.php b/src/Entity/Annotation.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Annotation.php rename to src/Entity/Annotation.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/AccessToken.php b/src/Entity/Api/AccessToken.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/AccessToken.php rename to src/Entity/Api/AccessToken.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/ApplicationInfo.php b/src/Entity/Api/ApplicationInfo.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/ApplicationInfo.php rename to src/Entity/Api/ApplicationInfo.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/AuthCode.php b/src/Entity/Api/AuthCode.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/AuthCode.php rename to src/Entity/Api/AuthCode.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/Client.php b/src/Entity/Api/Client.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/Client.php rename to src/Entity/Api/Client.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/RefreshToken.php b/src/Entity/Api/RefreshToken.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/RefreshToken.php rename to src/Entity/Api/RefreshToken.php diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Entity/Config.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Config.php rename to src/Entity/Config.php diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Entity/Entry.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Entry.php rename to src/Entity/Entry.php diff --git a/src/Wallabag/CoreBundle/Entity/IgnoreOriginInstanceRule.php b/src/Entity/IgnoreOriginInstanceRule.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/IgnoreOriginInstanceRule.php rename to src/Entity/IgnoreOriginInstanceRule.php diff --git a/src/Wallabag/CoreBundle/Entity/IgnoreOriginRuleInterface.php b/src/Entity/IgnoreOriginRuleInterface.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/IgnoreOriginRuleInterface.php rename to src/Entity/IgnoreOriginRuleInterface.php diff --git a/src/Wallabag/CoreBundle/Entity/IgnoreOriginUserRule.php b/src/Entity/IgnoreOriginUserRule.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/IgnoreOriginUserRule.php rename to src/Entity/IgnoreOriginUserRule.php diff --git a/src/Wallabag/CoreBundle/Entity/InternalSetting.php b/src/Entity/InternalSetting.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/InternalSetting.php rename to src/Entity/InternalSetting.php diff --git a/src/Wallabag/CoreBundle/Entity/RuleInterface.php b/src/Entity/RuleInterface.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/RuleInterface.php rename to src/Entity/RuleInterface.php diff --git a/src/Wallabag/CoreBundle/Entity/SiteCredential.php b/src/Entity/SiteCredential.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/SiteCredential.php rename to src/Entity/SiteCredential.php diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Entity/Tag.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Tag.php rename to src/Entity/Tag.php diff --git a/src/Wallabag/CoreBundle/Entity/TaggingRule.php b/src/Entity/TaggingRule.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/TaggingRule.php rename to src/Entity/TaggingRule.php diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Entity/User.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/User.php rename to src/Entity/User.php diff --git a/src/Wallabag/CoreBundle/Event/ConfigUpdatedEvent.php b/src/Event/ConfigUpdatedEvent.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/ConfigUpdatedEvent.php rename to src/Event/ConfigUpdatedEvent.php diff --git a/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php b/src/Event/EntryDeletedEvent.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php rename to src/Event/EntryDeletedEvent.php diff --git a/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php b/src/Event/EntrySavedEvent.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/EntrySavedEvent.php rename to src/Event/EntrySavedEvent.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php b/src/Event/Listener/AuthenticationFailureListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php rename to src/Event/Listener/AuthenticationFailureListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php b/src/Event/Listener/CreateConfigListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php rename to src/Event/Listener/CreateConfigListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php b/src/Event/Listener/LocaleListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php rename to src/Event/Listener/LocaleListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php b/src/Event/Listener/PasswordResettingListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php rename to src/Event/Listener/PasswordResettingListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php b/src/Event/Listener/RegistrationListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php rename to src/Event/Listener/RegistrationListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php b/src/Event/Listener/UserLocaleListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php rename to src/Event/Listener/UserLocaleListener.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Event/Subscriber/CustomDoctrineORMSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php rename to src/Event/Subscriber/CustomDoctrineORMSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Event/Subscriber/DownloadImagesSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php rename to src/Event/Subscriber/DownloadImagesSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/GenerateCustomCSSSubscriber.php b/src/Event/Subscriber/GenerateCustomCSSSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/GenerateCustomCSSSubscriber.php rename to src/Event/Subscriber/GenerateCustomCSSSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php b/src/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php rename to src/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php b/src/Event/Subscriber/TablePrefixSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php rename to src/Event/Subscriber/TablePrefixSubscriber.php diff --git a/src/Wallabag/CoreBundle/ExpressionLanguage/AuthenticatorProvider.php b/src/ExpressionLanguage/AuthenticatorProvider.php similarity index 100% rename from src/Wallabag/CoreBundle/ExpressionLanguage/AuthenticatorProvider.php rename to src/ExpressionLanguage/AuthenticatorProvider.php diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Form/DataTransformer/StringToListTransformer.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php rename to src/Form/DataTransformer/StringToListTransformer.php diff --git a/src/Wallabag/CoreBundle/Form/Type/Api/ClientType.php b/src/Form/Type/Api/ClientType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/Api/ClientType.php rename to src/Form/Type/Api/ClientType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php b/src/Form/Type/ChangePasswordType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php rename to src/Form/Type/ChangePasswordType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Form/Type/ConfigType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/ConfigType.php rename to src/Form/Type/ConfigType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php b/src/Form/Type/EditAnnotationType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php rename to src/Form/Type/EditAnnotationType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Form/Type/EditEntryType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/EditEntryType.php rename to src/Form/Type/EditEntryType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Form/Type/EntryFilterType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php rename to src/Form/Type/EntryFilterType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/FeedType.php b/src/Form/Type/FeedType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/FeedType.php rename to src/Form/Type/FeedType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/IgnoreOriginInstanceRuleType.php b/src/Form/Type/IgnoreOriginInstanceRuleType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/IgnoreOriginInstanceRuleType.php rename to src/Form/Type/IgnoreOriginInstanceRuleType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/IgnoreOriginUserRuleType.php b/src/Form/Type/IgnoreOriginUserRuleType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/IgnoreOriginUserRuleType.php rename to src/Form/Type/IgnoreOriginUserRuleType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php b/src/Form/Type/NewAnnotationType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php rename to src/Form/Type/NewAnnotationType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php b/src/Form/Type/NewEntryType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewEntryType.php rename to src/Form/Type/NewEntryType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewTagType.php b/src/Form/Type/NewTagType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewTagType.php rename to src/Form/Type/NewTagType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Form/Type/NewUserType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewUserType.php rename to src/Form/Type/NewUserType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/RangeType.php b/src/Form/Type/RangeType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/RangeType.php rename to src/Form/Type/RangeType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/RenameTagType.php b/src/Form/Type/RenameTagType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/RenameTagType.php rename to src/Form/Type/RenameTagType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/SearchEntryType.php b/src/Form/Type/SearchEntryType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/SearchEntryType.php rename to src/Form/Type/SearchEntryType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/SearchUserType.php b/src/Form/Type/SearchUserType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/SearchUserType.php rename to src/Form/Type/SearchUserType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/SiteCredentialType.php b/src/Form/Type/SiteCredentialType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/SiteCredentialType.php rename to src/Form/Type/SiteCredentialType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleImportType.php b/src/Form/Type/TaggingRuleImportType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/TaggingRuleImportType.php rename to src/Form/Type/TaggingRuleImportType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php b/src/Form/Type/TaggingRuleType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php rename to src/Form/Type/TaggingRuleType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/UploadImportType.php b/src/Form/Type/UploadImportType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/UploadImportType.php rename to src/Form/Type/UploadImportType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Form/Type/UserInformationType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/UserInformationType.php rename to src/Form/Type/UserInformationType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/UserType.php b/src/Form/Type/UserType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/UserType.php rename to src/Form/Type/UserType.php diff --git a/src/Wallabag/CoreBundle/Guzzle/AuthenticatorSubscriber.php b/src/Guzzle/AuthenticatorSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Guzzle/AuthenticatorSubscriber.php rename to src/Guzzle/AuthenticatorSubscriber.php diff --git a/src/Wallabag/CoreBundle/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php b/src/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php rename to src/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Helper/ContentProxy.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/ContentProxy.php rename to src/Helper/ContentProxy.php diff --git a/src/Wallabag/CoreBundle/Helper/CryptoProxy.php b/src/Helper/CryptoProxy.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/CryptoProxy.php rename to src/Helper/CryptoProxy.php diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Helper/DownloadImages.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/DownloadImages.php rename to src/Helper/DownloadImages.php diff --git a/src/Wallabag/CoreBundle/Helper/EntityTimestampsTrait.php b/src/Helper/EntityTimestampsTrait.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/EntityTimestampsTrait.php rename to src/Helper/EntityTimestampsTrait.php diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Helper/EntriesExport.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/EntriesExport.php rename to src/Helper/EntriesExport.php diff --git a/src/Wallabag/CoreBundle/Helper/FileCookieJar.php b/src/Helper/FileCookieJar.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/FileCookieJar.php rename to src/Helper/FileCookieJar.php diff --git a/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php b/src/Helper/HttpClientFactory.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/HttpClientFactory.php rename to src/Helper/HttpClientFactory.php diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Helper/PreparePagerForEntries.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php rename to src/Helper/PreparePagerForEntries.php diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Helper/Redirect.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/Redirect.php rename to src/Helper/Redirect.php diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessor.php b/src/Helper/RuleBasedIgnoreOriginProcessor.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessor.php rename to src/Helper/RuleBasedIgnoreOriginProcessor.php diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Helper/RuleBasedTagger.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php rename to src/Helper/RuleBasedTagger.php diff --git a/src/Wallabag/CoreBundle/Helper/TagsAssigner.php b/src/Helper/TagsAssigner.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/TagsAssigner.php rename to src/Helper/TagsAssigner.php diff --git a/src/Wallabag/CoreBundle/Helper/UrlHasher.php b/src/Helper/UrlHasher.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/UrlHasher.php rename to src/Helper/UrlHasher.php diff --git a/src/Wallabag/CoreBundle/Import/AbstractImport.php b/src/Import/AbstractImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/AbstractImport.php rename to src/Import/AbstractImport.php diff --git a/src/Wallabag/CoreBundle/Import/BrowserImport.php b/src/Import/BrowserImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/BrowserImport.php rename to src/Import/BrowserImport.php diff --git a/src/Wallabag/CoreBundle/Import/ChromeImport.php b/src/Import/ChromeImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ChromeImport.php rename to src/Import/ChromeImport.php diff --git a/src/Wallabag/CoreBundle/Import/DeliciousImport.php b/src/Import/DeliciousImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/DeliciousImport.php rename to src/Import/DeliciousImport.php diff --git a/src/Wallabag/CoreBundle/Import/ElcuratorImport.php b/src/Import/ElcuratorImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ElcuratorImport.php rename to src/Import/ElcuratorImport.php diff --git a/src/Wallabag/CoreBundle/Import/FirefoxImport.php b/src/Import/FirefoxImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/FirefoxImport.php rename to src/Import/FirefoxImport.php diff --git a/src/Wallabag/CoreBundle/Import/HtmlImport.php b/src/Import/HtmlImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/HtmlImport.php rename to src/Import/HtmlImport.php diff --git a/src/Wallabag/CoreBundle/Import/ImportChain.php b/src/Import/ImportChain.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ImportChain.php rename to src/Import/ImportChain.php diff --git a/src/Wallabag/CoreBundle/Import/ImportCompilerPass.php b/src/Import/ImportCompilerPass.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ImportCompilerPass.php rename to src/Import/ImportCompilerPass.php diff --git a/src/Wallabag/CoreBundle/Import/ImportInterface.php b/src/Import/ImportInterface.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ImportInterface.php rename to src/Import/ImportInterface.php diff --git a/src/Wallabag/CoreBundle/Import/InstapaperImport.php b/src/Import/InstapaperImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/InstapaperImport.php rename to src/Import/InstapaperImport.php diff --git a/src/Wallabag/CoreBundle/Import/PinboardImport.php b/src/Import/PinboardImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/PinboardImport.php rename to src/Import/PinboardImport.php diff --git a/src/Wallabag/CoreBundle/Import/PocketHtmlImport.php b/src/Import/PocketHtmlImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/PocketHtmlImport.php rename to src/Import/PocketHtmlImport.php diff --git a/src/Wallabag/CoreBundle/Import/PocketImport.php b/src/Import/PocketImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/PocketImport.php rename to src/Import/PocketImport.php diff --git a/src/Wallabag/CoreBundle/Import/ReadabilityImport.php b/src/Import/ReadabilityImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ReadabilityImport.php rename to src/Import/ReadabilityImport.php diff --git a/src/Wallabag/CoreBundle/Import/ShaarliImport.php b/src/Import/ShaarliImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ShaarliImport.php rename to src/Import/ShaarliImport.php diff --git a/src/Wallabag/CoreBundle/Import/WallabagImport.php b/src/Import/WallabagImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/WallabagImport.php rename to src/Import/WallabagImport.php diff --git a/src/Wallabag/CoreBundle/Import/WallabagV1Import.php b/src/Import/WallabagV1Import.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/WallabagV1Import.php rename to src/Import/WallabagV1Import.php diff --git a/src/Wallabag/CoreBundle/Import/WallabagV2Import.php b/src/Import/WallabagV2Import.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/WallabagV2Import.php rename to src/Import/WallabagV2Import.php diff --git a/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php b/src/Mailer/AuthCodeMailer.php similarity index 100% rename from src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php rename to src/Mailer/AuthCodeMailer.php diff --git a/src/Wallabag/CoreBundle/Mailer/UserMailer.php b/src/Mailer/UserMailer.php similarity index 100% rename from src/Wallabag/CoreBundle/Mailer/UserMailer.php rename to src/Mailer/UserMailer.php diff --git a/src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php b/src/Operator/Doctrine/Matches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php rename to src/Operator/Doctrine/Matches.php diff --git a/src/Wallabag/CoreBundle/Operator/Doctrine/NotMatches.php b/src/Operator/Doctrine/NotMatches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/Doctrine/NotMatches.php rename to src/Operator/Doctrine/NotMatches.php diff --git a/src/Wallabag/CoreBundle/Operator/PHP/Matches.php b/src/Operator/PHP/Matches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/PHP/Matches.php rename to src/Operator/PHP/Matches.php diff --git a/src/Wallabag/CoreBundle/Operator/PHP/NotMatches.php b/src/Operator/PHP/NotMatches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/PHP/NotMatches.php rename to src/Operator/PHP/NotMatches.php diff --git a/src/Wallabag/CoreBundle/Operator/PHP/PatternMatches.php b/src/Operator/PHP/PatternMatches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/PHP/PatternMatches.php rename to src/Operator/PHP/PatternMatches.php diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php b/src/ParamConverter/UsernameFeedTokenConverter.php similarity index 100% rename from src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php rename to src/ParamConverter/UsernameFeedTokenConverter.php diff --git a/src/Wallabag/CoreBundle/Redis/Producer.php b/src/Redis/Producer.php similarity index 100% rename from src/Wallabag/CoreBundle/Redis/Producer.php rename to src/Redis/Producer.php diff --git a/src/Wallabag/CoreBundle/Repository/AnnotationRepository.php b/src/Repository/AnnotationRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/AnnotationRepository.php rename to src/Repository/AnnotationRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php b/src/Repository/Api/ClientRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php rename to src/Repository/Api/ClientRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/ConfigRepository.php b/src/Repository/ConfigRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/ConfigRepository.php rename to src/Repository/ConfigRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Repository/EntryRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/EntryRepository.php rename to src/Repository/EntryRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/IgnoreOriginInstanceRuleRepository.php b/src/Repository/IgnoreOriginInstanceRuleRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/IgnoreOriginInstanceRuleRepository.php rename to src/Repository/IgnoreOriginInstanceRuleRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/IgnoreOriginUserRuleRepository.php b/src/Repository/IgnoreOriginUserRuleRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/IgnoreOriginUserRuleRepository.php rename to src/Repository/IgnoreOriginUserRuleRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php b/src/Repository/SiteCredentialRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php rename to src/Repository/SiteCredentialRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Repository/TagRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/TagRepository.php rename to src/Repository/TagRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/TaggingRuleRepository.php b/src/Repository/TaggingRuleRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/TaggingRuleRepository.php rename to src/Repository/TaggingRuleRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/UserRepository.php b/src/Repository/UserRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/UserRepository.php rename to src/Repository/UserRepository.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/ArraySiteConfigBuilder.php b/src/SiteConfig/ArraySiteConfigBuilder.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/ArraySiteConfigBuilder.php rename to src/SiteConfig/ArraySiteConfigBuilder.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/Authenticator/Authenticator.php b/src/SiteConfig/Authenticator/Authenticator.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/Authenticator/Authenticator.php rename to src/SiteConfig/Authenticator/Authenticator.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/Authenticator/Factory.php b/src/SiteConfig/Authenticator/Factory.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/Authenticator/Factory.php rename to src/SiteConfig/Authenticator/Factory.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/Authenticator/LoginFormAuthenticator.php b/src/SiteConfig/Authenticator/LoginFormAuthenticator.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/Authenticator/LoginFormAuthenticator.php rename to src/SiteConfig/Authenticator/LoginFormAuthenticator.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php b/src/SiteConfig/GrabySiteConfigBuilder.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php rename to src/SiteConfig/GrabySiteConfigBuilder.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/SiteConfig.php b/src/SiteConfig/SiteConfig.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/SiteConfig.php rename to src/SiteConfig/SiteConfig.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/SiteConfigBuilder.php b/src/SiteConfig/SiteConfigBuilder.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/SiteConfigBuilder.php rename to src/SiteConfig/SiteConfigBuilder.php diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Tools/Utils.php similarity index 100% rename from src/Wallabag/CoreBundle/Tools/Utils.php rename to src/Tools/Utils.php diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Twig/WallabagExtension.php similarity index 100% rename from src/Wallabag/CoreBundle/Twig/WallabagExtension.php rename to src/Twig/WallabagExtension.php diff --git a/src/Wallabag/CoreBundle/WallabagCoreBundle.php b/src/WallabagCoreBundle.php similarity index 100% rename from src/Wallabag/CoreBundle/WallabagCoreBundle.php rename to src/WallabagCoreBundle.php From 24da70e338520a7fa0cd841a3f83df9cd40b8c55 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 19 Feb 2024 00:45:58 +0100 Subject: [PATCH 2/7] Move test files directly under tests/ directory --- composer.json | 2 +- phpstan-baseline.neon | 2 +- .../Command/CleanDuplicatesCommandTest.php | 0 .../CoreBundle => }/Command/ExportCommandTest.php | 0 .../Command/GenerateUrlHashesCommandTest.php | 0 .../Command/Import/ImportCommandTest.php | 4 ++-- .../Command/Import/RedisWorkerCommandTest.php | 0 .../CoreBundle => }/Command/InstallCommandTest.php | 0 .../CoreBundle => }/Command/ListUserCommandTest.php | 0 .../Command/ReloadEntryCommandTest.php | 0 .../CoreBundle => }/Command/ShowUserCommandTest.php | 0 .../CoreBundle => }/Command/TagAllCommandTest.php | 0 .../Command/UpdatePicturesPathCommandTest.php | 0 .../Consumer/AMQPEntryConsumerTest.php | 0 .../Consumer/RedisEntryConsumerTest.php | 0 .../Controller/AnnotationControllerTest.php | 0 .../Controller/Api/ConfigRestControllerTest.php | 0 .../Controller/Api/DeveloperControllerTest.php | 0 .../Controller/Api/EntryRestControllerTest.php | 0 .../Controller/Api/SearchRestControllerTest.php | 0 .../Controller/Api/TagRestControllerTest.php | 0 .../Api/TaggingRuleRestControllerTest.php | 0 .../Controller/Api/UserRestControllerTest.php | 0 .../Controller/Api/WallabagApiTestCase.php | 0 .../Controller/Api/WallabagRestControllerTest.php | 0 .../Controller/ConfigControllerTest.php | 0 .../Controller/EntryControllerTest.php | 0 .../Controller/ExportControllerTest.php | 0 .../Controller/FeedControllerTest.php | 0 .../IgnoreOriginInstanceRuleControllerTest.php | 0 .../Controller/Import/ChromeControllerTest.php | 0 .../Controller/Import/DeliciousControllerTest.php | 0 .../Controller/Import/ElcuratorControllerTest.php | 0 .../Controller/Import/FirefoxControllerTest.php | 0 .../Controller/Import/ImportControllerTest.php | 0 .../Controller/Import/InstapaperControllerTest.php | 0 .../Controller/Import/PinboardControllerTest.php | 0 .../Controller/Import/PocketControllerTest.php | 0 .../Controller/Import/PocketHtmlControllerTest.php | 0 .../Controller/Import/ReadabilityControllerTest.php | 0 .../Controller/Import/ShaarliControllerTest.php | 0 .../Controller/Import/WallabagV1ControllerTest.php | 0 .../Controller/Import/WallabagV2ControllerTest.php | 0 .../Controller/SecurityControllerTest.php | 0 .../Controller/SettingsControllerTest.php | 0 .../Controller/SiteCredentialControllerTest.php | 0 .../Controller/StaticControllerTest.php | 0 .../Controller/TagControllerTest.php | 0 .../Controller/UserControllerTest.php | 0 .../{Wallabag/CoreBundle => }/Entity/EntryTest.php | 0 .../Listener/AuthenticationFailureListenerTest.php | 0 .../Event/Listener/CreateConfigListenerTest.php | 0 .../Event/Listener/LocaleListenerTest.php | 0 .../Event/Listener/UserLocaleListenerTest.php | 0 .../Event/Subscriber/TablePrefixSubscriberTest.php | 0 .../DataTransformer/StringToListTransformerTest.php | 0 .../Guzzle/AuthenticatorSubscriberTest.php | 0 .../FixupMondeDiplomatiqueUriSubscriberTest.php | 0 .../CoreBundle => }/Helper/ContentProxyTest.php | 0 .../CoreBundle => }/Helper/CryptoProxyTest.php | 0 .../CoreBundle => }/Helper/DownloadImagesTest.php | 0 .../CoreBundle => }/Helper/RedirectTest.php | 0 .../Helper/RuleBasedIgnoreOriginProcessorTest.php | 0 .../CoreBundle => }/Helper/RuleBasedTaggerTest.php | 0 .../CoreBundle => }/Helper/TagsAssignerTest.php | 0 .../CoreBundle => }/Import/ChromeImportTest.php | 0 .../CoreBundle => }/Import/FirefoxImportTest.php | 0 .../CoreBundle => }/Import/ImportChainTest.php | 0 .../Import/ImportCompilerPassTest.php | 0 .../CoreBundle => }/Import/InstapaperImportTest.php | 0 .../CoreBundle => }/Import/PocketHtmlImportTest.php | 0 .../CoreBundle => }/Import/PocketImportTest.php | 0 .../Import/ReadabilityImportTest.php | 0 .../CoreBundle => }/Import/ShaarliImportTest.php | 0 .../CoreBundle => }/Import/WallabagV1ImportTest.php | 0 .../CoreBundle => }/Import/WallabagV2ImportTest.php | 0 .../CoreBundle => }/Mailer/AuthCodeMailerTest.php | 0 .../UsernameFeedTokenConverterTest.php | 0 .../SiteConfig/ArraySiteConfigBuilderTest.php | 0 .../Authenticator/LoginFormAuthenticatorTest.php | 0 .../SiteConfig/GrabySiteConfigBuilderTest.php | 0 .../CoreBundle => }/SiteConfig/SiteConfigTest.php | 0 tests/{Wallabag/CoreBundle => }/Tools/UtilsTest.php | 0 .../{Wallabag/CoreBundle => }/Tools/samples/README | 0 .../CoreBundle => }/Tools/samples/chinese.txt | 0 .../CoreBundle => }/Tools/samples/cyrillic.txt | 0 .../CoreBundle => }/Tools/samples/greek.txt | 0 .../CoreBundle => }/Tools/samples/japanese.txt | 0 .../CoreBundle => }/Tools/samples/korean.txt | 0 .../CoreBundle => }/Tools/samples/latin.txt | 0 .../CoreBundle => }/Twig/WallabagExtensionTest.php | 0 .../CoreBundle => }/WallabagCoreTestCase.php | 0 .../fixtures/Import/chrome-bookmarks | 0 .../Import/delicious_export.2021.02.06_21.10.json | 0 .../CoreBundle => }/fixtures/Import/elcurator.json | 0 .../fixtures/Import/firefox-bookmarks.json | 0 .../fixtures/Import/instapaper-export.csv | 0 .../CoreBundle => }/fixtures/Import/pinboard_export | 0 .../fixtures/Import/readability-read.json | 0 .../fixtures/Import/readability.json | 0 .../CoreBundle => }/fixtures/Import/ril_export.html | 0 .../fixtures/Import/shaarli-bookmarks.html | 0 .../CoreBundle => }/fixtures/Import/test.html | 0 .../CoreBundle => }/fixtures/Import/test.txt | 0 .../CoreBundle => }/fixtures/Import/unnamed.png | Bin .../fixtures/Import/wallabag-v1-read.json | 0 .../fixtures/Import/wallabag-v1.json | 0 .../fixtures/Import/wallabag-v2-empty.json | 0 .../fixtures/Import/wallabag-v2-read.json | 0 .../fixtures/Import/wallabag-v2.json | 0 .../CoreBundle => }/fixtures/aoc.media.html | 0 .../fixtures/image-no-content-type.jpg | Bin .../CoreBundle => }/fixtures/modal-content.svg | 0 .../fixtures/nextinpact-article.html | 0 .../CoreBundle => }/fixtures/nextinpact-login.html | 0 .../fixtures/tagging_rules_admin.json | 0 .../{Wallabag/CoreBundle => }/fixtures/unnamed.png | Bin 117 files changed, 4 insertions(+), 4 deletions(-) rename tests/{Wallabag/CoreBundle => }/Command/CleanDuplicatesCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/ExportCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/GenerateUrlHashesCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/Import/ImportCommandTest.php (93%) rename tests/{Wallabag/CoreBundle => }/Command/Import/RedisWorkerCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/InstallCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/ListUserCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/ReloadEntryCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/ShowUserCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/TagAllCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Command/UpdatePicturesPathCommandTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Consumer/AMQPEntryConsumerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Consumer/RedisEntryConsumerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/AnnotationControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/ConfigRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/DeveloperControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/EntryRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/SearchRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/TagRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/TaggingRuleRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/UserRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/WallabagApiTestCase.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Api/WallabagRestControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/ConfigControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/EntryControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/ExportControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/FeedControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/IgnoreOriginInstanceRuleControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/ChromeControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/DeliciousControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/ElcuratorControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/FirefoxControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/ImportControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/InstapaperControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/PinboardControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/PocketControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/PocketHtmlControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/ReadabilityControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/ShaarliControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/WallabagV1ControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/Import/WallabagV2ControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/SecurityControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/SettingsControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/SiteCredentialControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/StaticControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/TagControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Controller/UserControllerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Entity/EntryTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Event/Listener/AuthenticationFailureListenerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Event/Listener/CreateConfigListenerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Event/Listener/LocaleListenerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Event/Listener/UserLocaleListenerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Event/Subscriber/TablePrefixSubscriberTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Form/DataTransformer/StringToListTransformerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Guzzle/AuthenticatorSubscriberTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/ContentProxyTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/CryptoProxyTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/DownloadImagesTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/RedirectTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/RuleBasedIgnoreOriginProcessorTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/RuleBasedTaggerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Helper/TagsAssignerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/ChromeImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/FirefoxImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/ImportChainTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/ImportCompilerPassTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/InstapaperImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/PocketHtmlImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/PocketImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/ReadabilityImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/ShaarliImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/WallabagV1ImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Import/WallabagV2ImportTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Mailer/AuthCodeMailerTest.php (100%) rename tests/{Wallabag/CoreBundle => }/ParamConverter/UsernameFeedTokenConverterTest.php (100%) rename tests/{Wallabag/CoreBundle => }/SiteConfig/ArraySiteConfigBuilderTest.php (100%) rename tests/{Wallabag/CoreBundle => }/SiteConfig/Authenticator/LoginFormAuthenticatorTest.php (100%) rename tests/{Wallabag/CoreBundle => }/SiteConfig/GrabySiteConfigBuilderTest.php (100%) rename tests/{Wallabag/CoreBundle => }/SiteConfig/SiteConfigTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Tools/UtilsTest.php (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/README (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/chinese.txt (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/cyrillic.txt (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/greek.txt (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/japanese.txt (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/korean.txt (100%) rename tests/{Wallabag/CoreBundle => }/Tools/samples/latin.txt (100%) rename tests/{Wallabag/CoreBundle => }/Twig/WallabagExtensionTest.php (100%) rename tests/{Wallabag/CoreBundle => }/WallabagCoreTestCase.php (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/chrome-bookmarks (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/delicious_export.2021.02.06_21.10.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/elcurator.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/firefox-bookmarks.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/instapaper-export.csv (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/pinboard_export (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/readability-read.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/readability.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/ril_export.html (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/shaarli-bookmarks.html (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/test.html (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/test.txt (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/unnamed.png (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/wallabag-v1-read.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/wallabag-v1.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/wallabag-v2-empty.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/wallabag-v2-read.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/Import/wallabag-v2.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/aoc.media.html (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/image-no-content-type.jpg (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/modal-content.svg (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/nextinpact-article.html (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/nextinpact-login.html (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/tagging_rules_admin.json (100%) rename tests/{Wallabag/CoreBundle => }/fixtures/unnamed.png (100%) diff --git a/composer.json b/composer.json index dab745dc2..d7f8e7751 100644 --- a/composer.json +++ b/composer.json @@ -200,7 +200,7 @@ }, "autoload-dev": { "psr-4": { - "Tests\\": "tests/" + "Tests\\Wallabag\\CoreBundle\\": "tests/" }, "files": [ "tests/functions.php" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 57b935b4e..48987c3a2 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -73,4 +73,4 @@ parameters: - message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#" count: 1 - path: tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php + path: tests/Controller/FeedControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Command/CleanDuplicatesCommandTest.php b/tests/Command/CleanDuplicatesCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/CleanDuplicatesCommandTest.php rename to tests/Command/CleanDuplicatesCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php b/tests/Command/ExportCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/ExportCommandTest.php rename to tests/Command/ExportCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/GenerateUrlHashesCommandTest.php b/tests/Command/GenerateUrlHashesCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/GenerateUrlHashesCommandTest.php rename to tests/Command/GenerateUrlHashesCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/Import/ImportCommandTest.php b/tests/Command/Import/ImportCommandTest.php similarity index 93% rename from tests/Wallabag/CoreBundle/Command/Import/ImportCommandTest.php rename to tests/Command/Import/ImportCommandTest.php index 44b930e16..5f112acf4 100644 --- a/tests/Wallabag/CoreBundle/Command/Import/ImportCommandTest.php +++ b/tests/Command/Import/ImportCommandTest.php @@ -64,7 +64,7 @@ class ImportCommandTest extends WallabagCoreTestCase $tester = new CommandTester($command); $tester->execute([ 'username' => 'admin', - 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2-read.json', + 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/fixtures/Import/wallabag-v2-read.json', '--importer' => 'v2', ]); @@ -83,7 +83,7 @@ class ImportCommandTest extends WallabagCoreTestCase $tester = new CommandTester($command); $tester->execute([ 'username' => $this->getLoggedInUserId(), - 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2-read.json', + 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/fixtures/Import/wallabag-v2-read.json', '--useUserId' => true, '--importer' => 'v2', ]); diff --git a/tests/Wallabag/CoreBundle/Command/Import/RedisWorkerCommandTest.php b/tests/Command/Import/RedisWorkerCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/Import/RedisWorkerCommandTest.php rename to tests/Command/Import/RedisWorkerCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php b/tests/Command/InstallCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/InstallCommandTest.php rename to tests/Command/InstallCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/ListUserCommandTest.php b/tests/Command/ListUserCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/ListUserCommandTest.php rename to tests/Command/ListUserCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php b/tests/Command/ReloadEntryCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php rename to tests/Command/ReloadEntryCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php b/tests/Command/ShowUserCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/ShowUserCommandTest.php rename to tests/Command/ShowUserCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php b/tests/Command/TagAllCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php rename to tests/Command/TagAllCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Command/UpdatePicturesPathCommandTest.php b/tests/Command/UpdatePicturesPathCommandTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Command/UpdatePicturesPathCommandTest.php rename to tests/Command/UpdatePicturesPathCommandTest.php diff --git a/tests/Wallabag/CoreBundle/Consumer/AMQPEntryConsumerTest.php b/tests/Consumer/AMQPEntryConsumerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Consumer/AMQPEntryConsumerTest.php rename to tests/Consumer/AMQPEntryConsumerTest.php diff --git a/tests/Wallabag/CoreBundle/Consumer/RedisEntryConsumerTest.php b/tests/Consumer/RedisEntryConsumerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Consumer/RedisEntryConsumerTest.php rename to tests/Consumer/RedisEntryConsumerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/AnnotationControllerTest.php b/tests/Controller/AnnotationControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/AnnotationControllerTest.php rename to tests/Controller/AnnotationControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/ConfigRestControllerTest.php b/tests/Controller/Api/ConfigRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/ConfigRestControllerTest.php rename to tests/Controller/Api/ConfigRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/DeveloperControllerTest.php b/tests/Controller/Api/DeveloperControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/DeveloperControllerTest.php rename to tests/Controller/Api/DeveloperControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/EntryRestControllerTest.php b/tests/Controller/Api/EntryRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/EntryRestControllerTest.php rename to tests/Controller/Api/EntryRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/SearchRestControllerTest.php b/tests/Controller/Api/SearchRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/SearchRestControllerTest.php rename to tests/Controller/Api/SearchRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/TagRestControllerTest.php b/tests/Controller/Api/TagRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/TagRestControllerTest.php rename to tests/Controller/Api/TagRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestControllerTest.php b/tests/Controller/Api/TaggingRuleRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestControllerTest.php rename to tests/Controller/Api/TaggingRuleRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/UserRestControllerTest.php b/tests/Controller/Api/UserRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/UserRestControllerTest.php rename to tests/Controller/Api/UserRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/WallabagApiTestCase.php b/tests/Controller/Api/WallabagApiTestCase.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/WallabagApiTestCase.php rename to tests/Controller/Api/WallabagApiTestCase.php diff --git a/tests/Wallabag/CoreBundle/Controller/Api/WallabagRestControllerTest.php b/tests/Controller/Api/WallabagRestControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Api/WallabagRestControllerTest.php rename to tests/Controller/Api/WallabagRestControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Controller/ConfigControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php rename to tests/Controller/ConfigControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Controller/EntryControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php rename to tests/Controller/EntryControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php b/tests/Controller/ExportControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php rename to tests/Controller/ExportControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php b/tests/Controller/FeedControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php rename to tests/Controller/FeedControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleControllerTest.php b/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleControllerTest.php rename to tests/Controller/IgnoreOriginInstanceRuleControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/ChromeControllerTest.php b/tests/Controller/Import/ChromeControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/ChromeControllerTest.php rename to tests/Controller/Import/ChromeControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/DeliciousControllerTest.php b/tests/Controller/Import/DeliciousControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/DeliciousControllerTest.php rename to tests/Controller/Import/DeliciousControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/ElcuratorControllerTest.php b/tests/Controller/Import/ElcuratorControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/ElcuratorControllerTest.php rename to tests/Controller/Import/ElcuratorControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/FirefoxControllerTest.php b/tests/Controller/Import/FirefoxControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/FirefoxControllerTest.php rename to tests/Controller/Import/FirefoxControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/ImportControllerTest.php b/tests/Controller/Import/ImportControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/ImportControllerTest.php rename to tests/Controller/Import/ImportControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/InstapaperControllerTest.php b/tests/Controller/Import/InstapaperControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/InstapaperControllerTest.php rename to tests/Controller/Import/InstapaperControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/PinboardControllerTest.php b/tests/Controller/Import/PinboardControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/PinboardControllerTest.php rename to tests/Controller/Import/PinboardControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/PocketControllerTest.php b/tests/Controller/Import/PocketControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/PocketControllerTest.php rename to tests/Controller/Import/PocketControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/PocketHtmlControllerTest.php b/tests/Controller/Import/PocketHtmlControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/PocketHtmlControllerTest.php rename to tests/Controller/Import/PocketHtmlControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/ReadabilityControllerTest.php b/tests/Controller/Import/ReadabilityControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/ReadabilityControllerTest.php rename to tests/Controller/Import/ReadabilityControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/ShaarliControllerTest.php b/tests/Controller/Import/ShaarliControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/ShaarliControllerTest.php rename to tests/Controller/Import/ShaarliControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/WallabagV1ControllerTest.php b/tests/Controller/Import/WallabagV1ControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/WallabagV1ControllerTest.php rename to tests/Controller/Import/WallabagV1ControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/Import/WallabagV2ControllerTest.php b/tests/Controller/Import/WallabagV2ControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/Import/WallabagV2ControllerTest.php rename to tests/Controller/Import/WallabagV2ControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php b/tests/Controller/SecurityControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php rename to tests/Controller/SecurityControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php b/tests/Controller/SettingsControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php rename to tests/Controller/SettingsControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/SiteCredentialControllerTest.php b/tests/Controller/SiteCredentialControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/SiteCredentialControllerTest.php rename to tests/Controller/SiteCredentialControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php b/tests/Controller/StaticControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php rename to tests/Controller/StaticControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Controller/TagControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/TagControllerTest.php rename to tests/Controller/TagControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Controller/UserControllerTest.php b/tests/Controller/UserControllerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Controller/UserControllerTest.php rename to tests/Controller/UserControllerTest.php diff --git a/tests/Wallabag/CoreBundle/Entity/EntryTest.php b/tests/Entity/EntryTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Entity/EntryTest.php rename to tests/Entity/EntryTest.php diff --git a/tests/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListenerTest.php b/tests/Event/Listener/AuthenticationFailureListenerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListenerTest.php rename to tests/Event/Listener/AuthenticationFailureListenerTest.php diff --git a/tests/Wallabag/CoreBundle/Event/Listener/CreateConfigListenerTest.php b/tests/Event/Listener/CreateConfigListenerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Event/Listener/CreateConfigListenerTest.php rename to tests/Event/Listener/CreateConfigListenerTest.php diff --git a/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php b/tests/Event/Listener/LocaleListenerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php rename to tests/Event/Listener/LocaleListenerTest.php diff --git a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php b/tests/Event/Listener/UserLocaleListenerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php rename to tests/Event/Listener/UserLocaleListenerTest.php diff --git a/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php b/tests/Event/Subscriber/TablePrefixSubscriberTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php rename to tests/Event/Subscriber/TablePrefixSubscriberTest.php diff --git a/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php b/tests/Form/DataTransformer/StringToListTransformerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php rename to tests/Form/DataTransformer/StringToListTransformerTest.php diff --git a/tests/Wallabag/CoreBundle/Guzzle/AuthenticatorSubscriberTest.php b/tests/Guzzle/AuthenticatorSubscriberTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Guzzle/AuthenticatorSubscriberTest.php rename to tests/Guzzle/AuthenticatorSubscriberTest.php diff --git a/tests/Wallabag/CoreBundle/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php b/tests/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php rename to tests/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Helper/ContentProxyTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php rename to tests/Helper/ContentProxyTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php b/tests/Helper/CryptoProxyTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/CryptoProxyTest.php rename to tests/Helper/CryptoProxyTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Helper/DownloadImagesTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php rename to tests/Helper/DownloadImagesTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Helper/RedirectTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/RedirectTest.php rename to tests/Helper/RedirectTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php b/tests/Helper/RuleBasedIgnoreOriginProcessorTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php rename to tests/Helper/RuleBasedIgnoreOriginProcessorTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php b/tests/Helper/RuleBasedTaggerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php rename to tests/Helper/RuleBasedTaggerTest.php diff --git a/tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php b/tests/Helper/TagsAssignerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Helper/TagsAssignerTest.php rename to tests/Helper/TagsAssignerTest.php diff --git a/tests/Wallabag/CoreBundle/Import/ChromeImportTest.php b/tests/Import/ChromeImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/ChromeImportTest.php rename to tests/Import/ChromeImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/FirefoxImportTest.php b/tests/Import/FirefoxImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/FirefoxImportTest.php rename to tests/Import/FirefoxImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/ImportChainTest.php b/tests/Import/ImportChainTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/ImportChainTest.php rename to tests/Import/ImportChainTest.php diff --git a/tests/Wallabag/CoreBundle/Import/ImportCompilerPassTest.php b/tests/Import/ImportCompilerPassTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/ImportCompilerPassTest.php rename to tests/Import/ImportCompilerPassTest.php diff --git a/tests/Wallabag/CoreBundle/Import/InstapaperImportTest.php b/tests/Import/InstapaperImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/InstapaperImportTest.php rename to tests/Import/InstapaperImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/PocketHtmlImportTest.php b/tests/Import/PocketHtmlImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/PocketHtmlImportTest.php rename to tests/Import/PocketHtmlImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/PocketImportTest.php b/tests/Import/PocketImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/PocketImportTest.php rename to tests/Import/PocketImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/ReadabilityImportTest.php b/tests/Import/ReadabilityImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/ReadabilityImportTest.php rename to tests/Import/ReadabilityImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/ShaarliImportTest.php b/tests/Import/ShaarliImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/ShaarliImportTest.php rename to tests/Import/ShaarliImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/WallabagV1ImportTest.php b/tests/Import/WallabagV1ImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/WallabagV1ImportTest.php rename to tests/Import/WallabagV1ImportTest.php diff --git a/tests/Wallabag/CoreBundle/Import/WallabagV2ImportTest.php b/tests/Import/WallabagV2ImportTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Import/WallabagV2ImportTest.php rename to tests/Import/WallabagV2ImportTest.php diff --git a/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php b/tests/Mailer/AuthCodeMailerTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php rename to tests/Mailer/AuthCodeMailerTest.php diff --git a/tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php b/tests/ParamConverter/UsernameFeedTokenConverterTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php rename to tests/ParamConverter/UsernameFeedTokenConverterTest.php diff --git a/tests/Wallabag/CoreBundle/SiteConfig/ArraySiteConfigBuilderTest.php b/tests/SiteConfig/ArraySiteConfigBuilderTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/SiteConfig/ArraySiteConfigBuilderTest.php rename to tests/SiteConfig/ArraySiteConfigBuilderTest.php diff --git a/tests/Wallabag/CoreBundle/SiteConfig/Authenticator/LoginFormAuthenticatorTest.php b/tests/SiteConfig/Authenticator/LoginFormAuthenticatorTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/SiteConfig/Authenticator/LoginFormAuthenticatorTest.php rename to tests/SiteConfig/Authenticator/LoginFormAuthenticatorTest.php diff --git a/tests/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilderTest.php b/tests/SiteConfig/GrabySiteConfigBuilderTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilderTest.php rename to tests/SiteConfig/GrabySiteConfigBuilderTest.php diff --git a/tests/Wallabag/CoreBundle/SiteConfig/SiteConfigTest.php b/tests/SiteConfig/SiteConfigTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/SiteConfig/SiteConfigTest.php rename to tests/SiteConfig/SiteConfigTest.php diff --git a/tests/Wallabag/CoreBundle/Tools/UtilsTest.php b/tests/Tools/UtilsTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/UtilsTest.php rename to tests/Tools/UtilsTest.php diff --git a/tests/Wallabag/CoreBundle/Tools/samples/README b/tests/Tools/samples/README similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/README rename to tests/Tools/samples/README diff --git a/tests/Wallabag/CoreBundle/Tools/samples/chinese.txt b/tests/Tools/samples/chinese.txt similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/chinese.txt rename to tests/Tools/samples/chinese.txt diff --git a/tests/Wallabag/CoreBundle/Tools/samples/cyrillic.txt b/tests/Tools/samples/cyrillic.txt similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/cyrillic.txt rename to tests/Tools/samples/cyrillic.txt diff --git a/tests/Wallabag/CoreBundle/Tools/samples/greek.txt b/tests/Tools/samples/greek.txt similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/greek.txt rename to tests/Tools/samples/greek.txt diff --git a/tests/Wallabag/CoreBundle/Tools/samples/japanese.txt b/tests/Tools/samples/japanese.txt similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/japanese.txt rename to tests/Tools/samples/japanese.txt diff --git a/tests/Wallabag/CoreBundle/Tools/samples/korean.txt b/tests/Tools/samples/korean.txt similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/korean.txt rename to tests/Tools/samples/korean.txt diff --git a/tests/Wallabag/CoreBundle/Tools/samples/latin.txt b/tests/Tools/samples/latin.txt similarity index 100% rename from tests/Wallabag/CoreBundle/Tools/samples/latin.txt rename to tests/Tools/samples/latin.txt diff --git a/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php b/tests/Twig/WallabagExtensionTest.php similarity index 100% rename from tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php rename to tests/Twig/WallabagExtensionTest.php diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/WallabagCoreTestCase.php similarity index 100% rename from tests/Wallabag/CoreBundle/WallabagCoreTestCase.php rename to tests/WallabagCoreTestCase.php diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/chrome-bookmarks b/tests/fixtures/Import/chrome-bookmarks similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/chrome-bookmarks rename to tests/fixtures/Import/chrome-bookmarks diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/delicious_export.2021.02.06_21.10.json b/tests/fixtures/Import/delicious_export.2021.02.06_21.10.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/delicious_export.2021.02.06_21.10.json rename to tests/fixtures/Import/delicious_export.2021.02.06_21.10.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/elcurator.json b/tests/fixtures/Import/elcurator.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/elcurator.json rename to tests/fixtures/Import/elcurator.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/firefox-bookmarks.json b/tests/fixtures/Import/firefox-bookmarks.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/firefox-bookmarks.json rename to tests/fixtures/Import/firefox-bookmarks.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/instapaper-export.csv b/tests/fixtures/Import/instapaper-export.csv similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/instapaper-export.csv rename to tests/fixtures/Import/instapaper-export.csv diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/pinboard_export b/tests/fixtures/Import/pinboard_export similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/pinboard_export rename to tests/fixtures/Import/pinboard_export diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/readability-read.json b/tests/fixtures/Import/readability-read.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/readability-read.json rename to tests/fixtures/Import/readability-read.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/readability.json b/tests/fixtures/Import/readability.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/readability.json rename to tests/fixtures/Import/readability.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/ril_export.html b/tests/fixtures/Import/ril_export.html similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/ril_export.html rename to tests/fixtures/Import/ril_export.html diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/shaarli-bookmarks.html b/tests/fixtures/Import/shaarli-bookmarks.html similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/shaarli-bookmarks.html rename to tests/fixtures/Import/shaarli-bookmarks.html diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/test.html b/tests/fixtures/Import/test.html similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/test.html rename to tests/fixtures/Import/test.html diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/test.txt b/tests/fixtures/Import/test.txt similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/test.txt rename to tests/fixtures/Import/test.txt diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/unnamed.png b/tests/fixtures/Import/unnamed.png similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/unnamed.png rename to tests/fixtures/Import/unnamed.png diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v1-read.json b/tests/fixtures/Import/wallabag-v1-read.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v1-read.json rename to tests/fixtures/Import/wallabag-v1-read.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v1.json b/tests/fixtures/Import/wallabag-v1.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v1.json rename to tests/fixtures/Import/wallabag-v1.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2-empty.json b/tests/fixtures/Import/wallabag-v2-empty.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2-empty.json rename to tests/fixtures/Import/wallabag-v2-empty.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2-read.json b/tests/fixtures/Import/wallabag-v2-read.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2-read.json rename to tests/fixtures/Import/wallabag-v2-read.json diff --git a/tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2.json b/tests/fixtures/Import/wallabag-v2.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/Import/wallabag-v2.json rename to tests/fixtures/Import/wallabag-v2.json diff --git a/tests/Wallabag/CoreBundle/fixtures/aoc.media.html b/tests/fixtures/aoc.media.html similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/aoc.media.html rename to tests/fixtures/aoc.media.html diff --git a/tests/Wallabag/CoreBundle/fixtures/image-no-content-type.jpg b/tests/fixtures/image-no-content-type.jpg similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/image-no-content-type.jpg rename to tests/fixtures/image-no-content-type.jpg diff --git a/tests/Wallabag/CoreBundle/fixtures/modal-content.svg b/tests/fixtures/modal-content.svg similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/modal-content.svg rename to tests/fixtures/modal-content.svg diff --git a/tests/Wallabag/CoreBundle/fixtures/nextinpact-article.html b/tests/fixtures/nextinpact-article.html similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/nextinpact-article.html rename to tests/fixtures/nextinpact-article.html diff --git a/tests/Wallabag/CoreBundle/fixtures/nextinpact-login.html b/tests/fixtures/nextinpact-login.html similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/nextinpact-login.html rename to tests/fixtures/nextinpact-login.html diff --git a/tests/Wallabag/CoreBundle/fixtures/tagging_rules_admin.json b/tests/fixtures/tagging_rules_admin.json similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/tagging_rules_admin.json rename to tests/fixtures/tagging_rules_admin.json diff --git a/tests/Wallabag/CoreBundle/fixtures/unnamed.png b/tests/fixtures/unnamed.png similarity index 100% rename from tests/Wallabag/CoreBundle/fixtures/unnamed.png rename to tests/fixtures/unnamed.png From 6879bb2435a56061abed5ba9277824bb27b90999 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 19 Feb 2024 00:53:59 +0100 Subject: [PATCH 3/7] Register ImportCompilerPass in AppKernel --- app/AppKernel.php | 6 ++++++ src/WallabagCoreBundle.php | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index d161a9b9f..286cfb699 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -3,6 +3,7 @@ use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel; +use Wallabag\CoreBundle\Import\ImportCompilerPass; class AppKernel extends Kernel { @@ -98,6 +99,11 @@ class AppKernel extends Kernel }); } + protected function build(ContainerBuilder $container) + { + $container->addCompilerPass(new ImportCompilerPass()); + } + private function processDatabaseParameters(ContainerBuilder $container) { switch ($container->getParameter('database_driver')) { diff --git a/src/WallabagCoreBundle.php b/src/WallabagCoreBundle.php index e6fae41a1..f5899e39c 100644 --- a/src/WallabagCoreBundle.php +++ b/src/WallabagCoreBundle.php @@ -2,16 +2,8 @@ namespace Wallabag\CoreBundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; -use Wallabag\CoreBundle\Import\ImportCompilerPass; class WallabagCoreBundle extends Bundle { - public function build(ContainerBuilder $container) - { - parent::build($container); - - $container->addCompilerPass(new ImportCompilerPass()); - } } From 09ef700fda3c012da98023bfc6fe4f8a2e0deda5 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 19 Feb 2024 00:58:19 +0100 Subject: [PATCH 4/7] Use parameters directly instead of bundle config --- app/config/wallabag.yml | 42 +++++----- src/DependencyInjection/Configuration.php | 76 +------------------ .../WallabagCoreExtension.php | 23 ------ 3 files changed, 22 insertions(+), 119 deletions(-) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 954fa7879..67b927c4d 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,7 +1,7 @@ -wallabag_core: - version: 2.6.8 - paypal_url: "https://liberapay.com/wallabag/donate" - languages: +parameters: + wallabag_core.version: 2.6.8 + wallabag_core.paypal_url: "https://liberapay.com/wallabag/donate" + wallabag_core.languages: en: 'English' fr: 'Français' de: 'Deutsch' @@ -23,20 +23,20 @@ wallabag_core: hr: 'Hrvatski' cs: 'Čeština' el: 'Ελληνικά' - items_on_page: 12 - language: '%locale%' - rss_limit: 50 - reading_speed: 200 - cache_lifetime: 10 - action_mark_as_read: 1 - list_mode: 0 - display_thumbnails: 1 - fetching_error_message_title: 'No title found' - fetching_error_message: | + wallabag_core.items_on_page: 12 + wallabag_core.language: '%locale%' + wallabag_core.feed_limit: 50 + wallabag_core.reading_speed: 200 + wallabag_core.cache_lifetime: 10 + wallabag_core.action_mark_as_read: 1 + wallabag_core.list_mode: 0 + wallabag_core.display_thumbnails: 1 + wallabag_core.fetching_error_message_title: 'No title found' + wallabag_core.fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. - api_limit_mass_actions: 10 - encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" - default_internal_settings: + wallabag_core.api_limit_mass_actions: 10 + wallabag_core.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" + wallabag_core.default_internal_settings: - name: share_public value: 1 @@ -146,14 +146,14 @@ wallabag_core: value: 0 section: entry - default_ignore_origin_instance_rules: + wallabag_core.default_ignore_origin_instance_rules: - rule: host = "feedproxy.google.com" - rule: host = "feeds.reuters.com" - rule: _all ~ "https?://www\.lemonde\.fr/tiny.*" - fonts: + wallabag_core.fonts: - 'Sans-serif' - 'Serif' - 'Atkinson Hyperlegible' @@ -162,5 +162,5 @@ wallabag_core: - 'Montserrat' - 'OpenDyslexicRegular' - 'Oswald' - allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html'] - resource_dir: "%kernel.project_dir%/web/uploads/import" + wallabag_core.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html'] + wallabag_core.resource_dir: "%kernel.project_dir%/web/uploads/import" diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 104799ced..939e9459c 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -9,80 +9,6 @@ class Configuration implements ConfigurationInterface { public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder('wallabag_core'); - $rootNode = $treeBuilder->getRootNode(); - - $rootNode - ->children() - ->arrayNode('languages') - ->prototype('scalar')->end() - ->end() - ->integerNode('items_on_page') - ->defaultValue(12) - ->end() - ->scalarNode('language') - ->defaultValue('en') - ->end() - ->integerNode('rss_limit') - ->defaultValue(50) - ->end() - ->integerNode('reading_speed') - ->defaultValue(200) - ->end() - ->scalarNode('version') - ->end() - ->scalarNode('paypal_url') - ->end() - ->integerNode('cache_lifetime') - ->defaultValue(10) - ->end() - ->scalarNode('fetching_error_message') - ->end() - ->scalarNode('fetching_error_message_title') - ->end() - ->scalarNode('action_mark_as_read') - ->defaultValue(1) - ->end() - ->scalarNode('list_mode') - ->defaultValue(1) - ->end() - ->scalarNode('display_thumbnails') - ->defaultValue(1) - ->end() - ->scalarNode('api_limit_mass_actions') - ->defaultValue(10) - ->end() - ->arrayNode('default_internal_settings') - ->prototype('array') - ->children() - ->scalarNode('name')->end() - ->scalarNode('value')->end() - ->enumNode('section') - ->values(['entry', 'misc', 'api', 'analytics', 'export', 'import']) - ->end() - ->end() - ->end() - ->end() - ->scalarNode('encryption_key_path') - ->end() - ->arrayNode('default_ignore_origin_instance_rules') - ->prototype('array') - ->children() - ->scalarNode('rule')->end() - ->end() - ->end() - ->end() - ->arrayNode('fonts') - ->prototype('scalar')->end() - ->end() - ->arrayNode('allow_mimetypes') - ->prototype('scalar')->end() - ->end() - ->scalarNode('resource_dir') - ->end() - ->end() - ; - - return $treeBuilder; + return new TreeBuilder('wallabag_core'); } } diff --git a/src/DependencyInjection/WallabagCoreExtension.php b/src/DependencyInjection/WallabagCoreExtension.php index 754931681..a328eb922 100644 --- a/src/DependencyInjection/WallabagCoreExtension.php +++ b/src/DependencyInjection/WallabagCoreExtension.php @@ -9,29 +9,6 @@ class WallabagCoreExtension extends Extension { public function load(array $configs, ContainerBuilder $container) { - $configuration = new Configuration(); - $config = $this->processConfiguration($configuration, $configs); - - $container->setParameter('wallabag_core.languages', $config['languages']); - $container->setParameter('wallabag_core.items_on_page', $config['items_on_page']); - $container->setParameter('wallabag_core.language', $config['language']); - $container->setParameter('wallabag_core.feed_limit', $config['rss_limit']); - $container->setParameter('wallabag_core.reading_speed', $config['reading_speed']); - $container->setParameter('wallabag_core.version', $config['version']); - $container->setParameter('wallabag_core.paypal_url', $config['paypal_url']); - $container->setParameter('wallabag_core.cache_lifetime', $config['cache_lifetime']); - $container->setParameter('wallabag_core.action_mark_as_read', $config['action_mark_as_read']); - $container->setParameter('wallabag_core.list_mode', $config['list_mode']); - $container->setParameter('wallabag_core.display_thumbnails', $config['display_thumbnails']); - $container->setParameter('wallabag_core.fetching_error_message', $config['fetching_error_message']); - $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']); - $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']); - $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']); - $container->setParameter('wallabag_core.site_credentials.encryption_key_path', $config['encryption_key_path']); - $container->setParameter('wallabag_core.default_ignore_origin_instance_rules', $config['default_ignore_origin_instance_rules']); - $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() From fe039247b505dd1e6e4d98697ac5cd15947ef989 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 19 Feb 2024 01:03:08 +0100 Subject: [PATCH 5/7] Move to bundle-less --- app/AppKernel.php | 3 --- app/config/config.yml | 7 +++++++ app/config/routing.yml | 2 +- src/DependencyInjection/Configuration.php | 14 -------------- .../WallabagCoreExtension.php | 18 ------------------ src/WallabagCoreBundle.php | 9 --------- 6 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 src/DependencyInjection/Configuration.php delete mode 100644 src/DependencyInjection/WallabagCoreExtension.php delete mode 100644 src/WallabagCoreBundle.php diff --git a/app/AppKernel.php b/app/AppKernel.php index 286cfb699..ede8fec03 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -35,9 +35,6 @@ class AppKernel extends Kernel new Http\HttplugBundle\HttplugBundle(), new Sentry\SentryBundle\SentryBundle(), new Twig\Extra\TwigExtraBundle\TwigExtraBundle(), - - // wallabag bundles - new Wallabag\CoreBundle\WallabagCoreBundle(), ]; if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { diff --git a/app/config/config.yml b/app/config/config.yml index 2a2869c3a..3db473e98 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -68,6 +68,13 @@ doctrine: entity_managers: default: auto_mapping: true + mappings: + Wallabag: + type: annotation + is_bundle: false + dir: '%kernel.project_dir%/src/Entity' + prefix: 'Wallabag\CoreBundle\Entity' + alias: Wallabag stof_doctrine_extensions: default_locale: "%locale%" diff --git a/app/config/routing.yml b/app/config/routing.yml index 3cfaef516..fc5a501b1 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,5 +1,5 @@ app: - resource: "@WallabagCoreBundle/Controller/" + resource: ../../src/Controller/ type: annotation doc-api: diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php deleted file mode 100644 index 939e9459c..000000000 --- a/src/DependencyInjection/Configuration.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 19 Feb 2024 01:30:12 +0100 Subject: [PATCH 6/7] 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 @@ Date: Tue, 20 Feb 2024 00:47:53 +0100 Subject: [PATCH 7/7] Rename wallabag_core to wallabag --- RELEASE_PROCESS.md | 4 +- .../Version20190826204730.php | 2 +- .../Version20230728093912.php | 2 +- app/config/config.yml | 26 ++--- app/config/services.yml | 86 ++++++++--------- app/config/services_rabbit.yml | 24 ++--- app/config/services_redis.yml | 96 +++++++++---------- app/config/services_test.yml | 2 +- app/config/wallabag.yml | 40 ++++---- src/Command/Import/RedisWorkerCommand.php | 6 +- src/Controller/Api/EntryRestController.php | 4 +- src/Controller/Api/WallabagRestController.php | 4 +- src/Controller/EntryController.php | 2 +- src/Controller/FeedController.php | 8 +- src/Controller/Import/BrowserController.php | 6 +- src/Controller/Import/DeliciousController.php | 6 +- src/Controller/Import/HtmlController.php | 6 +- .../Import/InstapaperController.php | 6 +- src/Controller/Import/PinboardController.php | 6 +- .../Import/ReadabilityController.php | 6 +- src/Controller/Import/WallabagController.php | 6 +- src/Controller/StaticController.php | 4 +- .../IgnoreOriginInstanceRuleFixtures.php | 2 +- src/DataFixtures/InternalSettingFixtures.php | 2 +- src/Import/ImportCompilerPass.php | 2 +- tests/Command/ReloadEntryCommandTest.php | 6 +- .../Api/WallabagRestControllerTest.php | 2 +- tests/Controller/EntryControllerTest.php | 2 +- tests/Import/ImportCompilerPassTest.php | 2 +- 29 files changed, 185 insertions(+), 185 deletions(-) diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 30dc85411..c84d753a3 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li #### Prepare the release - Update these files with new information - - `app/config/wallabag.yml` (`wallabag_core.version`) + - `app/config/wallabag.yml` (`wallabag.version`) - `CHANGELOG.md` - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release". - Wait for test to be ok, merge it. @@ -19,7 +19,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports). - Update [website](https://github.com/wallabag/website) to change MD5 sum and create the release blog post (based on the changelog). - Update Dockerfile https://github.com/wallabag/docker (and create a new tag) -- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`) +- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag.version`) - Drink a :beer:! ### Target PHP version diff --git a/app/DoctrineMigrations/Version20190826204730.php b/app/DoctrineMigrations/Version20190826204730.php index 12ff52b58..59d4e4008 100644 --- a/app/DoctrineMigrations/Version20190826204730.php +++ b/app/DoctrineMigrations/Version20190826204730.php @@ -45,7 +45,7 @@ final class Version20190826204730 extends WallabagMigration public function postUp(Schema $schema): void { - foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $entity) { + foreach ($this->container->getParameter('wallabag.default_ignore_origin_instance_rules') as $entity) { $previous_rule = $this->container ->get('doctrine.orm.default_entity_manager') ->getConnection() diff --git a/app/DoctrineMigrations/Version20230728093912.php b/app/DoctrineMigrations/Version20230728093912.php index fffd22696..74394ecce 100644 --- a/app/DoctrineMigrations/Version20230728093912.php +++ b/app/DoctrineMigrations/Version20230728093912.php @@ -37,7 +37,7 @@ final class Version20230728093912 extends WallabagMigration 'UPDATE ' . $this->getTable('entry') . ' SET is_not_parsed = :isNotParsed WHERE content LIKE :content', [ 'isNotParsed' => true, - 'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag_core.fetching_error_message'))) . '%', + 'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag.fetching_error_message'))) . '%', ] ); } diff --git a/app/config/config.yml b/app/config/config.yml index b781565b4..7f8a0108d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -302,7 +302,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.pocket' - callback: wallabag_core.consumer.amqp.pocket + callback: wallabag.consumer.amqp.pocket qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_readability: connection: default @@ -311,7 +311,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.readability' - callback: wallabag_core.consumer.amqp.readability + callback: wallabag.consumer.amqp.readability qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_instapaper: connection: default @@ -320,7 +320,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.instapaper' - callback: wallabag_core.consumer.amqp.instapaper + callback: wallabag.consumer.amqp.instapaper qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_pinboard: connection: default @@ -329,7 +329,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.pinboard' - callback: wallabag_core.consumer.amqp.pinboard + callback: wallabag.consumer.amqp.pinboard qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_delicious: connection: default @@ -338,7 +338,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.delicious' - callback: wallabag_core.consumer.amqp.delicious + callback: wallabag.consumer.amqp.delicious qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_wallabag_v1: connection: default @@ -347,7 +347,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.wallabag_v1' - callback: wallabag_core.consumer.amqp.wallabag_v1 + callback: wallabag.consumer.amqp.wallabag_v1 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_wallabag_v2: connection: default @@ -356,7 +356,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.wallabag_v2' - callback: wallabag_core.consumer.amqp.wallabag_v2 + callback: wallabag.consumer.amqp.wallabag_v2 qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_elcurator: connection: default @@ -365,7 +365,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.elcurator' - callback: wallabag_core.consumer.amqp.elcurator + callback: wallabag.consumer.amqp.elcurator qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_firefox: connection: default @@ -374,7 +374,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.firefox' - callback: wallabag_core.consumer.amqp.firefox + callback: wallabag.consumer.amqp.firefox qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_chrome: connection: default @@ -383,7 +383,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.chrome' - callback: wallabag_core.consumer.amqp.chrome + callback: wallabag.consumer.amqp.chrome qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_shaarli: connection: default @@ -392,7 +392,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.shaarli' - callback: wallabag_core.consumer.amqp.shaarli + callback: wallabag.consumer.amqp.shaarli qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_pocket_html: connection: default @@ -401,7 +401,7 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.pocket_html' - callback: wallabag_core.consumer.amqp.pocket_html + callback: wallabag.consumer.amqp.pocket_html qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} fos_js_routing: @@ -432,7 +432,7 @@ sensio_framework_extra: httplug: clients: - wallabag_core: + wallabag: factory: Wallabag\Helper\HttpClientFactory config: defaults: diff --git a/app/config/services.yml b/app/config/services.yml index 655fb78e8..90d574aeb 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -17,11 +17,11 @@ services: $defaultLocale: '%kernel.default_locale%' $wallabagUrl: '%domain_name%' $tablePrefix: "%database_table_prefix%" - $encryptionKeyPath: "%wallabag_core.site_credentials.encryption_key_path%" - $fetchingErrorMessageTitle: "%wallabag_core.fetching_error_message_title%" - $fetchingErrorMessage: '%wallabag_core.fetching_error_message%' - $languages: '%wallabag_core.languages%' - $lifeTime: '%wallabag_core.cache_lifetime%' + $encryptionKeyPath: "%wallabag.site_credentials.encryption_key_path%" + $fetchingErrorMessageTitle: "%wallabag.fetching_error_message_title%" + $fetchingErrorMessage: '%wallabag.fetching_error_message%' + $languages: '%wallabag.languages%' + $lifeTime: '%wallabag.cache_lifetime%' $cookieFile: "%kernel.cache_dir%/cookiejar.json" $logoPath: 'web/img/appicon/apple-touch-icon-152.png' $registrationEnabled: '%fosuser_registration%' @@ -30,7 +30,7 @@ services: $senderName: "%scheb_two_factor.email.sender_name%" $storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')' $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')' - $fonts: '%wallabag_core.fonts%' + $fonts: '%wallabag.fonts%' Wallabag\: resource: '../../src/*' @@ -46,62 +46,62 @@ services: Wallabag\Controller\Import\ChromeController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer' - $redisProducer: '@wallabag_core.producer.redis.chrome' + $redisProducer: '@wallabag.producer.redis.chrome' Wallabag\Controller\Import\DeliciousController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer' - $redisProducer: '@wallabag_core.producer.redis.delicious' + $redisProducer: '@wallabag.producer.redis.delicious' Wallabag\Controller\Import\ElcuratorController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer' - $redisProducer: '@wallabag_core.producer.redis.elcurator' + $redisProducer: '@wallabag.producer.redis.elcurator' Wallabag\Controller\Import\FirefoxController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer' - $redisProducer: '@wallabag_core.producer.redis.firefox' + $redisProducer: '@wallabag.producer.redis.firefox' Wallabag\Controller\Import\InstapaperController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer' - $redisProducer: '@wallabag_core.producer.redis.instapaper' + $redisProducer: '@wallabag.producer.redis.instapaper' Wallabag\Controller\Import\PinboardController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer' - $redisProducer: '@wallabag_core.producer.redis.pinboard' + $redisProducer: '@wallabag.producer.redis.pinboard' Wallabag\Controller\Import\PocketController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer' - $redisProducer: '@wallabag_core.producer.redis.pocket' + $redisProducer: '@wallabag.producer.redis.pocket' Wallabag\Controller\Import\ReadabilityController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer' - $redisProducer: '@wallabag_core.producer.redis.readability' + $redisProducer: '@wallabag.producer.redis.readability' Wallabag\Controller\Import\WallabagV1Controller: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer' - $redisProducer: '@wallabag_core.producer.redis.wallabag_v1' + $redisProducer: '@wallabag.producer.redis.wallabag_v1' Wallabag\Controller\Import\WallabagV2Controller: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer' - $redisProducer: '@wallabag_core.producer.redis.wallabag_v2' + $redisProducer: '@wallabag.producer.redis.wallabag_v2' Wallabag\Controller\Import\ShaarliController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer' - $redisProducer: '@wallabag_core.producer.redis.shaarli' + $redisProducer: '@wallabag.producer.redis.shaarli' Wallabag\Controller\Import\PocketHtmlController: arguments: $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer' - $redisProducer: '@wallabag_core.producer.redis.pocket_html' + $redisProducer: '@wallabag.producer.redis.pocket_html' Doctrine\DBAL\Connection: alias: doctrine.dbal.default_connection @@ -177,8 +177,8 @@ services: Graby\Graby: arguments: $config: - error_message: '%wallabag_core.fetching_error_message%' - error_message_title: '%wallabag_core.fetching_error_message_title%' + error_message: '%wallabag.fetching_error_message%' + error_message_title: '%wallabag.fetching_error_message_title%' calls: - [ setLogger, [ "@logger" ] ] tags: @@ -188,8 +188,8 @@ services: arguments: $config: {} - wallabag_core.http_client: - alias: 'httplug.client.wallabag_core' + wallabag.http_client: + alias: 'httplug.client.wallabag' Wallabag\SiteConfig\GrabySiteConfigBuilder: tags: @@ -255,8 +255,8 @@ services: arguments: $databaseDriver: '%database_driver%' $databaseName: '%database_name%' - $defaultSettings: '%wallabag_core.default_internal_settings%' - $defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%' + $defaultSettings: '%wallabag.default_internal_settings%' + $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%' Wallabag\Mailer\UserMailer: arguments: @@ -270,13 +270,13 @@ services: Wallabag\Event\Listener\CreateConfigListener: arguments: - $itemsOnPage: "%wallabag_core.items_on_page%" - $feedLimit: "%wallabag_core.feed_limit%" - $language: "%wallabag_core.language%" - $readingSpeed: "%wallabag_core.reading_speed%" - $actionMarkAsRead: "%wallabag_core.action_mark_as_read%" - $listMode: "%wallabag_core.list_mode%" - $displayThumbnails: "%wallabag_core.display_thumbnails%" + $itemsOnPage: "%wallabag.items_on_page%" + $feedLimit: "%wallabag.feed_limit%" + $language: "%wallabag.language%" + $readingSpeed: "%wallabag.reading_speed%" + $actionMarkAsRead: "%wallabag.action_mark_as_read%" + $listMode: "%wallabag.list_mode%" + $displayThumbnails: "%wallabag.display_thumbnails%" Wallabag\Event\Listener\AuthenticationFailureListener: tags: @@ -286,51 +286,51 @@ services: calls: - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ] tags: - - { name: wallabag_core.import, alias: pocket } + - { name: wallabag.import, alias: pocket } Wallabag\Import\WallabagV1Import: tags: - - { name: wallabag_core.import, alias: wallabag_v1 } + - { name: wallabag.import, alias: wallabag_v1 } Wallabag\Import\WallabagV2Import: tags: - - { name: wallabag_core.import, alias: wallabag_v2 } + - { name: wallabag.import, alias: wallabag_v2 } Wallabag\Import\ElcuratorImport: tags: - - { name: wallabag_core.import, alias: elcurator } + - { name: wallabag.import, alias: elcurator } Wallabag\Import\ReadabilityImport: tags: - - { name: wallabag_core.import, alias: readability } + - { name: wallabag.import, alias: readability } Wallabag\Import\InstapaperImport: tags: - - { name: wallabag_core.import, alias: instapaper } + - { name: wallabag.import, alias: instapaper } Wallabag\Import\PinboardImport: tags: - - { name: wallabag_core.import, alias: pinboard } + - { name: wallabag.import, alias: pinboard } Wallabag\Import\DeliciousImport: tags: - - { name: wallabag_core.import, alias: delicious } + - { name: wallabag.import, alias: delicious } Wallabag\Import\FirefoxImport: tags: - - { name: wallabag_core.import, alias: firefox } + - { name: wallabag.import, alias: firefox } Wallabag\Import\ChromeImport: tags: - - { name: wallabag_core.import, alias: chrome } + - { name: wallabag.import, alias: chrome } Wallabag\Import\ShaarliImport: tags: - - { name: wallabag_core.import, alias: shaarli } + - { name: wallabag.import, alias: shaarli } Wallabag\Import\PocketHtmlImport: tags: - - { name: wallabag_core.import, alias: pocket_html } + - { name: wallabag.import, alias: pocket_html } # to factorize the proximity and bypass translation for prev & next pagerfanta.view.default_wallabag: diff --git a/app/config/services_rabbit.yml b/app/config/services_rabbit.yml index 585ed0f6a..2c01be3bb 100644 --- a/app/config/services_rabbit.yml +++ b/app/config/services_rabbit.yml @@ -20,62 +20,62 @@ services: $shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer' $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer' - wallabag_core.consumer.amqp.pocket: + wallabag.consumer.amqp.pocket: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\PocketImport' - wallabag_core.consumer.amqp.readability: + wallabag.consumer.amqp.readability: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\ReadabilityImport' - wallabag_core.consumer.amqp.instapaper: + wallabag.consumer.amqp.instapaper: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\InstapaperImport' - wallabag_core.consumer.amqp.pinboard: + wallabag.consumer.amqp.pinboard: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\PinboardImport' - wallabag_core.consumer.amqp.delicious: + wallabag.consumer.amqp.delicious: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\DeliciousImport' - wallabag_core.consumer.amqp.wallabag_v1: + wallabag.consumer.amqp.wallabag_v1: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\WallabagV1Import' - wallabag_core.consumer.amqp.wallabag_v2: + wallabag.consumer.amqp.wallabag_v2: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\WallabagV2Import' - wallabag_core.consumer.amqp.elcurator: + wallabag.consumer.amqp.elcurator: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\ElcuratorImport' - wallabag_core.consumer.amqp.firefox: + wallabag.consumer.amqp.firefox: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\FirefoxImport' - wallabag_core.consumer.amqp.chrome: + wallabag.consumer.amqp.chrome: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\ChromeImport' - wallabag_core.consumer.amqp.shaarli: + wallabag.consumer.amqp.shaarli: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\ShaarliImport' - wallabag_core.consumer.amqp.pocket_html: + wallabag.consumer.amqp.pocket_html: class: Wallabag\Consumer\AMQPEntryConsumer arguments: $import: '@Wallabag\Import\PocketHtmlImport' diff --git a/app/config/services_redis.yml b/app/config/services_redis.yml index 86c4f8324..0a6b5be99 100644 --- a/app/config/services_redis.yml +++ b/app/config/services_redis.yml @@ -6,193 +6,193 @@ services: public: true # readability - wallabag_core.queue.redis.readability: + wallabag.queue.redis.readability: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.readability" - wallabag_core.producer.redis.readability: + wallabag.producer.redis.readability: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.readability" + - "@wallabag.queue.redis.readability" - wallabag_core.consumer.redis.readability: + wallabag.consumer.redis.readability: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\ReadabilityImport' # instapaper - wallabag_core.queue.redis.instapaper: + wallabag.queue.redis.instapaper: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.instapaper" - wallabag_core.producer.redis.instapaper: + wallabag.producer.redis.instapaper: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.instapaper" + - "@wallabag.queue.redis.instapaper" - wallabag_core.consumer.redis.instapaper: + wallabag.consumer.redis.instapaper: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\InstapaperImport' # pinboard - wallabag_core.queue.redis.pinboard: + wallabag.queue.redis.pinboard: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.pinboard" - wallabag_core.producer.redis.pinboard: + wallabag.producer.redis.pinboard: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.pinboard" + - "@wallabag.queue.redis.pinboard" - wallabag_core.consumer.redis.pinboard: + wallabag.consumer.redis.pinboard: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\PinboardImport' # delicious - wallabag_core.queue.redis.delicious: + wallabag.queue.redis.delicious: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.delicious" - wallabag_core.producer.redis.delicious: + wallabag.producer.redis.delicious: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.delicious" + - "@wallabag.queue.redis.delicious" - wallabag_core.consumer.redis.delicious: + wallabag.consumer.redis.delicious: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\DeliciousImport' # pocket - wallabag_core.queue.redis.pocket: + wallabag.queue.redis.pocket: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.pocket" - wallabag_core.producer.redis.pocket: + wallabag.producer.redis.pocket: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.pocket" + - "@wallabag.queue.redis.pocket" - wallabag_core.consumer.redis.pocket: + wallabag.consumer.redis.pocket: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\PocketImport' # wallabag v1 - wallabag_core.queue.redis.wallabag_v1: + wallabag.queue.redis.wallabag_v1: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.wallabag_v1" - wallabag_core.producer.redis.wallabag_v1: + wallabag.producer.redis.wallabag_v1: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.wallabag_v1" + - "@wallabag.queue.redis.wallabag_v1" - wallabag_core.consumer.redis.wallabag_v1: + wallabag.consumer.redis.wallabag_v1: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\WallabagV1Import' # wallabag v2 - wallabag_core.queue.redis.wallabag_v2: + wallabag.queue.redis.wallabag_v2: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.wallabag_v2" - wallabag_core.producer.redis.wallabag_v2: + wallabag.producer.redis.wallabag_v2: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.wallabag_v2" + - "@wallabag.queue.redis.wallabag_v2" - wallabag_core.consumer.redis.wallabag_v2: + wallabag.consumer.redis.wallabag_v2: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\WallabagV2Import' # elcurator - wallabag_core.queue.redis.elcurator: + wallabag.queue.redis.elcurator: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.elcurator" - wallabag_core.producer.redis.elcurator: + wallabag.producer.redis.elcurator: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.elcurator" + - "@wallabag.queue.redis.elcurator" - wallabag_core.consumer.redis.elcurator: + wallabag.consumer.redis.elcurator: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\ElcuratorImport' # firefox - wallabag_core.queue.redis.firefox: + wallabag.queue.redis.firefox: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.firefox" - wallabag_core.producer.redis.firefox: + wallabag.producer.redis.firefox: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.firefox" + - "@wallabag.queue.redis.firefox" - wallabag_core.consumer.redis.firefox: + wallabag.consumer.redis.firefox: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\FirefoxImport' # chrome - wallabag_core.queue.redis.chrome: + wallabag.queue.redis.chrome: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.chrome" - wallabag_core.producer.redis.chrome: + wallabag.producer.redis.chrome: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.chrome" + - "@wallabag.queue.redis.chrome" - wallabag_core.consumer.redis.chrome: + wallabag.consumer.redis.chrome: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\ChromeImport' # shaarli - wallabag_core.queue.redis.shaarli: + wallabag.queue.redis.shaarli: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.shaarli" - wallabag_core.producer.redis.shaarli: + wallabag.producer.redis.shaarli: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.shaarli" + - "@wallabag.queue.redis.shaarli" - wallabag_core.consumer.redis.shaarli: + wallabag.consumer.redis.shaarli: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\ShaarliImport' # pocket html - wallabag_core.queue.redis.pocket_html: + wallabag.queue.redis.pocket_html: class: Simpleue\Queue\RedisQueue arguments: $queueName: "wallabag.import.pocket_html" - wallabag_core.producer.redis.pocket_html: + wallabag.producer.redis.pocket_html: class: Wallabag\Redis\Producer arguments: - - "@wallabag_core.queue.redis.pocket_html" + - "@wallabag.queue.redis.pocket_html" - wallabag_core.consumer.redis.pocket_html: + wallabag.consumer.redis.pocket_html: class: Wallabag\Consumer\RedisEntryConsumer arguments: $import: '@Wallabag\Import\PocketHtmlImport' diff --git a/app/config/services_test.yml b/app/config/services_test.yml index 6808f3986..d55228614 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -8,7 +8,7 @@ services: alias: fos_user.security.login_manager public: true - wallabag_core.entry_repository.test: + wallabag.entry_repository.test: alias: Wallabag\Repository\EntryRepository public: true diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 67b927c4d..c6c869655 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,7 +1,7 @@ parameters: - wallabag_core.version: 2.6.8 - wallabag_core.paypal_url: "https://liberapay.com/wallabag/donate" - wallabag_core.languages: + wallabag.version: 2.6.8 + wallabag.paypal_url: "https://liberapay.com/wallabag/donate" + wallabag.languages: en: 'English' fr: 'Français' de: 'Deutsch' @@ -23,20 +23,20 @@ parameters: hr: 'Hrvatski' cs: 'Čeština' el: 'Ελληνικά' - wallabag_core.items_on_page: 12 - wallabag_core.language: '%locale%' - wallabag_core.feed_limit: 50 - wallabag_core.reading_speed: 200 - wallabag_core.cache_lifetime: 10 - wallabag_core.action_mark_as_read: 1 - wallabag_core.list_mode: 0 - wallabag_core.display_thumbnails: 1 - wallabag_core.fetching_error_message_title: 'No title found' - wallabag_core.fetching_error_message: | + wallabag.items_on_page: 12 + wallabag.language: '%locale%' + wallabag.feed_limit: 50 + wallabag.reading_speed: 200 + wallabag.cache_lifetime: 10 + wallabag.action_mark_as_read: 1 + wallabag.list_mode: 0 + wallabag.display_thumbnails: 1 + wallabag.fetching_error_message_title: 'No title found' + wallabag.fetching_error_message: | wallabag can't retrieve contents for this article. Please troubleshoot this issue. - wallabag_core.api_limit_mass_actions: 10 - wallabag_core.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" - wallabag_core.default_internal_settings: + wallabag.api_limit_mass_actions: 10 + wallabag.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" + wallabag.default_internal_settings: - name: share_public value: 1 @@ -146,14 +146,14 @@ parameters: value: 0 section: entry - wallabag_core.default_ignore_origin_instance_rules: + wallabag.default_ignore_origin_instance_rules: - rule: host = "feedproxy.google.com" - rule: host = "feeds.reuters.com" - rule: _all ~ "https?://www\.lemonde\.fr/tiny.*" - wallabag_core.fonts: + wallabag.fonts: - 'Sans-serif' - 'Serif' - 'Atkinson Hyperlegible' @@ -162,5 +162,5 @@ parameters: - 'Montserrat' - 'OpenDyslexicRegular' - 'Oswald' - wallabag_core.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html'] - wallabag_core.resource_dir: "%kernel.project_dir%/web/uploads/import" + wallabag.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html'] + wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import" diff --git a/src/Command/Import/RedisWorkerCommand.php b/src/Command/Import/RedisWorkerCommand.php index 3a6d3ed68..1259778fb 100644 --- a/src/Command/Import/RedisWorkerCommand.php +++ b/src/Command/Import/RedisWorkerCommand.php @@ -40,13 +40,13 @@ class RedisWorkerCommand extends Command $serviceName = $input->getArgument('serviceName'); - if (!$this->container->has('wallabag_core.queue.redis.' . $serviceName) || !$this->container->has('wallabag_core.consumer.redis.' . $serviceName)) { + if (!$this->container->has('wallabag.queue.redis.' . $serviceName) || !$this->container->has('wallabag.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_core.queue.redis.' . $serviceName), - $this->container->get('wallabag_core.consumer.redis.' . $serviceName), + $this->container->get('wallabag.queue.redis.' . $serviceName), + $this->container->get('wallabag.consumer.redis.' . $serviceName), (int) $input->getOption('maxIterations') ); diff --git a/src/Controller/Api/EntryRestController.php b/src/Controller/Api/EntryRestController.php index 728743068..3b8497fdf 100644 --- a/src/Controller/Api/EntryRestController.php +++ b/src/Controller/Api/EntryRestController.php @@ -525,7 +525,7 @@ class EntryRestController extends WallabagRestController $urls = json_decode($request->query->get('urls', [])); - $limit = $this->getParameter('wallabag_core.api_limit_mass_actions'); + $limit = $this->getParameter('wallabag.api_limit_mass_actions'); if (\count($urls) > $limit) { throw new HttpException(400, 'API limit reached'); @@ -1044,7 +1044,7 @@ class EntryRestController extends WallabagRestController } // if refreshing entry failed, don't save it - if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) { + if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) { return new JsonResponse([], 304); } diff --git a/src/Controller/Api/WallabagRestController.php b/src/Controller/Api/WallabagRestController.php index 4e6f7f741..80f0eeb4c 100644 --- a/src/Controller/Api/WallabagRestController.php +++ b/src/Controller/Api/WallabagRestController.php @@ -61,7 +61,7 @@ class WallabagRestController extends AbstractFOSRestController */ public function getVersionAction() { - $version = $this->getParameter('wallabag_core.version'); + $version = $this->getParameter('wallabag.version'); $json = $this->serializer->serialize($version, 'json'); return (new JsonResponse())->setJson($json); @@ -85,7 +85,7 @@ class WallabagRestController extends AbstractFOSRestController public function getInfoAction(Config $craueConfig) { $info = new ApplicationInfo( - $this->getParameter('wallabag_core.version'), + $this->getParameter('wallabag.version'), $this->getParameter('fosuser_registration') && $craueConfig->get('api_user_registration'), ); diff --git a/src/Controller/EntryController.php b/src/Controller/EntryController.php index befc0336d..4129b3b02 100644 --- a/src/Controller/EntryController.php +++ b/src/Controller/EntryController.php @@ -410,7 +410,7 @@ class EntryController extends AbstractController $this->updateEntry($entry, 'entry_reloaded'); // if refreshing entry failed, don't save it - if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) { + if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) { $this->addFlash('notice', 'flashes.entry.notice.entry_reloaded_failed'); return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); diff --git a/src/Controller/FeedController.php b/src/Controller/FeedController.php index e71d4373d..b329f8002 100644 --- a/src/Controller/FeedController.php +++ b/src/Controller/FeedController.php @@ -128,7 +128,7 @@ class FeedController extends AbstractController $user ); - $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit'); + $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag.feed_limit'); $entries->setMaxPerPage($perPage); if (null === $entries) { @@ -151,7 +151,7 @@ class FeedController extends AbstractController 'entries' => $entries, 'user' => $user->getUsername(), 'domainName' => $this->getParameter('domain_name'), - 'version' => $this->getParameter('wallabag_core.version'), + 'version' => $this->getParameter('wallabag.version'), 'tag' => $tag->getSlug(), 'updated' => $this->prepareFeedUpdatedDate($entries, $sort), ], @@ -206,7 +206,7 @@ class FeedController extends AbstractController $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false); $entries = new Pagerfanta($pagerAdapter); - $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit'); + $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag.feed_limit'); $entries->setMaxPerPage($perPage); $url = $this->generateUrl( @@ -232,7 +232,7 @@ class FeedController extends AbstractController 'entries' => $entries, 'user' => $user->getUsername(), 'domainName' => $this->getParameter('domain_name'), - 'version' => $this->getParameter('wallabag_core.version'), + 'version' => $this->getParameter('wallabag.version'), 'updated' => $this->prepareFeedUpdatedDate($entries), ], new Response('', 200, ['Content-Type' => 'application/atom+xml'])); } diff --git a/src/Controller/Import/BrowserController.php b/src/Controller/Import/BrowserController.php index 1ea175909..e4b5307b1 100644 --- a/src/Controller/Import/BrowserController.php +++ b/src/Controller/Import/BrowserController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $wallabag - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -51,7 +51,7 @@ abstract class BrowserController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/Import/DeliciousController.php b/src/Controller/Import/DeliciousController.php index 8e128e572..da19b8795 100644 --- a/src/Controller/Import/DeliciousController.php +++ b/src/Controller/Import/DeliciousController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $delicious - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -65,7 +65,7 @@ class DeliciousController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/Import/HtmlController.php b/src/Controller/Import/HtmlController.php index 14352f399..e53cd8a46 100644 --- a/src/Controller/Import/HtmlController.php +++ b/src/Controller/Import/HtmlController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $wallabag - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -51,7 +51,7 @@ abstract class HtmlController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/Import/InstapaperController.php b/src/Controller/Import/InstapaperController.php index 34c07f2d6..daf7f6111 100644 --- a/src/Controller/Import/InstapaperController.php +++ b/src/Controller/Import/InstapaperController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $instapaper - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -65,7 +65,7 @@ class InstapaperController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/Import/PinboardController.php b/src/Controller/Import/PinboardController.php index 330f573d3..791f0e0f7 100644 --- a/src/Controller/Import/PinboardController.php +++ b/src/Controller/Import/PinboardController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $pinboard - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -65,7 +65,7 @@ class PinboardController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/Import/ReadabilityController.php b/src/Controller/Import/ReadabilityController.php index 63a43e4a2..6943d60e7 100644 --- a/src/Controller/Import/ReadabilityController.php +++ b/src/Controller/Import/ReadabilityController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $readability - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -65,7 +65,7 @@ class ReadabilityController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/Import/WallabagController.php b/src/Controller/Import/WallabagController.php index 655841b25..12700f902 100644 --- a/src/Controller/Import/WallabagController.php +++ b/src/Controller/Import/WallabagController.php @@ -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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) { + if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) { $res = $wallabag - ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name) + ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name) ->setMarkAsRead($markAsRead) ->import(); @@ -54,7 +54,7 @@ abstract class WallabagController extends AbstractController ]); } - unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name); + unlink($this->getParameter('wallabag.resource_dir') . '/' . $name); } $this->addFlash('notice', $message); diff --git a/src/Controller/StaticController.php b/src/Controller/StaticController.php index 30463ece6..fda356851 100644 --- a/src/Controller/StaticController.php +++ b/src/Controller/StaticController.php @@ -29,8 +29,8 @@ class StaticController extends AbstractController return $this->render( 'Static/about.html.twig', [ - 'version' => $this->getParameter('wallabag_core.version'), - 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), + 'version' => $this->getParameter('wallabag.version'), + 'paypal_url' => $this->getParameter('wallabag.paypal_url'), ] ); } diff --git a/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php b/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php index f40490063..31833e31a 100644 --- a/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php +++ b/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php @@ -22,7 +22,7 @@ class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAware public function load(ObjectManager $manager): void { - foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) { + foreach ($this->container->getParameter('wallabag.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) { $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule(); $newIgnoreOriginInstanceRule->setRule($ignore_origin_instance_rule['rule']); $manager->persist($newIgnoreOriginInstanceRule); diff --git a/src/DataFixtures/InternalSettingFixtures.php b/src/DataFixtures/InternalSettingFixtures.php index 77dddeaaa..f9d6c9385 100644 --- a/src/DataFixtures/InternalSettingFixtures.php +++ b/src/DataFixtures/InternalSettingFixtures.php @@ -22,7 +22,7 @@ class InternalSettingFixtures extends Fixture implements ContainerAwareInterface public function load(ObjectManager $manager): void { - foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) { + foreach ($this->container->getParameter('wallabag.default_internal_settings') as $setting) { $newSetting = new InternalSetting(); $newSetting->setName($setting['name']); $newSetting->setValue($setting['value']); diff --git a/src/Import/ImportCompilerPass.php b/src/Import/ImportCompilerPass.php index 16e366762..29fa5c08b 100644 --- a/src/Import/ImportCompilerPass.php +++ b/src/Import/ImportCompilerPass.php @@ -19,7 +19,7 @@ class ImportCompilerPass implements CompilerPassInterface ); $taggedServices = $container->findTaggedServiceIds( - 'wallabag_core.import' + 'wallabag.import' ); foreach ($taggedServices as $id => $tagAttributes) { foreach ($tagAttributes as $attributes) { diff --git a/tests/Command/ReloadEntryCommandTest.php b/tests/Command/ReloadEntryCommandTest.php index 6ae9c8652..2f7a783ca 100644 --- a/tests/Command/ReloadEntryCommandTest.php +++ b/tests/Command/ReloadEntryCommandTest.php @@ -82,7 +82,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase $reloadedEntries = $this->getTestClient() ->getContainer() - ->get('wallabag_core.entry_repository.test') + ->get('wallabag.entry_repository.test') ->findById([$this->adminEntry->getId(), $this->bobEntry->getId()]); foreach ($reloadedEntries as $reloadedEntry) { @@ -107,7 +107,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase 'interactive' => false, ]); - $entryRepository = $this->getTestClient()->getContainer()->get('wallabag_core.entry_repository.test'); + $entryRepository = $this->getTestClient()->getContainer()->get('wallabag.entry_repository.test'); $reloadedAdminEntry = $entryRepository->find($this->adminEntry->getId()); $this->assertNotEmpty($reloadedAdminEntry->getContent()); @@ -128,7 +128,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase '--only-not-parsed' => true, ]); - $entryRepository = $this->getTestClient()->getContainer()->get('wallabag_core.entry_repository.test'); + $entryRepository = $this->getTestClient()->getContainer()->get('wallabag.entry_repository.test'); $reloadedBobParsedEntry = $entryRepository->find($this->bobParsedEntry->getId()); $this->assertEmpty($reloadedBobParsedEntry->getContent()); diff --git a/tests/Controller/Api/WallabagRestControllerTest.php b/tests/Controller/Api/WallabagRestControllerTest.php index bc72c1610..d73115cd6 100644 --- a/tests/Controller/Api/WallabagRestControllerTest.php +++ b/tests/Controller/Api/WallabagRestControllerTest.php @@ -16,7 +16,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase $content = json_decode($client->getResponse()->getContent(), true); - $this->assertSame($client->getContainer()->getParameter('wallabag_core.version'), $content); + $this->assertSame($client->getContainer()->getParameter('wallabag.version'), $content); } public function testGetInfo() diff --git a/tests/Controller/EntryControllerTest.php b/tests/Controller/EntryControllerTest.php index da9c04645..e2f297810 100644 --- a/tests/Controller/EntryControllerTest.php +++ b/tests/Controller/EntryControllerTest.php @@ -541,7 +541,7 @@ class EntryControllerTest extends WallabagCoreTestCase ->getRepository(Entry::class) ->find($entry->getId()); - $this->assertNotSame($client->getContainer()->getParameter('wallabag_core.fetching_error_message'), $newContent->getContent()); + $this->assertNotSame($client->getContainer()->getParameter('wallabag.fetching_error_message'), $newContent->getContent()); } public function testEdit() diff --git a/tests/Import/ImportCompilerPassTest.php b/tests/Import/ImportCompilerPassTest.php index a5685ad2d..111341df6 100644 --- a/tests/Import/ImportCompilerPassTest.php +++ b/tests/Import/ImportCompilerPassTest.php @@ -27,7 +27,7 @@ class ImportCompilerPassTest extends TestCase $container ->register('foo') - ->addTag('wallabag_core.import', ['alias' => 'pocket']) + ->addTag('wallabag.import', ['alias' => 'pocket']) ; $this->process($container);