Inspection of "update" - xiaohuilam/laravel-flysystem-wantu - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — master (7fc86c)

by xiaohui

created 2019-07-02 03:05 UTC

Status

Braces +24 added lines, -16 removed lines patch added patch discarded remove patch

@@ -137,10 +137,12 @@  discard block
 block discarded – undo
 	 */
 	public function existsFolder($namespace, $dir)
 	{
-		if (empty($namespace) || empty($dir))
-			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
-		if (strpos($dir, '/') !== 0)
-			$dir = '/' . $dir;
+		if (empty($namespace) || empty($dir)) {
+					return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
+		}
+		if (strpos($dir, '/') !== 0) {
+					$dir = '/' . $dir;
+		}
 		$resourceInfo = new ResourceInfo($namespace, $dir);
 		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
 		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId . '/exist';
@@ -155,10 +157,12 @@  discard block
 block discarded – undo
 	 */
 	public function createDir($namespace, $dir)
 	{
-		if (empty($namespace) || empty($dir))
-			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
-		if (strpos($dir, '/') !== 0)
-			$dir = '/' . $dir;
+		if (empty($namespace) || empty($dir)) {
+					return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
+		}
+		if (strpos($dir, '/') !== 0) {
+					$dir = '/' . $dir;
+		}
 		$resourceInfo = new ResourceInfo($namespace, $dir);
 		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
 		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
@@ -197,10 +201,12 @@  discard block
 block discarded – undo
 	 */
 	public function deleteDir($namespace, $dir)
 	{
-		if (empty($namespace) || empty($dir))
-			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
-		if (strpos($dir, '/') !== 0)
-			$dir = '/' . $dir;
+		if (empty($namespace) || empty($dir)) {
+					return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
+		}
+		if (strpos($dir, '/') !== 0) {
+					$dir = '/' . $dir;
+		}
 		$resourceInfo = new ResourceInfo($namespace, $dir);
 		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
 		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
@@ -260,8 +266,9 @@  discard block
 block discarded – undo
 	 */
 	public function mediaEncodeQuery($taskId)
 	{
-		if (empty($taskId))
-			return $this->_errorResponse("InvalidArgument", "taskId is empty");
+		if (empty($taskId)) {
+					return $this->_errorResponse("InvalidArgument", "taskId is empty");
+		}
 		$uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncodeResult/' . $taskId;
 		return $this->_send_request('GET', $uri);
 	}
@@ -287,8 +294,9 @@  discard block
 block discarded – undo
 	 */
 	public function vSnapshotQuery($taskId)
 	{
-		if (empty($taskId))
-			return $this->_errorResponse("InvalidArgument", "taskId is empty");
+		if (empty($taskId)) {
+					return $this->_errorResponse("InvalidArgument", "taskId is empty");
+		}
 		$uri = '/' . Conf::MANAGE_API_VERSION . '/snapshotResult/' . $taskId;
 		return $this->_send_request('GET', $uri);
 	}

Please login to merge, or discard this patch.

sdk/Utils/UploadOption.php 1 patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -60,10 +60,12 @@
 block discarded – undo
 	private function getParas_Common_BlockInit()
 	{
 		$paraArray = array();
-		if (isset($this->dir))
-			$paraArray['dir'] = $this->dir;
-		if (isset($this->name))
-			$paraArray['name'] = $this->name;
+		if (isset($this->dir)) {
+					$paraArray['dir'] = $this->dir;
+		}
+		if (isset($this->name)) {
+					$paraArray['name'] = $this->name;
+		}
 		$paraArray['md5'] = md5($this->content); // 计算文件md5
 		$paraArray['size'] = strlen($this->content); // 计算文件大小
 		$paraArray['content'] = $this->content;

Please login to merge, or discard this patch.

sdk/Utils/UploadPolicy.php 1 patch

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -5,47 +5,47 @@
 block discarded – undo
 
 class UploadPolicy
 {
-    /*如下属性是必须的[The following attributes are required]*/
-    public $namespace;                              // 多媒体服务的空间名[media namespace name]
-    public $bucket;                                 // OSS的空间名[media bucket name]
-    public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
-    public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
+	/*如下属性是必须的[The following attributes are required]*/
+	public $namespace;                              // 多媒体服务的空间名[media namespace name]
+	public $bucket;                                 // OSS的空间名[media bucket name]
+	public $insertOnly;                             // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
+	public $expiration;                             // 过期时间[expiration time, unix time, in milliseconds]
 
-    /*如下属性是可选的[The following attributes are optional]*/
-    public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
-    public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
-    public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
-    public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
-    public $mimeLimit;                              // 文件类型限制[upload mime type limited]
-    public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
-    public $callbackHost;                           // 回调时Host [callback host]
-    public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
-    public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
-    public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
-    public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
-    public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
+	/*如下属性是可选的[The following attributes are optional]*/
+	public $detectMime = Conf::DETECT_MIME_TRUE;                             // 是否进行类型检测[is auto detecte media file mime type, default is true]
+	public $dir;                                    // 路径[media file dir, magic vars and custom vars are supported]
+	public $name;                                   // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
+	public $sizeLimit;                              // 文件大小限制[upload size limited, in bytes]
+	public $mimeLimit;                              // 文件类型限制[upload mime type limited]
+	public $callbackUrl;                            // 回调URL [callback urls, ip address is recommended]
+	public $callbackHost;                           // 回调时Host [callback host]
+	public $callbackBody;                           // 回调时Body [callback body, magic vars and custom vars are supported]
+	public $callbackBodyType;                       // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
+	public $returnUrl;                              // 上传完成之后,303跳转的Url [return url, when return code is 303]
+	public $returnBody;                             // 上传完成返回体 [return body, magic vars and custom vars are supported]
+	public $mediaEncode;                            // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
 
-    public function __construct($option)
-    {
-        if (!isset($option['expiration']) || !$option['expiration']) {
-            $option['expiration'] = -1;
-        }
+	public function __construct($option)
+	{
+		if (!isset($option['expiration']) || !$option['expiration']) {
+			$option['expiration'] = -1;
+		}
 
-        foreach ($option as $attribute => $value) {
-            $this->{$attribute} = $value;
-        }
-    }
+		foreach ($option as $attribute => $value) {
+			$this->{$attribute} = $value;
+		}
+	}
 
-    public function toArray()
-    {
-        return (array) $this;
-        $array = [];
-        foreach ($this as $attribute => $value) {
-            if ($value !== null) {
-                $array[$attribute] = $value;
-            }
-        }
+	public function toArray()
+	{
+		return (array) $this;
+		$array = [];
+		foreach ($this as $attribute => $value) {
+			if ($value !== null) {
+				$array[$attribute] = $value;
+			}
+		}
 
-        return $array;
-    }
+		return $array;
+	}
 }

Please login to merge, or discard this patch.

sdk/Utils/ResourceInfo.php 1 patch

Braces +25 added lines, -14 removed lines patch added patch discarded remove patch

@@ -22,10 +22,14 @@  discard block
 block discarded – undo
 	 * 返回格式{$isValid, $message}*/
 	public function checkResourceInfo($dirState = false, $nameState = false)
 	{
-		if (empty($this->namespace))
-			return array(false, "namespace is empty.[{$this->toString()}]"); // 判断是否设置空间名
-		else
-			return $this->checkFileInfo($dirState, $nameState); // 判断dir和name的合法性
+		if (empty($this->namespace)) {
+					return array(false, "namespace is empty.[{$this->toString()}]");
+		}
+		// 判断是否设置空间名
+		else {
+					return $this->checkFileInfo($dirState, $nameState);
+		}
+		// 判断dir和name的合法性
 	}
 	/**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
 	 * 返回格式{$isValid, $message}*/
@@ -35,10 +39,14 @@  discard block
 block discarded – undo
 			return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空
 		}
 		if ($dirState) {
-			if (empty($this->dir))
-				$this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'
-			else if (strpos($this->dir, '/') !== 0)
-				$this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'
+			if (empty($this->dir)) {
+							$this->dir = '/';
+			}
+			// 2：判断路径是否为空，若为空，则默认为根目录'/'
+			else if (strpos($this->dir, '/') !== 0) {
+							$this->dir = '/' . $this->dir;
+			}
+			// 3：判断路径是否以'/'开头，若不是，则添加'/'
 		}
 		return array(true, null);
 	}
@@ -46,12 +54,15 @@  discard block
 block discarded – undo
 	public function buildResourceId()
 	{
 		$jsonData = array();
-		if (!empty($this->namespace))
-			array_push($jsonData, urldecode($this->namespace));
-		if (!empty($this->dir))
-			array_push($jsonData, urldecode($this->dir));
-		if (!empty($this->name))
-			array_push($jsonData, urldecode($this->name));
+		if (!empty($this->namespace)) {
+					array_push($jsonData, urldecode($this->namespace));
+		}
+		if (!empty($this->dir)) {
+					array_push($jsonData, urldecode($this->dir));
+		}
+		if (!empty($this->name)) {
+					array_push($jsonData, urldecode($this->name));
+		}
 		return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));
 	}
 	/**对URL中文进行编码*/

