diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-22 22:19:14 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-22 22:19:14 +0200 |
commit | ea6f93d515f226f67202aafc107b1e4098ddf036 (patch) | |
tree | 5293b982086fa51e4274e955a9217b8436940c74 /appinfo | |
parent | 1d0d912870adcb4ed0dfba31c68f61340ed3304d (diff) |
use factories for reader and favicon since they have state and cant be reused
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/application.php | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/appinfo/application.php b/appinfo/application.php index be903b120..d541a4f81 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -15,10 +15,7 @@ namespace OCA\News\AppInfo; require_once __DIR__ . '/autoload.php'; -use \PicoFeed\Reader as PicoFeedReader; use \PicoFeed\Config as PicoFeedConfig; -use \PicoFeed\Client as PicoFeedClient; -use \PicoFeed\Favicon as PicoFeedFavicon; use \OC\Files\View; use \OCP\AppFramework\App; @@ -51,6 +48,8 @@ use \OCA\News\Db\MapperFactory; use \OCA\News\Utility\OPMLExporter; use \OCA\News\Utility\Updater; use \OCA\News\Utility\PicoFeedClientFactory; +use \OCA\News\Utility\PicoFeedReaderFactory; +use \OCA\News\Utility\PicoFeedFaviconFactory; use \OCA\News\Utility\ProxyConfigParser; use \OCA\News\Fetcher\Fetcher; @@ -447,14 +446,17 @@ class Application extends App { return $pico; }); - $container->registerService('PicoFeedReader', function($c) { - return new PicoFeedReader($c->query('PicoFeedConfig')); + $container->registerService('PicoFeedReaderFactory', function($c) { + return new PicoFeedReaderFactory($c->query('PicoFeedConfig')); }); $container->registerService('PicoFeedClientFactory', function($c) { return new PicoFeedClientFactory($c->query('PicoFeedConfig')); }); + $container->registerService('PicoFeedFaviconFactory', function($c) { + return new PicoFeedFaviconFactory($c->query('PicoFeedConfig')); + }); $container->registerService('Fetcher', function($c) { $fetcher = new Fetcher(); @@ -468,8 +470,8 @@ class Application extends App { $container->registerService('FeedFetcher', function($c) { return new FeedFetcher( - $c->query('PicoFeedReader'), - $c->query('FaviconFetcher'), + $c->query('PicoFeedReaderFactory'), + $c->query('PicoFeedFaviconFactory'), $c->query('TimeFactory') ); }); @@ -497,12 +499,6 @@ class Application extends App { }); - $container->registerService('FaviconFetcher', function($c) { - return new PicoFeedFavicon( - $c->query('PicoFeedConfig') - ); - }); - } public function getAppConfig() { |