diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-08 18:50:10 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-08 18:50:10 +0200 |
| commit | 31ae116fe4ab5cac3d2a85069adae2d211ecc846 (patch) | |
| tree | 10c02f09fb0086b7553091fb73c299d9b294385d /dependencyinjection | |
| parent | 83e8691308971680977b6e29d7c1fbd790e4eb16 (diff) | |
migrated database, utility, bootstrap from appframework
Diffstat (limited to 'dependencyinjection')
| -rw-r--r-- | dependencyinjection/dicontainer.php | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/dependencyinjection/dicontainer.php b/dependencyinjection/dicontainer.php index abcd93bb5..b34c17a3c 100644 --- a/dependencyinjection/dicontainer.php +++ b/dependencyinjection/dicontainer.php @@ -55,7 +55,9 @@ use \OCA\News\API\ItemAPI; use \OCA\News\Utility\Config; use \OCA\News\Utility\OPMLExporter; use \OCA\News\Utility\Updater; -use \OCA\News\Utility\SimplePieFileFactory; +use \OCA\News\Utility\SimplePieAPIFactory; +use \OCA\News\Utility\TimeFactory; +use \OCA\News\Utility\FaviconFetcher; use \OCA\News\Fetcher\Fetcher; use \OCA\News\Fetcher\FeedFetcher; @@ -68,6 +70,9 @@ use \OCA\News\Middleware\CORSMiddleware; require_once __DIR__ . '/../3rdparty/htmlpurifier/library/HTMLPurifier.auto.php'; +// uncomment once appframework not required anymore +//require_once __DIR__ . '/../3rdparty/simplepie/autoloader.php'; + class DIContainer extends BaseContainer { @@ -266,7 +271,7 @@ class DIContainer extends BaseContainer { foreach(json_decode($xpathEnhancerConfig, true) as $feed => $config) { $articleEnhancer = new XPathArticleEnhancer( - $c['SimplePieFileFactory'], + $c['SimplePieAPIFactory'], $config, $c['feedFetcherTimeout'] ); @@ -321,8 +326,16 @@ class DIContainer extends BaseContainer { $c['ItemBusinessLayer']); }); - $this['SimplePieFileFactory'] = $this->share(function($c){ - return new SimplePieFileFactory(); + $this['SimplePieAPIFactory'] = $this->share(function($c){ + return new SimplePieAPIFactory(); + }); + + $this['FaviconFetcher'] = $this->share(function($c){ + return new FaviconFetcher($c['SimplePieAPIFactory']); + }); + + $this['TimeFactory'] = $this->share(function($c){ + return new TimeFactory(); }); |