Please login to merge, or discard this patch.

sdk/Conf/Conf.php 1 patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -3,39 +3,39 @@
 block discarded – undo
 
 class Conf
 {
-    const CHARSET = "UTF-8";
-    const SDK_VERSION = '2.0.3';
+	const CHARSET = "UTF-8";
+	const SDK_VERSION = '2.0.3';
 
-    const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
-    const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
-    const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
-    const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
-    const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
+	const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com";        //文件上传的地址
+	const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com";            //服务管理的地址
+	const MANAGE_API_VERSION = "3.0";        //资源管理接口版本
+	const SCAN_PORN_VERSION = "3.1";        //黄图扫描接口版本
+	const MEDIA_ENCODE_VERSION = "3.0";        //媒体转码接口版本
 
-    const UPLOAD_API_UPLOAD = "/api/proxy/upload";
-    const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
-    const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
-    const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
-    const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
+	const UPLOAD_API_UPLOAD = "/api/proxy/upload";
+	const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
+	const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
+	const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
+	const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
 
-    const TYPE_TOP = "TOP";
-    const TYPE_CLOUD = "CLOUD";
+	const TYPE_TOP = "TOP";
+	const TYPE_CLOUD = "CLOUD";
 
-    const DETECT_MIME_TRUE = 1;            //检测MimeType
-    const DETECT_MIME_NONE = 0;            //不检测MimeType
-    const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
-    const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
+	const DETECT_MIME_TRUE = 1;            //检测MimeType
+	const DETECT_MIME_NONE = 0;            //不检测MimeType
+	const INSERT_ONLY_TRUE = 1;            //文件上传不可覆盖
+	const INSERT_ONLY_NONE = 0;            //文件上传可覆盖
 
-    const MIN_OBJ_SIZE = 102400;        //1024*100;
-    const HTTP_TIMEOUT = 30;            //http的超时时间：30s
-    const HTTP_RETRY = 1;                //http失败后重试：1
+	const MIN_OBJ_SIZE = 102400;        //1024*100;
+	const HTTP_TIMEOUT = 30;            //http的超时时间：30s
+	const HTTP_RETRY = 1;                //http失败后重试：1
 
-    const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K
-    const BLOCK_DEFF_SIZE = 2097152;    //文件分片默认值：1024*1024*2; 2M
-    const BLOCK_MAX_SIZE = 10485760;    //文件分片最大值：1024*1024*10; 10M
+	const BLOCK_MIN_SIZE = 102400;        //文件分片最小值：1024*100; 100K
+	const BLOCK_DEFF_SIZE = 2097152;    //文件分片默认值：1024*1024*2; 2M
+	const BLOCK_MAX_SIZE = 10485760;    //文件分片最大值：1024*1024*10; 10M
 
-    const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
+	const CURL_ERR_LOG = "curl_error.log";    //curl请求时的错误日志信息
 
-    const RUN_LEVEL_RELEASE = 1;        //release级别
-    const RUN_LEVEL_DEBUG = 2;            //debug级别
+	const RUN_LEVEL_RELEASE = 1;        //release级别
+	const RUN_LEVEL_DEBUG = 2;            //debug级别
 }

