summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-10-08 13:38:22 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-10-08 13:38:22 +0200
commit323dab9b9cd4e013d9a806e3169cc5996f5c4c78 (patch)
tree2c474fb2f3fae4124abfc8add8e872d12805524f
parent97ef57e1274b349e6f671eade6badea7954872e3 (diff)
more phpdoc fixing
-rw-r--r--controller/feedapicontroller.php4
-rw-r--r--fetcher/feedfetcher.php4
-rw-r--r--fetcher/fetcher.php4
-rw-r--r--fetcher/ifeedfetcher.php4
4 files changed, 8 insertions, 8 deletions
diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php
index 0ea794bd5..33a9cbb7f 100644
--- a/controller/feedapicontroller.php
+++ b/controller/feedapicontroller.php
@@ -146,7 +146,7 @@ class FeedApiController extends ApiController {
*
* @param int $feedId
* @param int $folderId
- * @return \OCP\AppFramework\Http\JSONResponse
+ * @return array|\OCP\AppFramework\Http\JSONResponse
*/
public function move($feedId, $folderId) {
try {
@@ -166,7 +166,7 @@ class FeedApiController extends ApiController {
*
* @param int $feedId
* @param string $feedTitle
- * @return \OCP\AppFramework\Http\JSONResponse
+ * @return array|\OCP\AppFramework\Http\JSONResponse
*/
public function rename($feedId, $feedTitle) {
try {
diff --git a/fetcher/feedfetcher.php b/fetcher/feedfetcher.php
index 63c33c0ae..feeabb2bb 100644
--- a/fetcher/feedfetcher.php
+++ b/fetcher/feedfetcher.php
@@ -67,8 +67,8 @@ class FeedFetcher implements IFeedFetcher {
* @param boolean $getFavicon if the favicon should also be fetched, defaults
* to true
* @throws FetcherException if simple pie fails
- * @return array(\OCA\News\Db\Feed, \OCA\News\Db\Item[]) an array containing
- * the new feed and its items
+ * @return array an array containing the new feed and its items, first
+ * element being the Feed and second element being an array of Items
*/
public function fetch($url, $getFavicon=true) {
$simplePie = $this->simplePieFactory->getCore();
diff --git a/fetcher/fetcher.php b/fetcher/fetcher.php
index 5cd63102d..5d4a0214f 100644
--- a/fetcher/fetcher.php
+++ b/fetcher/fetcher.php
@@ -37,8 +37,8 @@ class Fetcher {
* @param boolean $getFavicon if the favicon should also be fetched, defaults
* to true
* @throws FetcherException if simple pie fails
- * @return array(\OCA\News\Db\Feed, \OCA\News\Db\Item[]) an array containing
- * the new feed and its items
+ * @return array an array containing the new feed and its items, first
+ * element being the Feed and second element being an array of Items
*/
public function fetch($url, $getFavicon=true){
foreach($this->fetchers as $fetcher){
diff --git a/fetcher/ifeedfetcher.php b/fetcher/ifeedfetcher.php
index f53257613..10d0a9af6 100644
--- a/fetcher/ifeedfetcher.php
+++ b/fetcher/ifeedfetcher.php
@@ -20,8 +20,8 @@ interface IFeedFetcher {
* @param boolean $getFavicon if the favicon should also be fetched, defaults
* to true
* @throws FetcherException if the fetcher encounters a problem
- * @return array(\OCA\News\Db\Feed, \OCA\News\Db\Item[]) an array containing
- * the new feed and its items
+ * @return array an array containing the new feed and its items, first
+ * element being the Feed and second element being an array of Items
*/
function fetch($url, $getFavicon=true);