merge qiniu master

Author: rwifeng

src/Qiniu/Auth.php

@@ -118,7 +118,7 @@ public function uploadToken(
         'asyncOps',
     );
 
-    private static function copyPolicy($policy, $originPolicy, $strictPolicy)
+    private static function copyPolicy(&$policy, $originPolicy, $strictPolicy)
     {
         if ($originPolicy == null) {
             return;

src/Qiniu/Http/Client.php

@@ -85,18 +85,19 @@ private static function sendRequest($request)
             CURLOPT_CUSTOMREQUEST  => $request->method,
             CURLOPT_URL => $request->url
         );
+        
         if (!empty($request->headers)) {
             $headers = array();
             foreach ($request->headers as $key => $val) {
                 array_push($headers, "$key: $val");
             }
             $options[CURLOPT_HTTPHEADER] = $headers;
         }
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
 
         if (!empty($request->body)) {
             $options[CURLOPT_POSTFIELDS] = $request->body;
         }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
         curl_setopt_array($ch, $options);
         $result = curl_exec($ch);
         $t2 = microtime(true);

src/Qiniu/Http/Response.php

@@ -115,6 +115,7 @@ public function __construct($code, $duration, array $headers = array(), $body =
         } elseif ($code >=400) {
             $this->error = $body;
         }
+        return;
     }
 
     public function json()

src/Qiniu/Processing/Operation.php

@@ -49,10 +49,28 @@ public function buildUrl($key, $cmd, $mod = null, array $args = array())
         return $url;
     }
 
+    private static $fops = array(
+        'imageView2',
+        'imageMogr2',
+        'imageInfo',
+        'exif',
+        'watermark',
+        'imageAve',
+
+        'avinfo',
+        'pm3u8',
+        
+        'qrcode',
+        'md2html',
+    );
+
     public function __call($method, $args)
     {
+
+        if (!in_array($method, self::$fops)) {
+            throw new \InvalidArgumentException("fop {$method} isn't supported");
+        }
         $key = $args[0];
-        $cmd = $method;
         $mode = null;
         if (count($args)>1) {
             $mode = $args[1];
@@ -62,7 +80,7 @@ public function __call($method, $args)
             $options = $args[2];
         }
         $options = array();
-        $url = $this->buildUrl($key, $cmd, $mode, $options);
+        $url = $this->buildUrl($key, $method, $mode, $options);
         $r = Client::get($url);
         if (!$r->ok()) {
             return array(null, new Error($url, $r));

src/Qiniu/Processing/PersistentFop.php

@@ -88,10 +88,24 @@ public static function status($id)
         return array($response->json(), null);
     }
 
+    private static $pfops = array(
+        'avthumb',
+        'vframe',
+        'segtime',
+        'vsample',
+        'vwatermark',
+        'avconcat',
+
+        'concat',
+    );
+
     public function __call($method, $args)
     {
+
+        if (!in_array($method, self::$pfops)) {
+            throw new \InvalidArgumentException("pfop {$method} isn't supported");
+        }
         $key = $args[0];
-        $cmd = $method;
         $mod = null;
         if (count($args)>1) {
             $mod = $args[1];
@@ -112,7 +126,7 @@ public function __call($method, $args)
             $target_key = $args[4];
         }
 
-        $pfop = Operation::buildOp($cmd, $mod, $options);
+        $pfop = Operation::buildOp($method, $mod, $options);
         if ($target_bucket != null) {
             $pfop = Operation::saveas($pfop, $target_bucket, $target_key);
         }