Please login to merge, or discard this patch.

src/WantuFileServiceProvider.php 1 patch

Indentation +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -10,22 +10,22 @@
 block discarded – undo
 
 class WantuFileServiceProvider extends ServiceProvider
 {
-    public function boot()
-    {
-        app('filesystem')->extend('wantu', function ($app, $config) {
-            $adapter = new WantuFileAdapter(
-                $config['access_key'],
-                $config['secret_key'],
-                $config['namespace'],
-                $config['domain']
-            );
-            $flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
-            // $flysystem->addPlugin(new FetchFile());
-            $flysystem->addPlugin(new UploadToken());
-            $flysystem->addPlugin(new GetUrl());
-            // $flysystem->addPlugin(new PrivateDownloadUrl());
-            // $flysystem->addPlugin(new RefreshFile());
-            return $flysystem;
-        });
-    }
+	public function boot()
+	{
+		app('filesystem')->extend('wantu', function ($app, $config) {
+			$adapter = new WantuFileAdapter(
+				$config['access_key'],
+				$config['secret_key'],
+				$config['namespace'],
+				$config['domain']
+			);
+			$flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
+			// $flysystem->addPlugin(new FetchFile());
+			$flysystem->addPlugin(new UploadToken());
+			$flysystem->addPlugin(new GetUrl());
+			// $flysystem->addPlugin(new PrivateDownloadUrl());
+			// $flysystem->addPlugin(new RefreshFile());
+			return $flysystem;
+		});
+	}
 }

Please login to merge, or discard this patch.

src/Plugins/UploadToken.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -5,13 +5,13 @@
 block discarded – undo
 
 class UploadToken extends AbstractPlugin
 {
-    public function getMethod()
-    {
-        return 'getUploadToken';
-    }
+	public function getMethod()
+	{
+		return 'getUploadToken';
+	}
 
-    public function handle($option = null)
-    {
-        return $this->filesystem->getAdapter()->getUploadToken($option);
-    }
+	public function handle($option = null)
+	{
+		return $this->filesystem->getAdapter()->getUploadToken($option);
+	}
 }

Please login to merge, or discard this patch.

src/Plugins/GetUrl.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -5,12 +5,12 @@
 block discarded – undo
 
 class GetUrl extends AbstractPlugin
 {
-    public function getMethod()
-    {
-        return 'getUrl';
-    }
-    public function handle($path)
-    {
-        return $this->filesystem->getAdapter()->getUrl($path);
-    }
+	public function getMethod()
+	{
+		return 'getUrl';
+	}
+	public function handle($path)
+	{
+		return $this->filesystem->getAdapter()->getUrl($path);
+	}
 }

Please login to merge, or discard this patch.

sdk/Utils/MediaEncodeOption.php 1 patch

Braces +46 added lines, -28 removed lines patch added patch discarded remove patch

@@ -25,12 +25,17 @@  discard block
 block discarded – undo
 	public function checkOptionParameters()
 	{
 		list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
-		if (!$valid)
-			return array($valid, $msg, null);
-		if (empty($this->encodeTemplate))
-			return array(false, "encodeTemplate is empty.", null); // 判断是否设置输入输出文件，或者转码模板
-		if (($this->usePreset != 0 && $this->usePreset != 1) || ($this->force != 0 && $this->force != 1))
-			return array(false, "parameters 'usePreset' or 'force' is invalid.", null); // 判断usePreset和force参数是否为0或1
+		if (!$valid) {
+					return array($valid, $msg, null);
+		}
+		if (empty($this->encodeTemplate)) {
+					return array(false, "encodeTemplate is empty.", null);
+		}
+		// 判断是否设置输入输出文件，或者转码模板
+		if (($this->usePreset != 0 && $this->usePreset != 1) || ($this->force != 0 && $this->force != 1)) {
+					return array(false, "parameters 'usePreset' or 'force' is invalid.", null);
+		}
+		// 判断usePreset和force参数是否为0或1
 		return $this->getOptionsHttpBody(); //返回http请求体
 	}
 	/**构建多媒体转码所需的http请求体*/
