Add options method, fix the content-type bug.

README.md

@@ -63,16 +63,40 @@ go(function () {
 
 ------
 
+## Saber API
+
+为了使用方便，已为所有支持的请求方法提供了别名。
+
+**\$saber->request(\$options)**
+
+**\$saber->get(\$url[, \$options])**
+
+**\$saber->delete(\$url[, \$options])**
+
+**\$saber->head(\$url[, \$options])**
+
+**\$saber->options(\$url[, \$options])**
+
+**\$saber->post(\$url[, \$data[, \$options]])**
+
+**\$saber->put(\$url[, \$data[, \$options]])**
+
+**\$saber->patch(\$url[, \$data[, \$options]])**
+
+<br>
+
+------
+
 ## 例子
 
-### 简单请求
+### 静态方法
 
 ```php
 Saber::get('http://httpbin.org/get');
-Saber::post('http://httpbin.org/post');
-Saber::put('http://httpbin.org/put');
-Saber::patch('http://httpbin.org/patch');
 Saber::delete('http://httpbin.org/delete');
+Saber::post('http://httpbin.org/post', ['foo' => 'bar']);
+Saber::put('http://httpbin.org/put', ['foo' => 'bar']);
+Saber::patch('http://httpbin.org/patch', ['foo' => 'bar']);
 ```
 
 ### 生成实例
@@ -83,16 +107,17 @@ Saber::delete('http://httpbin.org/delete');
 $saber = Saber::create([
     'base_uri' => 'http://httpbin.org',
     'headers' => [
-        'User-Agent' => null,
         'Accept-Language' => 'en,zh-CN;q=0.9,zh;q=0.8',
-        'DNT' => '1'
-    ],
+        'Content-Type' => ContentType::JSON,
+        'DNT' => '1',
+        'User-Agent' => null
+    ]
 ]);
 echo $saber->get('/get');
-echo $saber->post('/post');
-echo $saber->patch('/patch');
-echo $saber->put('/put');
 echo $saber->delete('/delete');
+echo $saber->post('/post', ['foo' => 'bar']);
+echo $saber->patch('/patch', ['foo' => 'bar']);
+echo $saber->put('/put', ['foo' => 'bar']);
 ```
 
 ### 生成会话

examples/create.php

@@ -5,6 +5,7 @@
  * Date: 2018/3/23 下午8:50
  */
 
+use Swlib\Http\ContentType;
 use Swlib\Saber;
 
 require __DIR__ . '/../vendor/autoload.php';
@@ -13,14 +14,15 @@
     $saber = Saber::create([
         'base_uri' => 'http://httpbin.org',
         'headers' => [
-            'User-Agent' => null,
             'Accept-Language' => 'en,zh-CN;q=0.9,zh;q=0.8',
-            'DNT' => '1'
-        ],
+            'Content-Type' => ContentType::JSON,
+            'DNT' => '1',
+            'User-Agent' => null
+        ]
     ]);
     echo $saber->get('/get');
-    echo $saber->post('/post');
-    echo $saber->patch('/patch');
-    echo $saber->put('/put');
     echo $saber->delete('/delete');
+    echo $saber->post('/post', ['foo' => 'bar']);
+    echo $saber->patch('/patch', ['foo' => 'bar']);
+    echo $saber->put('/put', ['foo' => 'bar']);
 });

src/Client.php

@@ -275,11 +275,11 @@ public static function transOptionsToRequest(array $options, Request $request)
 
         /** 设置请求的数据 */
         if (isset($options['content_type'])) {
-            $request->withHeader('Content-type', $options['content_type']);
+            $request->withHeader('Content-Type', $options['content_type']);
         }
         if (!empty($options['data'])) {
             if (!is_string($options['data'])) {
-                switch ($options['content_type']) {
+                switch ($request->getHeaderLine('Content-Type')) {
                     case ContentType::JSON:
                         $options['data'] = json_encode($options['data']);
                         break;
@@ -450,6 +450,14 @@ public function head(string $uri, array $options = [])
         return $this->request($options);
     }
 
+    public function options(string $uri, array $options = [])
+    {
+        $options['uri'] = $uri;
+        $options['method'] = 'OPTIONS';
+
+        return $this->request($options);
+    }
+
     public function post(string $uri, $data = null, array $options = [])
     {
         $options['uri'] = $uri;

src/Request.php

@@ -297,6 +297,12 @@ public function withRedirect(int $time): self
         return $this;
     }
 
+    /** @return bool */
+    public function getRedirectWait(): bool
+    {
+        return $this->redirect_wait;
+    }
+
     /**
      * @param bool $enable
      * @return $this
@@ -308,12 +314,6 @@ public function withRedirectWait(bool $enable): self
         return $this;
     }
 
-    /** @return bool */
-    public function getRedirectWait(): bool
-    {
-        return $this->redirect_wait;
-    }
-
     /**
      * Clear the swoole client to make it back to the first state.
      *

src/Saber.php

@@ -70,6 +70,11 @@ public static function head(string $uri, array $options = [])
         return self::getDefaultClient()->head($uri, $options);
     }
 
+    public static function options(string $uri, array $options = [])
+    {
+        return self::getDefaultClient()->options($uri, $options);
+    }
+
     public static function post(string $uri, $data = null, array $options = [])
     {
         return self::getDefaultClient()->post($uri, $data, $options);