use correct type in childclass and dont depend on parent protected attribute with hinted interface

3 files changed, 50 insertions, 44 deletions

diff --git a/businesslayer/feedbusinesslayer.php b/businesslayer/feedbusinesslayer.php
index efe763e8d..024c7b8ea 100644
--- a/businesslayer/feedbusinesslayer.php
+++ b/businesslayer/feedbusinesslayer.php
@@ -28,6 +28,7 @@ class FeedBusinessLayer extends BusinessLayer {
 
 	private $feedFetcher;
 	private $itemMapper;
+	private $feedMapper;
 	private $logger;
 	private $l10n;
 	private $timeFactory;
@@ -53,6 +54,7 @@ class FeedBusinessLayer extends BusinessLayer {
 		$this->autoPurgeMinimumInterval = $config->getAutoPurgeMinimumInterval();
 		$this->enhancer = $enhancer;
 		$this->purifier = $purifier;
+		$this->feedMapper = $feedMapper;
 	}
 
 	/**
@@ -61,7 +63,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	 * @return array of feeds
 	 */
 	public function findAll($userId){
-		return $this->mapper->findAllFromUser($userId);
+		return $this->feedMapper->findAllFromUser($userId);
 	}
 
 
@@ -70,7 +72,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	 * @return array of feeds
 	 */
 	public function findAllFromAllUsers() {
-		return $this->mapper->findAll();
+		return $this->feedMapper->findAll();
 	}
 
 
@@ -90,7 +92,7 @@ class FeedBusinessLayer extends BusinessLayer {
 
 			// try again if feed exists depending on the reported link
 			try {
-				$this->mapper->findByUrlHash($feed->getUrlHash(), $userId);
+				$this->feedMapper->findByUrlHash($feed->getUrlHash(), $userId);
 				throw new BusinessLayerConflictException(
 					$this->l10n->t('Can not add feed: Exists already'));
 
@@ -101,7 +103,7 @@ class FeedBusinessLayer extends BusinessLayer {
 			$feed->setFolderId($folderId);
 			$feed->setUserId($userId);
 			$feed->setArticlesPerUpdate(count($items));
-			$feed = $this->mapper->insert($feed);
+			$feed = $this->feedMapper->insert($feed);
 
 			// insert items in reverse order because the first one is usually the
 			// newest item
@@ -143,7 +145,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	 */
 	public function updateAll(){
 		// TODO: this method is not covered by any tests
-		$feeds = $this->mapper->findAll();
+		$feeds = $this->feedMapper->findAll();
 		foreach($feeds as $feed){
 			try {
 				$this->update($feed->getId(), $feed->getUserId());
@@ -164,7 +166,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	 */
 	public function update($feedId, $userId){
 		try {
-			$existingFeed = $this->mapper->find($feedId, $userId);
+			$existingFeed = $this->feedMapper->find($feedId, $userId);
 
 			if($existingFeed->getPreventUpdate() === true) {
 				return;
@@ -177,7 +179,7 @@ class FeedBusinessLayer extends BusinessLayer {
 				// update number of articles on every feed update
 				if($existingFeed->getArticlesPerUpdate() !== count($items)) {
 					$existingFeed->setArticlesPerUpdate(count($items));
-					$this->mapper->update($existingFeed);
+					$this->feedMapper->update($existingFeed);
 				}
 
 				// insert items in reverse order because the first one is usually
@@ -203,7 +205,7 @@ class FeedBusinessLayer extends BusinessLayer {
 				$this->logger->log($ex->getMessage(), 'debug');
 			}
 
-			return $this->mapper->find($feedId, $userId);
+			return $this->feedMapper->find($feedId, $userId);
 
 		} catch (DoesNotExistException $ex){
 			throw new BusinessLayerException('Feed does not exist');
@@ -221,7 +223,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	public function move($feedId, $folderId, $userId){
 		$feed = $this->find($feedId, $userId);
 		$feed->setFolderId($folderId);
-		$this->mapper->update($feed);
+		$this->feedMapper->update($feed);
 	}
 
 
@@ -235,7 +237,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	public function rename($feedId, $feedTitle, $userId) {
 		$feed = $this->find($feedId, $userId);
 		$feed->setTitle($feedTitle);
-		$this->mapper->update($feed);
+		$this->feedMapper->update($feed);
 	}
 
 
@@ -281,7 +283,7 @@ class FeedBusinessLayer extends BusinessLayer {
 				$feed->setAdded($this->timeFactory->getTime());
 				$feed->setFolderId(0);
 				$feed->setPreventUpdate(true);	
-				$feed = $this->mapper->insert($feed);
+				$feed = $this->feedMapper->insert($feed);
 
 				$item->setFeedId($feed->getId());
 				$feedsDict[$feed->getLink()] = $feed;
@@ -300,7 +302,7 @@ class FeedBusinessLayer extends BusinessLayer {
 		}
 
 		if($createdFeed) {
-			return $this->mapper->findByUrlHash($urlHash, $userId);
+			return $this->feedMapper->findByUrlHash($urlHash, $userId);
 		}
 	}
 
@@ -314,7 +316,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	public function markDeleted($feedId, $userId) {
 		$feed = $this->find($feedId, $userId);
 		$feed->setDeletedAt($this->timeFactory->getTime());
-		$this->mapper->update($feed);
+		$this->feedMapper->update($feed);
 	}
 
 
@@ -327,7 +329,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	public function unmarkDeleted($feedId, $userId) {
 		$feed = $this->find($feedId, $userId);
 		$feed->setDeletedAt(0);
-		$this->mapper->update($feed);
+		$this->feedMapper->update($feed);
 	}
 
 
@@ -346,10 +348,10 @@ class FeedBusinessLayer extends BusinessLayer {
 			$deleteOlderThan = $now - $this->autoPurgeMinimumInterval;
 		}
 
-		$toDelete = $this->mapper->getToDelete($deleteOlderThan, $userId);
+		$toDelete = $this->feedMapper->getToDelete($deleteOlderThan, $userId);
 
 		foreach ($toDelete as $feed) {
-			$this->mapper->delete($feed);
+			$this->feedMapper->delete($feed);
 		}
 	}
 
@@ -360,7 +362,7 @@ class FeedBusinessLayer extends BusinessLayer {
 	 * @param string $userId the name of the user
 	 */
 	public function deleteUser($userId) {
-		$this->mapper->deleteUser($userId);
+		$this->feedMapper->deleteUser($userId);
 	}
 
 
diff --git a/businesslayer/folderbusinesslayer.php b/businesslayer/folderbusinesslayer.php
index 46774aa5e..924e23c25 100644
--- a/businesslayer/folderbusinesslayer.php
+++ b/businesslayer/folderbusinesslayer.php
@@ -23,6 +23,7 @@ class FolderBusinessLayer extends BusinessLayer {
 	private $l10n;
 	private $timeFactory;
 	private $autoPurgeMinimumInterval;
+	private $folderMapper;
 
 	public function __construct(FolderMapper $folderMapper,
 	                            $l10n,
@@ -32,6 +33,7 @@ class FolderBusinessLayer extends BusinessLayer {
 		$this->l10n = $l10n;
 		$this->timeFactory = $timeFactory;
 		$this->autoPurgeMinimumInterval = $config->getAutoPurgeMinimumInterval();
+		$this->folderMapper = $folderMapper;
 	}
 
 	/**
@@ -40,12 +42,12 @@ class FolderBusinessLayer extends BusinessLayer {
 	 * @return array of folders
 	 */
 	public function findAll($userId) {
-		return $this->mapper->findAllFromUser($userId);
+		return $this->folderMapper->findAllFromUser($userId);
 	}
 
 
 	private function validateFolder($folderName, $userId){
-		$existingFolders = $this->mapper->findByName($folderName, $userId);
+		$existingFolders = $this->folderMapper->findByName($folderName, $userId);
 		if(count($existingFolders) > 0){
 
 			throw new BusinessLayerConflictException(
@@ -75,7 +77,7 @@ class FolderBusinessLayer extends BusinessLayer {
 		$folder->setUserId($userId);
 		$folder->setParentId($parentId);
 		$folder->setOpened(true);
-		return $this->mapper->insert($folder);
+		return $this->folderMapper->insert($folder);
 	}
 
 
@@ -85,7 +87,7 @@ class FolderBusinessLayer extends BusinessLayer {
 	public function open($folderId, $opened, $userId){
 		$folder = $this->find($folderId, $userId);
 		$folder->setOpened($opened);
-		$this->mapper->update($folder);
+		$this->folderMapper->update($folder);
 	}
 
 
@@ -104,7 +106,7 @@ class FolderBusinessLayer extends BusinessLayer {
 
 		$folder = $this->find($folderId, $userId);
 		$folder->setName($folderName);
-		return $this->mapper->update($folder);
+		return $this->folderMapper->update($folder);
 	}
 
 
@@ -117,7 +119,7 @@ class FolderBusinessLayer extends BusinessLayer {
 	public function markDeleted($folderId, $userId) {
 		$folder = $this->find($folderId, $userId);
 		$folder->setDeletedAt($this->timeFactory->getTime());
-		$this->mapper->update($folder);
+		$this->folderMapper->update($folder);
 	}
 
 
@@ -130,7 +132,7 @@ class FolderBusinessLayer extends BusinessLayer {
 	public function unmarkDeleted($folderId, $userId) {
 		$folder = $this->find($folderId, $userId);
 		$folder->setDeletedAt(0);
-		$this->mapper->update($folder);
+		$this->folderMapper->update($folder);
 	}
 
 
@@ -149,10 +151,10 @@ class FolderBusinessLayer extends BusinessLayer {
 			$deleteOlderThan = $now - $this->autoPurgeMinimumInterval;
 		}
 
-		$toDelete = $this->mapper->getToDelete($deleteOlderThan, $userId);
+		$toDelete = $this->folderMapper->getToDelete($deleteOlderThan, $userId);
 
 		foreach ($toDelete as $folder) {
-			$this->mapper->delete($folder);
+			$this->folderMapper->delete($folder);
 		}
 	}
 
@@ -162,7 +164,7 @@ class FolderBusinessLayer extends BusinessLayer {
 	 * @param string $userId the name of the user
 	 */
 	public function deleteUser($userId) {
-		$this->mapper->deleteUser($userId);
+		$this->folderMapper->deleteUser($userId);
 	}
 
 
diff --git a/businesslayer/itembusinesslayer.php b/businesslayer/itembusinesslayer.php
index 093df4436..85fa4d10f 100644
--- a/businesslayer/itembusinesslayer.php
+++ b/businesslayer/itembusinesslayer.php
@@ -26,6 +26,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	private $statusFlag;
 	private $autoPurgeCount;
 	private $timeFactory;
+	private $itemMapper;
 
 	public function __construct(ItemMapper $itemMapper, StatusFlag $statusFlag,
 								$timeFactory, Config $config){
@@ -33,6 +34,7 @@ class ItemBusinessLayer extends BusinessLayer {
 		$this->statusFlag = $statusFlag;
 		$this->autoPurgeCount = $config->getAutoPurgeCount();
 		$this->timeFactory = $timeFactory;
+		$this->itemMapper = $itemMapper;
 	}
 
 
@@ -51,15 +53,15 @@ class ItemBusinessLayer extends BusinessLayer {
 
 		switch($type){
 			case FeedType::FEED:
-				$items = $this->mapper->findAllNewFeed($id, $updatedSince,
+				$items = $this->itemMapper->findAllNewFeed($id, $updatedSince,
 					                                   $status, $userId);
 				break;
 			case FeedType::FOLDER:
-				$items = $this->mapper->findAllNewFolder($id, $updatedSince,
+				$items = $this->itemMapper->findAllNewFolder($id, $updatedSince,
 					                                   $status, $userId);
 				break;
 			default:
-				$items = $this->mapper->findAllNew($updatedSince, $status,
+				$items = $this->itemMapper->findAllNew($updatedSince, $status,
 					                               $userId);
 		}
 
@@ -82,15 +84,15 @@ class ItemBusinessLayer extends BusinessLayer {
 
 		switch($type){
 			case FeedType::FEED:
-				$items = $this->mapper->findAllFeed($id, $limit, $offset,
+				$items = $this->itemMapper->findAllFeed($id, $limit, $offset,
 					                                   $status, $userId);
 				break;
 			case FeedType::FOLDER:
-				$items = $this->mapper->findAllFolder($id, $limit, $offset,
+				$items = $this->itemMapper->findAllFolder($id, $limit, $offset,
 					                                   $status, $userId);
 				break;
 			default:
-				$items = $this->mapper->findAll($limit, $offset, $status,
+				$items = $this->itemMapper->findAll($limit, $offset, $status,
 					                               $userId);
 		}
 
@@ -108,7 +110,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 */
 	public function star($feedId, $guidHash, $isStarred, $userId){
 		try {
-			$item = $this->mapper->findByGuidHash($guidHash, $feedId, $userId);
+			$item = $this->itemMapper->findByGuidHash($guidHash, $feedId, $userId);
 
 			$item->setLastModified($this->timeFactory->getTime());
 			if($isStarred){
@@ -116,7 +118,7 @@ class ItemBusinessLayer extends BusinessLayer {
 			} else {
 				$item->setUnstarred();
 			}
-			$this->mapper->update($item);
+			$this->itemMapper->update($item);
 		} catch(DoesNotExistException $ex) {
 			throw new BusinessLayerException($ex->getMessage());
 		}
@@ -138,7 +140,7 @@ class ItemBusinessLayer extends BusinessLayer {
 		} else {
 			$item->setUnread();
 		}
-		$this->mapper->update($item);
+		$this->itemMapper->update($item);
 	}
 
 
@@ -150,7 +152,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 */
 	public function readAll($highestItemId, $userId){
 		$time = $this->timeFactory->getTime();
-		$this->mapper->readAll($highestItemId, $time, $userId);
+		$this->itemMapper->readAll($highestItemId, $time, $userId);
 	}
 
 
@@ -163,7 +165,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 */
 	public function readFolder($folderId, $highestItemId, $userId){
 		$time = $this->timeFactory->getTime();
-		$this->mapper->readFolder($folderId, $highestItemId, $time, $userId);
+		$this->itemMapper->readFolder($folderId, $highestItemId, $time, $userId);
 	}
 
 
@@ -176,7 +178,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 */
 	public function readFeed($feedId, $highestItemId, $userId){
 		$time = $this->timeFactory->getTime();
-		$this->mapper->readFeed($feedId, $highestItemId, $time, $userId);
+		$this->itemMapper->readFeed($feedId, $highestItemId, $time, $userId);
 	}
 
 
@@ -187,7 +189,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 * old, the id is taken
 	 */
 	public function autoPurgeOld(){
-		$this->mapper->deleteReadOlderThanThreshold($this->autoPurgeCount);
+		$this->itemMapper->deleteReadOlderThanThreshold($this->autoPurgeCount);
 	}
 
 
@@ -199,7 +201,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 */
 	public function getNewestItemId($userId) {
 		try {
-			return $this->mapper->getNewestItemId($userId);
+			return $this->itemMapper->getNewestItemId($userId);
 		} catch(DoesNotExistException $ex) {
 			throw new BusinessLayerException($ex->getMessage());
 		}
@@ -212,7 +214,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 * @return int the count
 	 */
 	public function starredCount($userId){
-		return $this->mapper->starredCount($userId);
+		return $this->itemMapper->starredCount($userId);
 	}
 
 
@@ -221,7 +223,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 * @return array of items which are starred or unread
 	 */
 	public function getUnreadOrStarred($userId) {
-		return $this->mapper->findAllUnreadOrStarred($userId);
+		return $this->itemMapper->findAllUnreadOrStarred($userId);
 	}
 
 
@@ -230,7 +232,7 @@ class ItemBusinessLayer extends BusinessLayer {
 	 * @param string $userId the name of the user
 	 */
 	public function deleteUser($userId) {
-		$this->mapper->deleteUser($userId);
+		$this->itemMapper->deleteUser($userId);
 	}