Make function signature for getNoticeIds agree

There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.

diff --git a/lib/cachingnoticestream.php b/lib/cachingnoticestream.php
index 0b5aa33a376e8fc774a55ed01af67bfdc2898ba9..f8ab2a85afb4388846a00c8dd5185f251d462c5f 100644 (file)
--- a/lib/cachingnoticestream.php
+++ b/lib/cachingnoticestream.php
@@ -58,7 +58,7 @@ class CachingNoticeStream extends NoticeStream
         $this->cachekey = $cachekey;
     }
 
-    function getNoticeIds($offset=0, $limit=20, $sinceId=0, $maxId=0)
+    function getNoticeIds($offset, $limit, $sinceId, $maxId)
     {
         $cache = Cache::instance();
 

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index b26e898612cd5d86e4a1b9fc293de4a2b4056be2..dbba6cd6f0f225a97aeb7a9e888690e4f9497715 100644 (file)
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -18,7 +18,7 @@ class RawConversationNoticeStream extends NoticeStream
         $this->id = $id;
     }
 
-    function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $notice = new Notice();
 

diff --git a/lib/noticestream.php b/lib/noticestream.php
index b60fc236f706e60e34ffa8d57bf4999ea61f8ceb..025138be4ded80db592be3f9e46ed0138b92d9a8 100644 (file)
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -46,9 +46,9 @@ if (!defined('STATUSNET')) {
  */
 abstract class NoticeStream
 {
-    abstract function getNoticeIds($offset, $limit, $sinceId, $maxId);
+    abstract function getNoticeIds($offset, $limit, $since_id, $max_id);
 
-    function getNotices($offset=0, $limit=20, $sinceId=0, $maxId=0)
+    function getNotices($offset, $limit, $sinceId, $maxId)
     {
         $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
 

diff --git a/lib/publicnoticestream.php b/lib/publicnoticestream.php
index 0162375451e73205b50aafa4d4177f10ccc37510..6a861ca26e68109921ca1acd4042a0c2602df88b 100644 (file)
--- a/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.php
@@ -10,7 +10,7 @@ class PublicNoticeStream extends CachingNoticeStream
 
 class RawPublicNoticeStream extends NoticeStream
 {
-    function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $notice = new Notice();
 

diff --git a/lib/replynoticestream.php b/lib/replynoticestream.php
index f358afcc5400651b48e1299a5b6f93d2d5c4b871..d0ae5fc4a7309b44746237543187263bef8d4876 100644 (file)
--- a/lib/replynoticestream.php
+++ b/lib/replynoticestream.php
@@ -18,7 +18,7 @@ class RawReplyNoticeStream extends NoticeStream
         $this->userId = $userId;
     }
 
-    function getNoticeIds($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $reply = new Reply();
         $reply->profile_id = $this->userId;