@@ -43,16 +48,21 @@  discard block
 block discarded – undo
 		$httpBody .= '&usePreset=' . $this->usePreset;
 		$httpBody .= '&force=' . $this->force;
 		// 可选的参数
-		if (isset($this->watermark))
-			$httpBody .= '&watermark=' . $this->watermark->buildResourceId();
-		if (isset($this->watermarkTemplate))
-			$httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);
-		if (isset($this->notifyUrl))
-			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
-		if (isset($this->seek))
-			$httpBody .= '&seek=' .  $this->seek;
-		if (isset($this->duration))
-			$httpBody .= '&duration=' . $this->duration;
+		if (isset($this->watermark)) {
+					$httpBody .= '&watermark=' . $this->watermark->buildResourceId();
+		}
+		if (isset($this->watermarkTemplate)) {
+					$httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);
+		}
+		if (isset($this->notifyUrl)) {
+					$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
+		}
+		if (isset($this->seek)) {
+					$httpBody .= '&seek=' .  $this->seek;
+		}
+		if (isset($this->duration)) {
+					$httpBody .= '&duration=' . $this->duration;
+		}
 		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
 	}
 	/*######################以下是可选的参数set方法#######################*/
@@ -93,10 +103,13 @@  discard block
 block discarded – undo
 	public function checkOptionParameters()
 	{
 		list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
-		if (!$valid)
-			return array($valid, $msg, null);
-		if (empty($this->time) || !is_int($this->time) || $this->time < 0)
-			return array(false, "time is empty or invalid.", null); // 是否设置时间，且时间是否合法
+		if (!$valid) {
+					return array($valid, $msg, null);
+		}
+		if (empty($this->time) || !is_int($this->time) || $this->time < 0) {
+					return array(false, "time is empty or invalid.", null);
+		}
+		// 是否设置时间，且时间是否合法
 		return $this->getOptionsHttpBody(); //返回http请求体
 	}
 
@@ -108,8 +121,9 @@  discard block
 block discarded – undo
 		$httpBody .= '&output=' . $this->getOutputResId();
 		$httpBody .= '&time=' . $this->time;
 		// 可选的参数
-		if (isset($this->notifyUrl))
-			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
+		if (isset($this->notifyUrl)) {
+					$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
+		}
 		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
 	}
 
@@ -142,14 +156,18 @@  discard block
 block discarded – undo
 	/**检测参数选项是否合法*/
 	public function checkOptionParameters()
 	{
-		if (empty($this->input) || empty($this->output))
-			return array(false, "input or output resources is empty."); // 判断是否设置输入输出文件，或者转码模板
+		if (empty($this->input) || empty($this->output)) {
+					return array(false, "input or output resources is empty.");
+		}
+		// 判断是否设置输入输出文件，或者转码模板
 		list($valid, $msg) = $this->input->checkResourceInfo(true, true); //检测输入的资源信息是否合法
-		if (!$valid)
-			return array($valid, $msg);
+		if (!$valid) {
+					return array($valid, $msg);
+		}
 		list($valid, $msg) = $this->output->checkResourceInfo(true, true); //检测输入的资源信息是否合法
-		if (!$valid)
-			return array($valid, $msg);
+		if (!$valid) {
+					return array($valid, $msg);
+		}
 		return array(true, null);
 	}
 	public function getInputResId()

Please login to merge, or discard this patch.

		@@ -137,10 +137,12 @@ discard block
		block discarded – undo
