CS.

scplay · Dec 18, 2017 · af8d28b · af8d28b
1 parent 442c982
commit af8d28b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/BasicService/Jssdk/Client.php b/src/BasicService/Jssdk/Client.php
@@ -73,7 +73,7 @@ public function getConfigArray(array $apis, bool $debug = false, bool $beta = fa
      * @param bool   $refresh
      * @param string $type
      *
-     * @return array
+     * @return array|null
      */
     public function getTicket(bool $refresh = false, string $type = 'jsapi'): array
     {
@@ -129,7 +129,7 @@ protected function configSignature(string $url = null, string $nonce = null, $ti
      */
     public function getTicketSignature($ticket, $nonce, $timestamp, $url): string
     {
-        return sha1("jsapi_ticket={$ticket}&noncestr={$nonce}&timestamp={$timestamp}&url={$url}");
+        return sha1(sprintf('jsapi_ticket=%s&noncestr=%s&timestamp=%s&url=%s', $ticket, $nonce, $timestamp, $url));
     }
 
     /**
@@ -141,7 +141,7 @@ public function dictionaryOrderSignature()
 
         sort($params, SORT_STRING);
 
-        return sha1(implode($params));
+        return sha1(implode('', $params));
     }
 
     /**

diff --git a/tests/BasicService/Jssdk/ClientTest.php b/tests/BasicService/Jssdk/ClientTest.php
@@ -159,7 +159,7 @@ public function testDictionaryOrderSignature()
 
         sort($params, SORT_STRING);
 
-        $this->assertSame(sha1(implode($params)), $client->dictionaryOrderSignature(...$unsorted));
+        $this->assertSame(sha1(implode('', $params)), $client->dictionaryOrderSignature(...$unsorted));
     }
 
     public function testUrlSetterAndGetter()