Merge pull request #41 from HanSon/dev

修改PHP5兼容

src/Collections/ContactFactory.php

@@ -33,6 +33,10 @@ class ContactFactory
 
 
         $this->makeContactList();
         $this->makeContactList();
 
 
+
+        $contact = contact()->get(myself()->username);
+        myself()->alias = isset($contact['Alias']) ? $contact['Alias'] : myself()->nickname ? : myself()->username;
+
         $this->getBatchGroupMembers();
         $this->getBatchGroupMembers();
 
 
         if(server()->config['debug']){
         if(server()->config['debug']){
@@ -65,10 +69,6 @@ class ContactFactory
                 contact()->put($contact['UserName'], $contact);
                 contact()->put($contact['UserName'], $contact);
             }
             }
         }
         }
-
-        $contact = contact()->get(myself()->username);
-
-        myself()->alias = isset($contact['Alias']) ? $contact['Alias'] : myself()->nickname ? : myself()->username;
     }
     }
 
 
     /**
     /**

src/Message/Entity/Text.php

@@ -27,16 +27,18 @@ class Text extends Message implements MessageInterface
     /**
     /**
      * 发送消息
      * 发送消息
      *
      *
-     * @param $word string 消息内容
+     * @param $word string|Text 消息内容
      * @param $username string 目标username
      * @param $username string 目标username
      * @return bool
      * @return bool
      */
      */
-    public static function send($username, string $word)
+    public static function send($username, $word)
     {
     {
         if (!$word) {
         if (!$word) {
             return false;
             return false;
         }
         }
 
 
+        $word = is_string($word) ? $word : $word->content;
+
         $random = strval(time() * 1000) . '0' . strval(rand(100, 999));
         $random = strval(time() * 1000) . '0' . strval(rand(100, 999));
 
 
         $data = [
         $data = [