Function declarations not matching their parents

diff --git a/actions/apiconversation.php b/actions/apiconversation.php
index 0e292303d58b2791e052f4da9d8c50eb63e096d2..5e1102b2f6f415928dc1cabd4b05247738083459 100644 (file)
--- a/actions/apiconversation.php
+++ b/actions/apiconversation.php
@@ -49,16 +49,9 @@ class ApiconversationAction extends ApiAuthAction
     protected $conversation = null;
     protected $notices      = null;
 
-    /**
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
+    protected function prepare(array $args=array())
     {
-        parent::prepare($argarray);
+        parent::prepare($args);
 
         $convId = $this->trimmed('id');
 

diff --git a/actions/conversation.php b/actions/conversation.php
index 5a6e4b5c7a51c6357c1b482fa9ad9aad280af73e..b1cb50abacdde4b179e5b0c9f6b5c5a35e1a9a07 100644 (file)
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -97,7 +97,7 @@ class ConversationAction extends ManagedAction
         Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped));
     }
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }

diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index 9233c9bde6d202996ba61d24ddd6087fc4245fb4..37f722291e53e1525f0eb532a4f918887d923aec 100644 (file)
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -72,9 +72,9 @@ class ClientErrorAction extends ErrorAction
 
     // XXX: Should these error actions even be invokable via URI?
 
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         $this->code = $this->trimmed('code');
 

diff --git a/lib/fullthreadednoticelist.php b/lib/fullthreadednoticelist.php
index 52b5f279c9436b1114548076ed32f4ef5e3dca4f..0cc023ca5dbc6ca25e62698923eeb74d70f975e0 100644 (file)
--- a/lib/fullthreadednoticelist.php
+++ b/lib/fullthreadednoticelist.php
@@ -48,7 +48,7 @@ if (!defined('STATUSNET')) {
 
 class FullThreadedNoticeList extends ThreadedNoticeList
 {
-    function newListItem($notice)
+    function newListItem(Notice $notice)
     {
         return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile);
     }

diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 54cc99099a5abef5e27e56c70315a31dc5525216..c8e3067b825c7098d27a8372cd3652bcfbada196 100644 (file)
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -78,9 +78,9 @@ class ServerErrorAction extends ErrorAction
 
     // XXX: Should these error actions even be invokable via URI?
 
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         $this->code = $this->trimmed('code');
 

diff --git a/plugins/Mobile/WAP20Plugin.php b/plugins/Mobile/WAP20Plugin.php
index fc5008cda6ff91b29990031ef4a4d6a1d245c0e1..a48a32e9f1ecb16e1519f0b14993e5482923d0ae 100644 (file)
--- a/plugins/Mobile/WAP20Plugin.php
+++ b/plugins/Mobile/WAP20Plugin.php
@@ -43,7 +43,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class WAP20Plugin extends Plugin
 {
-    function onStartShowHTML($action)
+    function onStartShowHTML(Action $action)
     {
 
     }

diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index f64cd905cf45af32e9bdae85e54dbdee753ed6e9..e8c983eb9ae5d2c0bfae6c5433c43716703536ad 100644 (file)
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -260,7 +260,7 @@ class QnAPlugin extends MicroAppPlugin
      * @return boolean hook value
      */
 
-    function onStartOpenNoticeListItemElement($nli)
+    function onStartOpenNoticeListItemElement(NoticeListItem $nli)
     {
         $type = $nli->notice->object_type;
 
@@ -325,7 +325,7 @@ class QnAPlugin extends MicroAppPlugin
      *
      * @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
      */
-    function onStartShowNoticeItem($nli)
+    function onStartShowNoticeItem(NoticeListItem $nli)
     {
         if (!$this->isMyNotice($nli->notice)) {
             return true;