summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Molenaar <SMillerDev@users.noreply.github.com>2018-03-27 15:35:06 +0200
committerBernhard Posselt <BernhardPosselt@users.noreply.github.com>2018-03-27 15:35:06 +0200
commit5b94705cf3918dc7986c6043b1fbe776bf22958f (patch)
tree4e8059818a0a913d24938e35238913a721fa6373
parentf3c9d13551cef5968baea99c2f25085baee0ed5f (diff)
Core: Fix compatibility with nextcloud codestyle (#280)
-rw-r--r--appinfo/app.php4
-rw-r--r--appinfo/routes.php4
-rw-r--r--lib/AppInfo/Application.php331
-rw-r--r--lib/Command/Updater/AfterUpdate.php20
-rw-r--r--lib/Command/Updater/AllFeeds.php20
-rw-r--r--lib/Command/Updater/BeforeUpdate.php20
-rw-r--r--lib/Command/Updater/UpdateFeed.php20
-rw-r--r--lib/Config/Config.php66
-rw-r--r--lib/Config/DependencyException.php15
-rw-r--r--lib/Controller/AdminController.php121
-rw-r--r--lib/Controller/ApiController.php30
-rw-r--r--lib/Controller/EntityApiSerializer.php28
-rw-r--r--lib/Controller/ExportController.php40
-rw-r--r--lib/Controller/FeedApiController.php76
-rw-r--r--lib/Controller/FeedController.php123
-rw-r--r--lib/Controller/FolderApiController.php41
-rw-r--r--lib/Controller/FolderController.php57
-rw-r--r--lib/Controller/ItemApiController.php91
-rw-r--r--lib/Controller/ItemController.php108
-rw-r--r--lib/Controller/JSONHttpError.php12
-rw-r--r--lib/Controller/PageController.php68
-rw-r--r--lib/Controller/UserApiController.php25
-rw-r--r--lib/Controller/UtilityApiController.php42
-rw-r--r--lib/Cron/Updater.php16
-rw-r--r--lib/Db/EntityJSONSerializer.php14
-rw-r--r--lib/Db/Feed.php38
-rw-r--r--lib/Db/FeedMapper.php42
-rw-r--r--lib/Db/FeedType.php11
-rw-r--r--lib/Db/Folder.php33
-rw-r--r--lib/Db/FolderMapper.php39
-rw-r--r--lib/Db/IAPI.php11
-rw-r--r--lib/Db/Item.php75
-rw-r--r--lib/Db/ItemMapper.php116
-rw-r--r--lib/Db/MapperFactory.php39
-rw-r--r--lib/Db/Mysql/ItemMapper.php21
-rw-r--r--lib/Db/NewsMapper.php47
-rw-r--r--lib/DependencyInjection/IFactory.php12
-rw-r--r--lib/Explore/RecommendedSiteNotFoundException.php11
-rw-r--r--lib/Explore/RecommendedSites.php19
-rw-r--r--lib/Fetcher/FeedFetcher.php180
-rw-r--r--lib/Fetcher/Fetcher.php63
-rw-r--r--lib/Fetcher/FetcherException.php15
-rw-r--r--lib/Fetcher/IFeedFetcher.php43
-rw-r--r--lib/Fetcher/YoutubeFetcher.php49
-rw-r--r--lib/Hooks/User.php14
-rw-r--r--lib/Http/TextDownloadResponse.php25
-rw-r--r--lib/Http/TextResponse.php23
-rw-r--r--lib/Migration/MigrateStatusFlags.php24
-rw-r--r--lib/Plugin/Client/Plugin.php23
-rw-r--r--lib/PostProcessor/LWNProcessor.php36
-rw-r--r--lib/Service/FeedService.php142
-rw-r--r--lib/Service/FolderService.php87
-rw-r--r--lib/Service/ItemService.php202
-rw-r--r--lib/Service/Service.php30
-rw-r--r--lib/Service/ServiceConflictException.php15
-rw-r--r--lib/Service/ServiceException.php15
-rw-r--r--lib/Service/ServiceNotFoundException.php15
-rw-r--r--lib/Service/ServiceValidationException.php15
-rw-r--r--lib/Service/StatusService.php20
-rw-r--r--lib/Settings/Admin.php15
-rw-r--r--lib/Settings/Section.php18
-rw-r--r--lib/Utility/OPMLExporter.php25
-rw-r--r--lib/Utility/PicoFeedClientFactory.php18
-rw-r--r--lib/Utility/PicoFeedFaviconFactory.php18
-rw-r--r--lib/Utility/ProxyConfigParser.php18
-rw-r--r--lib/Utility/Time.php11
-rw-r--r--lib/Utility/Updater.php25
-rw-r--r--tests/Integration/Db/FeedMapperTest.php99
-rw-r--r--tests/Integration/Db/FolderMapperTest.php8
-rw-r--r--tests/Integration/Db/ItemMapperTest.php59
-rw-r--r--tests/Integration/Fixtures/FeedFixture.php14
-rw-r--r--tests/Integration/Fixtures/Fixture.php8
-rw-r--r--tests/Integration/Fixtures/FolderFixture.php14
-rw-r--r--tests/Integration/Fixtures/ItemFixture.php14
-rw-r--r--tests/Integration/Fixtures/data/default.php2
-rw-r--r--tests/Integration/Fixtures/data/readitem.php2
-rw-r--r--tests/Integration/IntegrationTest.php90
-rw-r--r--tests/Unit/Config/ConfigTest.php83
-rw-r--r--tests/Unit/Controller/AdminControllerTest.php36
-rw-r--r--tests/Unit/Controller/EntityApiSerializerTest.php32
-rw-r--r--tests/Unit/Controller/ExportControllerTest.php41
-rw-r--r--tests/Unit/Controller/FeedApiControllerTest.php131
-rw-r--r--tests/Unit/Controller/FeedControllerTest.php144
-rw-r--r--tests/Unit/Controller/FolderApiControllerTest.php77
-rw-r--r--tests/Unit/Controller/FolderControllerTest.php50
-rw-r--r--tests/Unit/Controller/ItemApiControllerTest.php179
-rw-r--r--tests/Unit/Controller/ItemControllerTest.php160
-rw-r--r--tests/Unit/Controller/JSONHttpErrorTest.php17
-rw-r--r--tests/Unit/Controller/PageControllerTest.php194
-rw-r--r--tests/Unit/Controller/UserApiControllerTest.php56
-rw-r--r--tests/Unit/Controller/UtilityApiControllerTest.php44
-rw-r--r--tests/Unit/Db/FeedTest.php41
-rw-r--r--tests/Unit/Db/FolderMapperTest.php38
-rw-r--r--tests/Unit/Db/FolderTest.php29
-rw-r--r--tests/Unit/Db/ItemTest.php99
-rw-r--r--tests/Unit/Db/MapperFactoryTest.php63
-rw-r--r--tests/Unit/Db/MapperTestUtility.php120
-rw-r--r--tests/Unit/Fetcher/FeedFetcherTest.php132
-rw-r--r--tests/Unit/Fetcher/FetcherTest.php71
-rw-r--r--tests/Unit/Fetcher/YoutubeFetcherTest.php20
-rw-r--r--tests/Unit/Http/TextDownloadResponseTest.php17
-rw-r--r--tests/Unit/Http/TextResponseTest.php23
-rw-r--r--tests/Unit/Migration/MigrateStatusFlagsTest.php29
-rw-r--r--tests/Unit/Service/FeedServiceTest.php266
-rw-r--r--tests/Unit/Service/FolderServiceTest.php68
-rw-r--r--tests/Unit/Service/ItemServiceTest.php239
-rw-r--r--tests/Unit/Service/ServiceTest.php32
-rw-r--r--tests/Unit/Service/StatusServiceTest.php50
-rw-r--r--tests/Unit/Utility/OPMLExporterTest.php98
-rw-r--r--tests/Unit/Utility/ProxyConfigParserTest.php32
-rw-r--r--tests/Unit/Utility/UpdaterTest.php38
-rw-r--r--tests/bootstrap.php2
112 files changed, 3813 insertions, 2338 deletions
diff --git a/appinfo/app.php b/appinfo/app.php
index 65c53725c..9ce7f366f 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -7,8 +7,8 @@
*
* @author Alessandro Cosentino <cosenal@gmail.com>
* @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
+ * @copyright 2012 Alessandro Cosentino
+ * @copyright 2012-2014 Bernhard Posselt
*/
namespace OCA\News\AppInfo;
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 1f1e19517..7bf843cb2 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -7,8 +7,8 @@
*
* @author Alessandro Cosentino <cosenal@gmail.com>
* @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
+ * @copyright 2012 Alessandro Cosentino
+ * @copyright 2012-2014 Bernhard Posselt
*/
return ['routes' => [
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 5abd0c5be..d633de743 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -5,10 +5,10 @@
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
+ * @author Alessandro Cosentino <cosenal@gmail.com>
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright 2012 Alessandro Cosentino
+ * @copyright 2012-2014 Bernhard Posselt
*/
namespace OCA\News\AppInfo;
@@ -40,9 +40,11 @@ use OCA\News\Explore\RecommendedSites;
use OCA\News\Utility\ProxyConfigParser;
-class Application extends App {
+class Application extends App
+{
- public function __construct(array $urlParams=[]) {
+ public function __construct(array $urlParams=[])
+ {
parent::__construct('news', $urlParams);
// files
@@ -60,192 +62,245 @@ class Application extends App {
/**
* App config parser
*/
- /** @noinspection PhpParamsInspection */
- $this->registerService(AppConfig::class, function($c) {
- $config = new AppConfig(
- $c->query(INavigationManager::class),
- $c->query(IURLGenerator::class),
- $c->query(IJobList::class)
- );
-
- $config->loadConfig($c->query('info'));
-
- return $config;
- });
+ /**
+ * @noinspection PhpParamsInspection
+*/
+ $this->registerService(
+ AppConfig::class, function ($c) {
+ $config = new AppConfig(
+ $c->query(INavigationManager::class),
+ $c->query(IURLGenerator::class),
+ $c->query(IJobList::class)
+ );
+
+ $config->loadConfig($c->query('info'));
+
+ return $config;
+ }
+ );
/**
* Core
*/
- /** @noinspection PhpParamsInspection */
- $this->registerService('LoggerParameters', function($c) {
- return ['app' => $c->query('AppName')];
- });
-
- /** @noinspection PhpParamsInspection */
- $this->registerService('databaseType', function($c) {
- return $c->query(IConfig::class)->getSystemValue('dbtype');
- });
-
- /** @noinspection PhpParamsInspection */
- $this->registerService('ConfigView', function($c) {
- $fs = $c->query(IRootFolder::class);
- $path = 'news/config';
- if ($fs->nodeExists($path)) {
- return $fs->get($path);
- } else {
- return $fs->newFolder($path);
+ /**
+ * @noinspection PhpParamsInspection </