137	137	*/
138	138	public function existsFolder($namespace, $dir)
139	139	{
140		- if (empty($namespace) \|\| empty($dir))
141		- return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
142		- if (strpos($dir, '/') !== 0)
143		- $dir = '/' . $dir;
	140	+ if (empty($namespace) \|\| empty($dir)) {
	141	+ return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
	142	+ }
	143	+ if (strpos($dir, '/') !== 0) {
	144	+ $dir = '/' . $dir;
	145	+ }
144	146	$resourceInfo = new ResourceInfo($namespace, $dir);
145	147	$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
146	148	$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId . '/exist';
		@@ -155,10 +157,12 @@ discard block
		block discarded – undo
155	157	*/
156	158	public function createDir($namespace, $dir)
157	159	{
158		- if (empty($namespace) \|\| empty($dir))
159		- return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
160		- if (strpos($dir, '/') !== 0)
161		- $dir = '/' . $dir;
	160	+ if (empty($namespace) \|\| empty($dir)) {
	161	+ return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
	162	+ }
	163	+ if (strpos($dir, '/') !== 0) {
	164	+ $dir = '/' . $dir;
	165	+ }
162	166	$resourceInfo = new ResourceInfo($namespace, $dir);
163	167	$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
164	168	$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
		@@ -197,10 +201,12 @@ discard block
		block discarded – undo
197	201	*/
198	202	public function deleteDir($namespace, $dir)
199	203	{
200		- if (empty($namespace) \|\| empty($dir))
201		- return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
202		- if (strpos($dir, '/') !== 0)
203		- $dir = '/' . $dir;
	204	+ if (empty($namespace) \|\| empty($dir)) {
	205	+ return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");
	206	+ }
	207	+ if (strpos($dir, '/') !== 0) {
	208	+ $dir = '/' . $dir;
	209	+ }
204	210	$resourceInfo = new ResourceInfo($namespace, $dir);
205	211	$resourceId = $resourceInfo->buildResourceId(); //得到资源ID
206	212	$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;
		@@ -260,8 +266,9 @@ discard block
		block discarded – undo
260	266	*/
261	267	public function mediaEncodeQuery($taskId)
262	268	{
263		- if (empty($taskId))
264		- return $this->_errorResponse("InvalidArgument", "taskId is empty");
	269	+ if (empty($taskId)) {
	270	+ return $this->_errorResponse("InvalidArgument", "taskId is empty");
	271	+ }
265	272	$uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncodeResult/' . $taskId;
266	273	return $this->_send_request('GET', $uri);
267	274	}
		@@ -287,8 +294,9 @@ discard block
		block discarded – undo
287	294	*/
288	295	public function vSnapshotQuery($taskId)
289	296	{
290		- if (empty($taskId))
291		- return $this->_errorResponse("InvalidArgument", "taskId is empty");
	297	+ if (empty($taskId)) {
	298	+ return $this->_errorResponse("InvalidArgument", "taskId is empty");
	299	+ }
292	300	$uri = '/' . Conf::MANAGE_API_VERSION . '/snapshotResult/' . $taskId;
293	301	return $this->_send_request('GET', $uri);
294	302	}

		@@ -60,10 +60,12 @@
		block discarded – undo
60	60	private function getParas_Common_BlockInit()
61	61	{
62	62	$paraArray = array();
63		- if (isset($this->dir))
64		- $paraArray['dir'] = $this->dir;
65		- if (isset($this->name))
66		- $paraArray['name'] = $this->name;
	63	+ if (isset($this->dir)) {
	64	+ $paraArray['dir'] = $this->dir;
	65	+ }
	66	+ if (isset($this->name)) {
	67	+ $paraArray['name'] = $this->name;
	68	+ }
67	69	$paraArray['md5'] = md5($this->content); // 计算文件md5
68	70	$paraArray['size'] = strlen($this->content); // 计算文件大小
69	71	$paraArray['content'] = $this->content;

		@@ -5,47 +5,47 @@
		block discarded – undo
5	5
6	6	class UploadPolicy
7	7	{
8		- /如下属性是必须的[The following attributes are required]/
9		- public $namespace; // 多媒体服务的空间名[media namespace name]
10		- public $bucket; // OSS的空间名[media bucket name]
11		- public $insertOnly; // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
12		- public $expiration; // 过期时间[expiration time, unix time, in milliseconds]
	8	+ /如下属性是必须的[The following attributes are required]/
	9	+ public $namespace; // 多媒体服务的空间名[media namespace name]
	10	+ public $bucket; // OSS的空间名[media bucket name]
	11	+ public $insertOnly; // 是否可覆盖[upload mode. it's not allowd uploading the same name files]
	12	+ public $expiration; // 过期时间[expiration time, unix time, in milliseconds]
13	13
14		- /如下属性是可选的[The following attributes are optional]/
15		- public $detectMime = Conf::DETECT_MIME_TRUE; // 是否进行类型检测[is auto detecte media file mime type, default is true]
16		- public $dir; // 路径[media file dir, magic vars and custom vars are supported]
17		- public $name; // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
18		- public $sizeLimit; // 文件大小限制[upload size limited, in bytes]
19		- public $mimeLimit; // 文件类型限制[upload mime type limited]
20		- public $callbackUrl; // 回调URL [callback urls, ip address is recommended]
21		- public $callbackHost; // 回调时Host [callback host]
22		- public $callbackBody; // 回调时Body [callback body, magic vars and custom vars are supported]
23		- public $callbackBodyType; // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
24		- public $returnUrl; // 上传完成之后,303跳转的Url [return url, when return code is 303]
25		- public $returnBody; // 上传完成返回体 [return body, magic vars and custom vars are supported]
26		- public $mediaEncode; // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
	14	+ /如下属性是可选的[The following attributes are optional]/
	15	+ public $detectMime = Conf::DETECT_MIME_TRUE; // 是否进行类型检测[is auto detecte media file mime type, default is true]
	16	+ public $dir; // 路径[media file dir, magic vars and custom vars are supported]
	17	+ public $name; // 上传到服务端的文件名[media file name, magic vars and custom vars are supported]
	18	+ public $sizeLimit; // 文件大小限制[upload size limited, in bytes]
	19	+ public $mimeLimit; // 文件类型限制[upload mime type limited]
	20	+ public $callbackUrl; // 回调URL [callback urls, ip address is recommended]
	21	+ public $callbackHost; // 回调时Host [callback host]
	22	+ public $callbackBody; // 回调时Body [callback body, magic vars and custom vars are supported]
	23	+ public $callbackBodyType; // 回调时Body类型 [callback body type, default is 'application/x-www-form-urlencoded; charset=utf-8']
	24	+ public $returnUrl; // 上传完成之后,303跳转的Url [return url, when return code is 303]
	25	+ public $returnBody; // 上传完成返回体 [return body, magic vars and custom vars are supported]
	26	+ public $mediaEncode; // 上传音视频时，可以指定转码策略[media encode policy after upload task has been completed. it's json string]
27	27
28		- public function __construct($option)
29		- {
30		- if (!isset($option['expiration']) \|\| !$option['expiration']) {
31		- $option['expiration'] = -1;
32		- }
	28	+ public function __construct($option)
	29	+ {
	30	+ if (!isset($option['expiration']) \|\| !$option['expiration']) {
	31	+ $option['expiration'] = -1;
	32	+ }
33	33
34		- foreach ($option as $attribute => $value) {
35		- $this->{$attribute} = $value;
36		- }
37		- }
	34	+ foreach ($option as $attribute => $value) {
	35	+ $this->{$attribute} = $value;
	36	+ }
	37	+ }
38	38
39		- public function toArray()
40		- {
41		- return (array) $this;
42		- $array = [];
43		- foreach ($this as $attribute => $value) {
44		- if ($value !== null) {
45		- $array[$attribute] = $value;
46		- }
47		- }
	39	+ public function toArray()
	40	+ {
	41	+ return (array) $this;
	42	+ $array = [];
	43	+ foreach ($this as $attribute => $value) {
	44	+ if ($value !== null) {
	45	+ $array[$attribute] = $value;
	46	+ }
	47	+ }
48	48
49		- return $array;
50		- }
	49	+ return $array;
	50	+ }
51	51	}

		@@ -22,10 +22,14 @@ discard block
		block discarded – undo
22	22	* 返回格式{$isValid, $message}*/
23	23	public function checkResourceInfo($dirState = false, $nameState = false)
24	24	{
25		- if (empty($this->namespace))
26		- return array(false, "namespace is empty.[{$this->toString()}]"); // 判断是否设置空间名
27		- else
28		- return $this->checkFileInfo($dirState, $nameState); // 判断dir和name的合法性
	25	+ if (empty($this->namespace)) {
	26	+ return array(false, "namespace is empty.[{$this->toString()}]");
	27	+ }
	28	+ // 判断是否设置空间名
	29	+ else {
	30	+ return $this->checkFileInfo($dirState, $nameState);
	31	+ }
	32	+ // 判断dir和name的合法性
29	33	}
30	34	/**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
31	35	* 返回格式{$isValid, $message}*/
		@@ -35,10 +39,14 @@ discard block
		block discarded – undo
35	39	return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空
36	40	}
37	41	if ($dirState) {
38		- if (empty($this->dir))
39		- $this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'
40		- else if (strpos($this->dir, '/') !== 0)
41		- $this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'
	42	+ if (empty($this->dir)) {
	43	+ $this->dir = '/';
	44	+ }
	45	+ // 2：判断路径是否为空，若为空，则默认为根目录'/'
	46	+ else if (strpos($this->dir, '/') !== 0) {
	47	+ $this->dir = '/' . $this->dir;
	48	+ }
	49	+ // 3：判断路径是否以'/'开头，若不是，则添加'/'
42	50	}
43	51	return array(true, null);
44	52	}
		@@ -46,12 +54,15 @@ discard block
		block discarded – undo
46	54	public function buildResourceId()
47	55	{
48	56	$jsonData = array();
49		- if (!empty($this->namespace))
50		- array_push($jsonData, urldecode($this->namespace));
51		- if (!empty($this->dir))
52		- array_push($jsonData, urldecode($this->dir));
53		- if (!empty($this->name))
54		- array_push($jsonData, urldecode($this->name));
	57	+ if (!empty($this->namespace)) {
	58	+ array_push($jsonData, urldecode($this->namespace));
	59	+ }
	60	+ if (!empty($this->dir)) {
	61	+ array_push($jsonData, urldecode($this->dir));
	62	+ }
	63	+ if (!empty($this->name)) {
	64	+ array_push($jsonData, urldecode($this->name));
	65	+ }
55	66	return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));
56	67	}
57	68	/*对URL中文进行编码/

		@@ -3,39 +3,39 @@
		block discarded – undo
3	3
4	4	class Conf
5	5	{
6		- const CHARSET = "UTF-8";
7		- const SDK_VERSION = '2.0.3';
	6	+ const CHARSET = "UTF-8";
	7	+ const SDK_VERSION = '2.0.3';
8	8
9		- const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com"; //文件上传的地址
10		- const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com"; //服务管理的地址
11		- const MANAGE_API_VERSION = "3.0"; //资源管理接口版本
12		- const SCAN_PORN_VERSION = "3.1"; //黄图扫描接口版本
13		- const MEDIA_ENCODE_VERSION = "3.0"; //媒体转码接口版本
	9	+ const UPLOAD_HOST_MEDIA = "https://upload.media.aliyun.com"; //文件上传的地址
	10	+ const MANAGE_HOST_MEDIA = "https://rs.media.aliyun.com"; //服务管理的地址
	11	+ const MANAGE_API_VERSION = "3.0"; //资源管理接口版本
	12	+ const SCAN_PORN_VERSION = "3.1"; //黄图扫描接口版本
	13	+ const MEDIA_ENCODE_VERSION = "3.0"; //媒体转码接口版本
14	14
15		- const UPLOAD_API_UPLOAD = "/api/proxy/upload";
16		- const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
17		- const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
18		- const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
19		- const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
	15	+ const UPLOAD_API_UPLOAD = "/api/proxy/upload";
	16	+ const UPLOAD_API_BLOCK_INIT = "/api/proxy/blockInit";
	17	+ const UPLOAD_API_BLOCK_UPLOAD = "/api/proxy/blockUpload";
	18	+ const UPLOAD_API_BLOCK_COMPLETE = "/api/proxy/blockComplete";
	19	+ const UPLOAD_API_BLOCK_CANCEL = "/api/proxy/blockCancel";
20	20
21		- const TYPE_TOP = "TOP";
22		- const TYPE_CLOUD = "CLOUD";
	21	+ const TYPE_TOP = "TOP";
	22	+ const TYPE_CLOUD = "CLOUD";
23	23
24		- const DETECT_MIME_TRUE = 1; //检测MimeType
25		- const DETECT_MIME_NONE = 0; //不检测MimeType
26		- const INSERT_ONLY_TRUE = 1; //文件上传不可覆盖
27		- const INSERT_ONLY_NONE = 0; //文件上传可覆盖
	24	+ const DETECT_MIME_TRUE = 1; //检测MimeType
	25	+ const DETECT_MIME_NONE = 0; //不检测MimeType
	26	+ const INSERT_ONLY_TRUE = 1; //文件上传不可覆盖
	27	+ const INSERT_ONLY_NONE = 0; //文件上传可覆盖
28	28
29		- const MIN_OBJ_SIZE = 102400; //1024*100;
30		- const HTTP_TIMEOUT = 30; //http的超时时间：30s
31		- const HTTP_RETRY = 1; //http失败后重试：1
	29	+ const MIN_OBJ_SIZE = 102400; //1024*100;
	30	+ const HTTP_TIMEOUT = 30; //http的超时时间：30s
	31	+ const HTTP_RETRY = 1; //http失败后重试：1
32	32
33		- const BLOCK_MIN_SIZE = 102400; //文件分片最小值：1024*100; 100K
34		- const BLOCK_DEFF_SIZE = 2097152; //文件分片默认值：102410242; 2M
35		- const BLOCK_MAX_SIZE = 10485760; //文件分片最大值：1024102410; 10M
	33	+ const BLOCK_MIN_SIZE = 102400; //文件分片最小值：1024*100; 100K
	34	+ const BLOCK_DEFF_SIZE = 2097152; //文件分片默认值：102410242; 2M
	35	+ const BLOCK_MAX_SIZE = 10485760; //文件分片最大值：1024102410; 10M
36	36
37		- const CURL_ERR_LOG = "curl_error.log"; //curl请求时的错误日志信息
	37	+ const CURL_ERR_LOG = "curl_error.log"; //curl请求时的错误日志信息
38	38
39		- const RUN_LEVEL_RELEASE = 1; //release级别
40		- const RUN_LEVEL_DEBUG = 2; //debug级别
	39	+ const RUN_LEVEL_RELEASE = 1; //release级别
	40	+ const RUN_LEVEL_DEBUG = 2; //debug级别
41	41	}

		@@ -10,22 +10,22 @@
		block discarded – undo
10	10
11	11	class WantuFileServiceProvider extends ServiceProvider
12	12	{
13		- public function boot()
14		- {
15		- app('filesystem')->extend('wantu', function ($app, $config) {
16		- $adapter = new WantuFileAdapter(
17		- $config['access_key'],
18		- $config['secret_key'],
19		- $config['namespace'],
20		- $config['domain']
21		- );
22		- $flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
23		- // $flysystem->addPlugin(new FetchFile());
24		- $flysystem->addPlugin(new UploadToken());
25		- $flysystem->addPlugin(new GetUrl());
26		- // $flysystem->addPlugin(new PrivateDownloadUrl());
27		- // $flysystem->addPlugin(new RefreshFile());
28		- return $flysystem;
29		- });
30		- }
	13	+ public function boot()
	14	+ {
	15	+ app('filesystem')->extend('wantu', function ($app, $config) {
	16	+ $adapter = new WantuFileAdapter(
	17	+ $config['access_key'],
	18	+ $config['secret_key'],
	19	+ $config['namespace'],
	20	+ $config['domain']
	21	+ );
	22	+ $flysystem = new Filesystem($adapter, new Config(['disable_asserts' => true]));
	23	+ // $flysystem->addPlugin(new FetchFile());
	24	+ $flysystem->addPlugin(new UploadToken());
	25	+ $flysystem->addPlugin(new GetUrl());
	26	+ // $flysystem->addPlugin(new PrivateDownloadUrl());
	27	+ // $flysystem->addPlugin(new RefreshFile());
	28	+ return $flysystem;
	29	+ });
	30	+ }
31	31	}

		@@ -5,13 +5,13 @@
		block discarded – undo
5	5
6	6	class UploadToken extends AbstractPlugin
7	7	{
8		- public function getMethod()
9		- {
10		- return 'getUploadToken';
11		- }
	8	+ public function getMethod()
	9	+ {
	10	+ return 'getUploadToken';
	11	+ }
12	12
13		- public function handle($option = null)
14		- {
15		- return $this->filesystem->getAdapter()->getUploadToken($option);
16		- }
	13	+ public function handle($option = null)
	14	+ {
	15	+ return $this->filesystem->getAdapter()->getUploadToken($option);
	16	+ }
17	17	}

		@@ -5,12 +5,12 @@
		block discarded – undo
5	5
6	6	class GetUrl extends AbstractPlugin
7	7	{
8		- public function getMethod()
9		- {
10		- return 'getUrl';
11		- }
12		- public function handle($path)
13		- {
14		- return $this->filesystem->getAdapter()->getUrl($path);
15		- }
	8	+ public function getMethod()
	9	+ {
	10	+ return 'getUrl';
	11	+ }
	12	+ public function handle($path)
	13	+ {
	14	+ return $this->filesystem->getAdapter()->getUrl($path);
	15	+ }
16	16	}

		@@ -25,12 +25,17 @@ discard block
		block discarded – undo
25	25	public function checkOptionParameters()
26	26	{
27	27	list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
28		- if (!$valid)
29		- return array($valid, $msg, null);
30		- if (empty($this->encodeTemplate))
31		- return array(false, "encodeTemplate is empty.", null); // 判断是否设置输入输出文件，或者转码模板
32		- if (($this->usePreset != 0 && $this->usePreset != 1) \|\| ($this->force != 0 && $this->force != 1))
33		- return array(false, "parameters 'usePreset' or 'force' is invalid.", null); // 判断usePreset和force参数是否为0或1
	28	+ if (!$valid) {
	29	+ return array($valid, $msg, null);
	30	+ }
	31	+ if (empty($this->encodeTemplate)) {
	32	+ return array(false, "encodeTemplate is empty.", null);
	33	+ }
	34	+ // 判断是否设置输入输出文件，或者转码模板
	35	+ if (($this->usePreset != 0 && $this->usePreset != 1) \|\| ($this->force != 0 && $this->force != 1)) {
	36	+ return array(false, "parameters 'usePreset' or 'force' is invalid.", null);
	37	+ }
	38	+ // 判断usePreset和force参数是否为0或1
34	39	return $this->getOptionsHttpBody(); //返回http请求体
35	40	}
36	41	/*构建多媒体转码所需的http请求体/
		@@ -43,16 +48,21 @@ discard block
		block discarded – undo
43	48	$httpBody .= '&usePreset=' . $this->usePreset;
44	49	$httpBody .= '&force=' . $this->force;
45	50	// 可选的参数
46		- if (isset($this->watermark))
47		- $httpBody .= '&watermark=' . $this->watermark->buildResourceId();
48		- if (isset($this->watermarkTemplate))
49		- $httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);
50		- if (isset($this->notifyUrl))
51		- $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
52		- if (isset($this->seek))
53		- $httpBody .= '&seek=' . $this->seek;
54		- if (isset($this->duration))
55		- $httpBody .= '&duration=' . $this->duration;
	51	+ if (isset($this->watermark)) {
	52	+ $httpBody .= '&watermark=' . $this->watermark->buildResourceId();
	53	+ }
	54	+ if (isset($this->watermarkTemplate)) {
	55	+ $httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);
	56	+ }
	57	+ if (isset($this->notifyUrl)) {
	58	+ $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
	59	+ }
	60	+ if (isset($this->seek)) {
	61	+ $httpBody .= '&seek=' . $this->seek;
	62	+ }
	63	+ if (isset($this->duration)) {
	64	+ $httpBody .= '&duration=' . $this->duration;
	65	+ }
56	66	return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
57	67	}
58	68	/######################以下是可选的参数set方法#######################/
		@@ -93,10 +103,13 @@ discard block
		block discarded – undo
93	103	public function checkOptionParameters()
94	104	{
95	105	list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法
96		- if (!$valid)
97		- return array($valid, $msg, null);
98		- if (empty($this->time) \|\| !is_int($this->time) \|\| $this->time < 0)
99		- return array(false, "time is empty or invalid.", null); // 是否设置时间，且时间是否合法
	106	+ if (!$valid) {
	107	+ return array($valid, $msg, null);
	108	+ }
	109	+ if (empty($this->time) \|\| !is_int($this->time) \|\| $this->time < 0) {
	110	+ return array(false, "time is empty or invalid.", null);
	111	+ }
	112	+ // 是否设置时间，且时间是否合法
100	113	return $this->getOptionsHttpBody(); //返回http请求体
101	114	}
102	115
		@@ -108,8 +121,9 @@ discard block
		block discarded – undo
108	121	$httpBody .= '&output=' . $this->getOutputResId();
109	122	$httpBody .= '&time=' . $this->time;
110	123	// 可选的参数
111		- if (isset($this->notifyUrl))
112		- $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
	124	+ if (isset($this->notifyUrl)) {
	125	+ $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
	126	+ }
113	127	return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
114	128	}
115	129
		@@ -142,14 +156,18 @@ discard block
		block discarded – undo
142	156	/*检测参数选项是否合法/
143	157	public function checkOptionParameters()
144	158	{
145		- if (empty($this->input) \|\| empty($this->output))
146		- return array(false, "input or output resources is empty."); // 判断是否设置输入输出文件，或者转码模板
	159	+ if (empty($this->input) \|\| empty($this->output)) {
	160	+ return array(false, "input or output resources is empty.");
	161	+ }
	162	+ // 判断是否设置输入输出文件，或者转码模板
147	163	list($valid, $msg) = $this->input->checkResourceInfo(true, true); //检测输入的资源信息是否合法
148		- if (!$valid)
149		- return array($valid, $msg);
	164	+ if (!$valid) {
	165	+ return array($valid, $msg);
	166	+ }
150	167	list($valid, $msg) = $this->output->checkResourceInfo(true, true); //检测输入的资源信息是否合法
151		- if (!$valid)
152		- return array($valid, $msg);
	168	+ if (!$valid) {
	169	+ return array($valid, $msg);
	170	+ }
153	171	return array(true, null);
154	172	}
155	173	public function getInputResId()

xiaohuilam / laravel-flysystem-wantu

Branch — master (7fc86c)

Status

Category

Braces +24 added lines, -16 removed lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

Braces +25 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Indentation +18 added lines, -18 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Braces +46 added lines, -28 removed lines patch added patch discarded remove patch