Develop (#416)

* Bugfix close #389 * Fix tests. * Fix url. close #393 * Payment::configForPayment() bugfix. EasyWeChat/docs#27 * Fix tests. * Add methods for JSSDK payment. * Fix tests. * Applied fixes from StyleCI (#400) * Scrutinizer Auto-Fixes (#399) This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com * Filter the empty params. #402 * Add User Tag service. * Applied fixes from StyleCI (#409) * Typo. * CS. * Support guzzle basic options. #415 * En comment.
w7corp · May 17, 2016 · f0c41e2 · f0c41e2
1 parent b6898b8
commit f0c41e2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/src/Core/Http.php b/src/Core/Http.php
@@ -46,6 +46,33 @@ class Http
      */
     protected $middlewares = [];
 
+    /**
+     * Guzzle client default settings.
+     *
+     * @var array
+     */
+    protected static $defaults = [];
+
+    /**
+     * Set guzzle default settings.
+     *
+     * @param array $defaults
+     */
+    public static function setDefaultOptions($defaults = [])
+    {
+        self::$defaults = $defaults;
+    }
+
+    /**
+     * Return current guzzle default settings.
+     *
+     * @return array
+     */
+    public static function getDefaultOptions()
+    {
+        return self::$defaults;
+    }
+
     /**
      * GET request.
      *
@@ -192,6 +219,8 @@ public function request($url, $method = 'GET', $options = [])
     {
         $method = strtoupper($method);
 
+        $options = array_merge(self::$defaults, $options);
+
         Log::debug('Client Request:', compact('url', 'method', 'options'));
 
         $options['handler'] = $this->getHandler();

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -27,6 +27,7 @@
 
 use Doctrine\Common\Cache\FilesystemCache;
 use EasyWeChat\Core\AccessToken;
+use EasyWeChat\Core\Http;
 use EasyWeChat\Support\Log;
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
@@ -105,6 +106,8 @@ public function __construct($config)
         $this->registerBase();
         $this->initializeLogger();
 
+        Http::setDefaultOptions($this['config']->get('guzzle', []));
+
         Log::debug('Current configuration:', $config);
     }
 

diff --git a/src/User/Tag.php b/src/User/Tag.php
@@ -115,7 +115,7 @@ public function userTags($openId)
     /**
      * Get users from a tag.
      *
-     * @param string $openId
+     * @param string $tagId
      *
      * @return int
      */
@@ -130,7 +130,7 @@ public function usersOfTag($tagId)
      * Batch tag users.
      *
      * @param array $openIds
-     * @param int   $tagid
+     * @param int   $tagId
      *
      * @return bool
      */
@@ -148,7 +148,7 @@ public function batchTagUsers(array $openIds, $tagId)
      * Untag users from a tag.
      *
      * @param array $openIds
-     * @param int   $tagid
+     * @param int   $tagId
      *
      * @return bool
      */

diff --git a/tests/Foundation/ApplicationTest.php b/tests/Foundation/ApplicationTest.php
@@ -9,6 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
+use EasyWeChat\Core\Http;
 use EasyWeChat\Foundation\Application;
 use EasyWeChat\Foundation\Config;
 use Pimple\Container;
@@ -43,6 +44,18 @@ public function testConstructor()
         }
     }
 
+    public function testHttpDefaultOptions()
+    {
+        $app = new Application([]);
+
+        $this->assertEmpty(Http::getDefaultOptions());
+
+        $config = ['guzzle' => ['timeout' => 5]];
+        $app = new Application($config);
+
+        $this->assertEquals($config['guzzle'], Http::getDefaultOptions());
+    }
+
     /**
      * test __set, __get.
      */