From 73759298658da929fe2da06d0446a93a56859067 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 17 Dec 2014 19:20:21 +0100 Subject: first stab at intelligent container --- controller/admincontroller.php | 8 ++++---- controller/exportcontroller.php | 8 ++++---- controller/feedapicontroller.php | 12 ++++++------ controller/feedcontroller.php | 8 ++++---- controller/folderapicontroller.php | 8 ++++---- controller/foldercontroller.php | 8 ++++---- controller/itemapicontroller.php | 8 ++++---- controller/itemcontroller.php | 8 ++++---- controller/pagecontroller.php | 8 ++++---- controller/utilityapicontroller.php | 4 ++-- 10 files changed, 40 insertions(+), 40 deletions(-) (limited to 'controller') diff --git a/controller/admincontroller.php b/controller/admincontroller.php index 5adaef500..15b94fe2d 100644 --- a/controller/admincontroller.php +++ b/controller/admincontroller.php @@ -24,11 +24,11 @@ class AdminController extends Controller { private $config; private $configPath; - public function __construct($appName, IRequest $request, Config $config, - $configPath){ - parent::__construct($appName, $request); + public function __construct($AppName, IRequest $request, Config $config, + $ConfigPath){ + parent::__construct($AppName, $request); $this->config = $config; - $this->configPath = $configPath; + $this->configPath = $ConfigPath; } // There are no checks for the index method since the output is rendered diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php index b1d62f015..bc9fc0ff1 100644 --- a/controller/exportcontroller.php +++ b/controller/exportcontroller.php @@ -32,19 +32,19 @@ class ExportController extends Controller { private $itemService; private $userId; - public function __construct($appName, + public function __construct($AppName, IRequest $request, FolderService $folderService, FeedService $feedService, ItemService $itemService, OPMLExporter $opmlExporter, - $userId){ - parent::__construct($appName, $request); + $UserId){ + parent::__construct($AppName, $request); $this->feedService = $feedService; $this->folderService = $folderService; $this->opmlExporter = $opmlExporter; $this->itemService = $itemService; - $this->userId = $userId; + $this->userId = $UserId; } diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php index 2e48b5afe..0d9e985f7 100644 --- a/controller/feedapicontroller.php +++ b/controller/feedapicontroller.php @@ -35,19 +35,19 @@ class FeedApiController extends ApiController { private $loggerParams; private $serializer; - public function __construct($appName, + public function __construct($AppName, IRequest $request, FeedService $feedService, ItemService $itemService, ILogger $logger, - $userId, - $loggerParams){ - parent::__construct($appName, $request); + $UserId, + $LoggerParameters){ + parent::__construct($AppName, $request); $this->feedService = $feedService; $this->itemService = $itemService; - $this->userId = $userId; + $this->userId = $UserId; $this->logger = $logger; - $this->loggerParams = $loggerParams; + $this->loggerParams = $LoggerParameters; $this->serializer = new EntityApiSerializer('feeds'); } diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index e1544bff0..3be802a34 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -36,18 +36,18 @@ class FeedController extends Controller { private $userId; private $settings; - public function __construct($appName, + public function __construct($AppName, IRequest $request, FolderService $folderService, FeedService $feedService, ItemService $itemService, IConfig $settings, - $userId){ - parent::__construct($appName, $request); + $UserId){ + parent::__construct($AppName, $request); $this->feedService = $feedService; $this->folderService = $folderService; $this->itemService = $itemService; - $this->userId = $userId; + $this->userId = $UserId; $this->settings = $settings; } diff --git a/controller/folderapicontroller.php b/controller/folderapicontroller.php index ab2b5601f..53693e84f 100644 --- a/controller/folderapicontroller.php +++ b/controller/folderapicontroller.php @@ -33,15 +33,15 @@ class FolderApiController extends ApiController { private $userId; private $serializer; - public function __construct($appName, + public function __construct($AppName, IRequest $request, FolderService $folderService, ItemService $itemService, - $userId){ - parent::__construct($appName, $request); + $UserId){ + parent::__construct($AppName, $request); $this->folderService = $folderService; $this->itemService = $itemService; - $this->userId = $userId; + $this->userId = $UserId; $this->serializer = new EntityApiSerializer('folders'); } diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php index e5ad9a24f..e8c0b0e6c 100644 --- a/controller/foldercontroller.php +++ b/controller/foldercontroller.php @@ -34,17 +34,17 @@ class FolderController extends Controller { private $itemService; private $userId; - public function __construct($appName, + public function __construct($AppName, IRequest $request, FolderService $folderService, FeedService $feedService, ItemService $itemService, - $userId) { - parent::__construct($appName, $request); + $UserId) { + parent::__construct($AppName, $request); $this->folderService = $folderService; $this->feedService = $feedService; $this->itemService = $itemService; - $this->userId = $userId; + $this->userId = $UserId; } diff --git a/controller/itemapicontroller.php b/controller/itemapicontroller.php index 187a2b6b1..0fb613c92 100644 --- a/controller/itemapicontroller.php +++ b/controller/itemapicontroller.php @@ -28,13 +28,13 @@ class ItemApiController extends ApiController { private $userId; private $serializer; - public function __construct($appName, + public function __construct($AppName, IRequest $request, ItemService $itemService, - $userId){ - parent::__construct($appName, $request); + $UserId){ + parent::__construct($AppName, $request); $this->itemService = $itemService; - $this->userId = $userId; + $this->userId = $UserId; $this->serializer = new EntityApiSerializer('items'); } diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php index f2ff5990a..bf63bc0b8 100644 --- a/controller/itemcontroller.php +++ b/controller/itemcontroller.php @@ -33,16 +33,16 @@ class ItemController extends Controller { private $userId; private $settings; - public function __construct($appName, + public function __construct($AppName, IRequest $request, FeedService $feedService, ItemService $itemService, IConfig $settings, - $userId){ - parent::__construct($appName, $request); + $UserId){ + parent::__construct($AppName, $request); $this->itemService = $itemService; $this->feedService = $feedService; - $this->userId = $userId; + $this->userId = $UserId; $this->settings = $settings; } diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 6f37f5855..8bb266786 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -36,7 +36,7 @@ class PageController extends Controller { private $config; private $recommendedSites; - public function __construct($appName, + public function __construct($AppName, IRequest $request, IConfig $settings, IURLGenerator $urlGenerator, @@ -44,13 +44,13 @@ class PageController extends Controller { Config $config, IL10N $l10n, RecommendedSites $recommendedSites, - $userId){ - parent::__construct($appName, $request); + $UserId){ + parent::__construct($AppName, $request); $this->settings = $settings; $this->urlGenerator = $urlGenerator; $this->appConfig = $appConfig; $this->l10n = $l10n; - $this->userId = $userId; + $this->userId = $UserId; $this->config = $config; $this->recommendedSites = $recommendedSites; } diff --git a/controller/utilityapicontroller.php b/controller/utilityapicontroller.php index c2a62e93a..0651b5c2f 100644 --- a/controller/utilityapicontroller.php +++ b/controller/utilityapicontroller.php @@ -26,11 +26,11 @@ class UtilityApiController extends ApiController { private $updater; private $settings; - public function __construct($appName, + public function __construct($AppName, IRequest $request, Updater $updater, IConfig $settings){ - parent::__construct($appName, $request); + parent::__construct($AppName, $request); $this->updater = $updater; $this->settings = $settings; } -- cgit v1.2.3