Added a lot more type-hints where they will happen. Please note that I found

[quix0rs-gnu-social.git] / plugins / Poll / classes / Poll.php

diff --git a/plugins/Poll/classes/Poll.php b/plugins/Poll/classes/Poll.php
index 213bab492479f85bfae2dea18e733ab2371ebc3b..850b5fc0578ed47e30ccaaded8e0196e9fe70827 100644 (file)
--- a/plugins/Poll/classes/Poll.php
+++ b/plugins/Poll/classes/Poll.php
@@ -82,7 +82,7 @@ class Poll extends Managed_DataObject
      *
      * @return Poll found poll or null
      */
-    static function getByNotice($notice)
+    static function getByNotice(Notice $notice)
     {
         return self::getKV('uri', $notice->uri);
     }
@@ -114,9 +114,9 @@ class Poll extends Managed_DataObject
         return Notice::getKV('uri', $this->uri);
     }
 
-    function bestUrl()
+    function getUrl()
     {
-        return $this->getNotice()->bestUrl();
+        return $this->getNotice()->getUrl();
     }
 
     /**
@@ -167,12 +167,8 @@ class Poll extends Managed_DataObject
      *
      * @return Notice saved notice
      */
-    static function saveNew($profile, $question, $opts, $options=null)
+    static function saveNew(Profile $profile, $question, $opts, array $options = array())
     {
-        if (empty($options)) {
-            $options = array();
-        }
-
         $p = new Poll();
 
         $p->id          = UUID::gen();
@@ -193,7 +189,7 @@ class Poll extends Managed_DataObject
                                         array('id' => $p->id));
         }
 
-        common_log(LOG_DEBUG, "Saving poll: $p->id $p->uri");
+        common_debug("Saving poll: $p->id $p->uri");
         $p->insert();
 
         // TRANS: Notice content creating a poll.