diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-09 18:50:01 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-09 22:52:28 +0200 |
commit | d3379573fde9ec2a714a3bfdda2662340212a587 (patch) | |
tree | aa38c76bebba4f054524126af89e562bd950e504 | |
parent | 1b21cab240ed8b2e37171d8d8ea598a4c42547c5 (diff) |
use query instead of array access
-rw-r--r-- | app/news.php | 152 | ||||
-rw-r--r-- | backgroundjob/task.php | 8 | ||||
-rw-r--r-- | hooks/user.php | 6 |
3 files changed, 83 insertions, 83 deletions
diff --git a/app/news.php b/app/news.php index aa71fc4fc..0935d476a 100644 --- a/app/news.php +++ b/app/news.php @@ -89,82 +89,82 @@ class News extends App { */ $container->registerService('PageController', function($c) { return new PageController( - $c['API'], - $c['Request'] + $c->query('API'), + $c->query('Request') ); }); $container->registerService('FolderController', function($c) { return new FolderController( - $c['API'], - $c['Request'], - $c['FolderBusinessLayer'], - $c['FeedBusinessLayer'], - $c['ItemBusinessLayer'] + $c->query('API'), + $c->query('Request'), + $c->query('FolderBusinessLayer'), + $c->query('FeedBusinessLayer'), + $c->query('ItemBusinessLayer') ); }); $container->registerService('FeedController', function($c) { return new FeedController( - $c['API'], - $c['Request'], - $c['FolderBusinessLayer'], - $c['FeedBusinessLayer'], - $c['ItemBusinessLayer'] + $c->query('API'), + $c->query('Request'), + $c->query('FolderBusinessLayer'), + $c->query('FeedBusinessLayer'), + $c->query('ItemBusinessLayer') ); }); $container->registerService('ItemController', function($c) { return new ItemController( - $c['API'], - $c['Request'], - $c['FeedBusinessLayer'], - $c['ItemBusinessLayer'] + $c->query('API'), + $c->query('Request'), + $c->query('FeedBusinessLayer'), + $c->query('ItemBusinessLayer') ); }); $container->registerService('ExportController', function($c) { return new ExportController( - $c['API'], - $c['Request'], - $c['FeedBusinessLayer'], - $c['FolderBusinessLayer'], - $c['ItemBusinessLayer'], - $c['OPMLExporter']); + $c->query('API'), + $c->query('Request'), + $c->query('FeedBusinessLayer'), + $c->query('FolderBusinessLayer'), + $c->query('ItemBusinessLayer'), + $c->query('OPMLExporter')); }); $container->registerService('ApiController', function($c) { return new ApiController( - $c['API'], - $c['Request'], - $c['Updater'] + $c->query('API'), + $c->query('Request'), + $c->query('Updater') ); }); $container->registerService('FolderApiController', function($c) { return new FolderApiController( - $c['API'], - $c['Request'], - $c['FolderBusinessLayer'], - $c['ItemBusinessLayer'] + $c->query('API'), + $c->query('Request'), + $c->query('FolderBusinessLayer'), + $c->query('ItemBusinessLayer') ); }); $container->registerService('FeedApiController', function($c) { return new FeedApiController( - $c['API'], - $c['Request'], - $c['FolderBusinessLayer'], - $c['FeedBusinessLayer'], - $c['ItemBusinessLayer'] + $c->query('API'), + $c->query('Request'), + $c->query('FolderBusinessLayer'), + $c->query('FeedBusinessLayer'), + $c->query('ItemBusinessLayer') ); }); $container->registerService('ItemApiController', function($c) { return new ItemApiController( - $c['API'], - $c['Request'], - $c['ItemBusinessLayer'] + $c->query('API'), + $c->query('Request'), + $c->query('ItemBusinessLayer') ); }); @@ -174,32 +174,32 @@ class News extends App { */ $container->registerService('FolderBusinessLayer', function($c) { return new FolderBusinessLayer( - $c['FolderMapper'], - $c['API'], - $c['TimeFactory'], - $c['Config'] + $c->query('FolderMapper'), + $c->query('API'), + $c->query('TimeFactory'), + $c->query('Config') ); }); $container->registerService('FeedBusinessLayer', function($c) { return new FeedBusinessLayer( - $c['FeedMapper'], - $c['Fetcher'], - $c['ItemMapper'], - $c['API'], - $c['TimeFactory'], - $c['Config'], - $c['Enhancer'], - $c['HTMLPurifier'] + $c->query('FeedMapper'), + $c->query('Fetcher'), + $c->query('ItemMapper'), + $c->query('API'), + $c->query('TimeFactory'), + $c->query('Config'), + $c->query('Enhancer'), + $c->query('HTMLPurifier') ); }); $container->registerService('ItemBusinessLayer', function($c) { return new ItemBusinessLayer( - $c['ItemMapper'], - $c['StatusFlag'], - $c['TimeFactory'], - $c['Config'] + $c->query('ItemMapper'), + $c->query('StatusFlag'), + $c->query('TimeFactory'), + $c->query('Config') ); }); @@ -209,25 +209,25 @@ class News extends App { */ $container->registerService('MapperFactory', function($c) { return new MapperFactory( - $c['API'] + $c->query('API') ); }); $container->registerService('FolderMapper', function($c) { return new FolderMapper( - $c['API'] + $c->query('API') ); }); $container->registerService('FeedMapper', function($c) { return new FeedMapper( - $c['API'] + $c->query('API') ); }); $container->registerService('ItemMapper', function($c) { - return $c['MapperFactory']->getItemMapper( - $c['API'] + return $c->query('MapperFactory')->getItemMapper( + $c->query('API') ); }); @@ -237,7 +237,7 @@ class News extends App { */ $container->registerService('API', function($c){ return new API( - $c['news'] + $c->query('news') ); }); @@ -251,13 +251,13 @@ class News extends App { }); $container->registerService('Config', function($c) { - $config = new Config($c['ConfigView'], $c['API']); + $config = new Config($c->query('ConfigView'), $c->query('API')); $config->read('config.ini', true); return $config; }); $container->registerService('simplePieCacheDirectory', function($c) { - $directory = $c['API']->getSystemValue('datadirectory') . + $directory = $c->query('API')->getSystemValue('datadirectory') . '/news/cache/simplepie'; if(!is_dir($directory)) { @@ -267,7 +267,7 @@ class News extends App { }); $container->registerService('HTMLPurifier', function($c) { - $directory = $c['API']->getSystemValue('datadirectory') . + $directory = $c->query('API')->getSystemValue('datadirectory') . '/news/cache/purifier'; if(!is_dir($directory)) { @@ -295,9 +295,9 @@ class News extends App { foreach(json_decode($xpathEnhancerConfig, true) as $feed => $config) { $articleEnhancer = new XPathArticleEnhancer( - $c['SimplePieAPIFactory'], + $c->query('SimplePieAPIFactory'), $config, - $c['Config'] + $c->query('Config') ); $enhancer->registerEnhancer($feed, $articleEnhancer); } @@ -323,19 +323,19 @@ class News extends App { // register fetchers in order // the most generic fetcher should be the last one - $fetcher->registerFetcher($c['FeedFetcher']); + $fetcher->registerFetcher($c->query('FeedFetcher')); return $fetcher; }); $container->registerService('FeedFetcher', function($c) { return new FeedFetcher( - $c['API'], - $c['SimplePieAPIFactory'], - $c['FaviconFetcher'], - $c['TimeFactory'], - $c['simplePieCacheDirectory'], - $c['Config'] + $c->query('API'), + $c->query('SimplePieAPIFactory'), + $c->query('FaviconFetcher'), + $c->query('TimeFactory'), + $c->query('simplePieCacheDirectory'), + $c->query('Config') ); }); @@ -349,9 +349,9 @@ class News extends App { $container->registerService('Updater', function($c) { return new Updater( - $c['FolderBusinessLayer'], - $c['FeedBusinessLayer'], - $c['ItemBusinessLayer'] + $c->query('FolderBusinessLayer'), + $c->query('FeedBusinessLayer'), + $c->query('ItemBusinessLayer') ); }); @@ -361,7 +361,7 @@ class News extends App { $container->registerService('FaviconFetcher', function($c) { return new FaviconFetcher( - $c['SimplePieAPIFactory'] + $c->query('SimplePieAPIFactory') ); }); @@ -370,7 +370,7 @@ class News extends App { */ $container->registerService('CORSMiddleware', function($c) { return new CORSMiddleware( - $c['Request'] + $c->query('Request') ); }); diff --git a/backgroundjob/task.php b/backgroundjob/task.php index 1c602cce0..1f4ebc1e0 100644 --- a/backgroundjob/task.php +++ b/backgroundjob/task.php @@ -38,10 +38,10 @@ class Task { // make it possible to turn off cron updates if you use an external // script to execute updates in paralell - if ($container['Config']->getUseCronUpdates()) { - $container['Updater']->beforeUpdate(); - $container['Updater']->update(); - $container['Updater']->afterUpdate(); + if ($container->query('Config')->getUseCronUpdates()) { + $container->query('Updater')->beforeUpdate(); + $container->query('Updater')->update(); + $container->query('Updater')->afterUpdate(); } } diff --git a/hooks/user.php b/hooks/user.php index 148b62164..a0015c4cf 100644 --- a/hooks/user.php +++ b/hooks/user.php @@ -38,9 +38,9 @@ class User { $container = $app->getContainer(); // order is important! - $container['ItemBusinessLayer']->deleteUser($userId); - $container['FeedBusinessLayer']->deleteUser($userId); - $container['FolderBusinessLayer']->deleteUser($userId); + $container->query('ItemBusinessLayer')->deleteUser($userId); + $container->query('FeedBusinessLayer')->deleteUser($userId); + $container->query('FolderBusinessLayer')->deleteUser($userId); } |