From 0f56b6d62cd4af2af5276f7c073737b2d07b0ffd Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 26 Jun 2014 11:41:21 +0200
Subject: style fixes

---
 articleenhancer/xpatharticleenhancer.php | 2 +-
 controller/feedapicontroller.php         | 2 +-
 controller/feedcontroller.php            | 2 +-
 service/folderservice.php                | 2 +-
 utility/faviconfetcher.php               | 5 ++++-
 utility/opmlexporter.php                 | 4 ++--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/articleenhancer/xpatharticleenhancer.php b/articleenhancer/xpatharticleenhancer.php
index 8262fc462..0f541c2ce 100644
--- a/articleenhancer/xpatharticleenhancer.php
+++ b/articleenhancer/xpatharticleenhancer.php
@@ -164,7 +164,7 @@ class XPathArticleEnhancer implements ArticleEnhancer {
 	/**
 	 * Method which builds a URL by taking a relative URL and its corresponding
 	 * absolute URL
-	 * For examle relative URL "../example/path/file.php?a=1#anchor" and
+	 * For example relative URL "../example/path/file.php?a=1#anchor" and
 	 * absolute URL "https://username:password@www.website.com/subfolder/index.html"
 	 * will result in "https://username:password@www.website.com/example/path/file.php?a=1#anchor"
 	 * @param string $relativeUrl the relative URL
diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php
index f0af19f4a..0ea794bd5 100644
--- a/controller/feedapicontroller.php
+++ b/controller/feedapicontroller.php
@@ -207,7 +207,7 @@ class FeedApiController extends ApiController {
 	public function update($userId, $feedId) {
 		try {
 			$this->feedService->update($feedId, $userId);
-		// ignore update failure (feed could not be reachable etc, we dont care)
+		// ignore update failure (feed could not be reachable etc, we don't care)
 		} catch(\Exception $ex) {
 			$this->logger->debug('Could not update feed ' . $ex->getMessage(),
 					$this->loggerParams);
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index d62b05c45..0bd49837a 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -184,7 +184,7 @@ class FeedController extends Controller {
 
 			return [
 				'feeds' => [
-					// only pass unreadcount to not accidentally readd
+					// only pass unread count to not accidentally readd
 					// the feed again
 					[
 						'id' => $feed->getId(),
diff --git a/service/folderservice.php b/service/folderservice.php
index 5622a5260..f6d45c7e5 100644
--- a/service/folderservice.php
+++ b/service/folderservice.php
@@ -66,7 +66,7 @@ class FolderService extends Service {
 	 * Creates a new folder
 	 * @param string $folderName the name of the folder
 	 * @param string $userId the name of the user for whom it should be created
-	 * @param int $parentId the parent folder id, deprecated we dont nest folders
+	 * @param int $parentId the parent folder id, deprecated we don't nest folders
 	 * @throws ServiceConflictException if name exists already
 	 * @throws ServiceValidationException if the folder has invalid parameters
 	 * @return Folder the newly created folder
diff --git a/utility/faviconfetcher.php b/utility/faviconfetcher.php
index 88a1af317..10088dad3 100644
--- a/utility/faviconfetcher.php
+++ b/utility/faviconfetcher.php
@@ -89,6 +89,8 @@ class FaviconFetcher {
 				}
 			}
 		}
+
+        return null;
 	}
 
 	
@@ -117,7 +119,8 @@ class FaviconFetcher {
 		}
 
 		$file = $this->getFile($url);
-		$sniffer = new \SimplePie_Content_Type_Sniffer($file);
+        /** @noinspection PhpParamsInspection */
+        $sniffer = new \SimplePie_Content_Type_Sniffer($file);
 		return $sniffer->image() !== false;
 	}
 
diff --git a/utility/opmlexporter.php b/utility/opmlexporter.php
index 8dfb996c6..98403e7f2 100644
--- a/utility/opmlexporter.php
+++ b/utility/opmlexporter.php
@@ -21,8 +21,8 @@ class OPMLExporter {
     /**
      * Generates the OPML for the active user
      *
-     * @param Folder[] $folders
-     * @param Feed[] $feeds
+     * @param \OCA\News\Db\Folder[] $folders
+     * @param \OCA\News\Db\Feed[] $feeds
      * @return \DomDocument the document
      */
 	public function build($folders, $feeds){
-- 
cgit v1.2.3