rm metaprogramming

Author: rwifeng

src/Qiniu/Processing/PersistentFop.php

@@ -45,14 +45,20 @@ public function __construct($auth, $bucket, $pipeline = null, $notify_url = null
     /**
      * 列取空间的文件列表
      *
-     * @param $key     待处理的源文件
-     * @param $fops    处理详细操作，规格详见 http://developer.qiniu.com/docs/v6/api/reference/fop/
+     * @param $key   待处理的源文件
+     * @param $fops  string|array  待处理的pfop操作，多个操作已array的形式传入。 
+     *                eg. avthumb/mp3/ab/192k, vframe/jpg/offset/7/w/480/h/360
      *
      * @return array[] 返回持久化处理的persistentId, 和返回的错误。
+     * 
+     * @link http://developer.qiniu.com/docs/v6/api/reference/fop/
      */
-    public function execute($key, array $fops)
+    public function execute($key, $fops)
     {
-        $ops = implode(';', $fops);
+        if (is_array($fops)) {
+            $ops = implode(';', $fops);
+        }
+
         $params = array('bucket' => $this->bucket, 'key' => $key, 'fops' => $ops);
         if (!empty($this->pipeline)) {
             $params['pipeline'] = $this->pipeline;
@@ -85,77 +91,4 @@ 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];
-        $mod = null;
-        if (count($args)>1) {
-            $mod = $args[1];
-        }
-
-        $options = array();
-        if (count($args)>2) {
-            $options = $args[2];
-        }
-
-        $target_bucket = null;
-        if (count($args)>3) {
-            $target_bucket = $args[3];
-        }
-
-        $target_key = null;
-        if (count($args)>4) {
-            $target_key = $args[4];
-        }
-
-        $pfop = Operation::buildOp($method, $mod, $options);
-        if ($target_bucket != null) {
-            $pfop = Operation::saveas($pfop, $target_bucket, $target_key);
-        }
-
-        $ops = array();
-        array_push($ops, $pfop);
-        return $this->execute($key, $ops);
-    }
-
-    public function mkzip(
-        $dummy_key,
-        $urls_and_alias,
-        $to_bucket = null,
-        $to_key = null,
-        $mode = 2
-    ) {
-        $base = 'mkzip/' . $mode;
-        $op = array($base);
-        foreach ($urls_and_alias as $key => $value) {
-            if (is_int($key)) {
-                array_push($op, 'url/' . \Qiniu\base64_urlSafeEncode($value));
-            } else {
-                array_push($op, 'url/' . \Qiniu\base64_urlSafeEncode($key));
-                array_push($op, 'alias/' . \Qiniu\base64_urlSafeEncode($key));
-            }
-        }
-        $fop = implode('/', $op);
-        if ($to_bucket != null) {
-            $op = Operation::saveas($fop, $to_bucket, $to_key);
-        }
-        $ops =array($op);
-        return $this->execute($dummy_key, $ops);
-    }
 }