[更新]Composer组件升级

composer.json

@@ -20,7 +20,7 @@
         "qiniu/php-sdk": "^7.0",
         "zoujingli/wechat-php-sdk": "dev-master",
         "zoujingli/ip2region": "^1.0",
-        "topthink/framework": "5.0.14",
+        "topthink/framework": "5.0.*",
         "topthink/think-captcha": "^1.0",
         "topthink/think-mongo": "^1.1",
         "topthink/think-queue": "^1.0",

thinkphp/base.php

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-define('THINK_VERSION', '5.0.14');
+define('THINK_VERSION', '5.0.15');
 define('THINK_START_TIME', microtime(true));
 define('THINK_START_MEM', memory_get_usage());
 define('EXT', '.php');

thinkphp/library/think/Model.php

@@ -192,7 +192,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         $con = Db::connect($connection);
         // 设置当前模型 确保查询返回模型对象
         $queryClass = $this->query ?: $con->getConfig('query');
-        $query      = new $queryClass($con, $this->class);
+        $query      = new $queryClass($con, $this);
 
         // 设置当前数据表和模型名
         if (!empty($this->table)) {
@@ -209,6 +209,19 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     }
 
     /**
+     * 创建新的模型实例
+     * @access public
+     * @param  array|object $data 数据
+     * @param  bool         $isUpdate 是否为更新
+     * @param  mixed        $where 更新条件
+     * @return Model
+     */
+    public function newInstance($data = [], $isUpdate = false, $where = null)
+    {
+        return (new static($data))->isUpdate($isUpdate, $where);
+    }
+
+    /**
      * 获取当前模型的查询对象
      * @access public
      * @param bool      $buildNewQuery  创建新的查询对象
@@ -599,7 +612,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      */
     protected function getRelationData(Relation $modelRelation)
     {
-        if ($this->parent && get_class($this->parent) == $modelRelation->getModel()) {
+        if ($this->parent && !$modelRelation->isSelfRelation() && get_class($modelRelation->getModel()) == get_class($this->parent)) {
             $value = $this->parent;
         } else {
             // 首先获取关联数据

thinkphp/library/think/Route.php

@@ -222,11 +222,11 @@ class Route
     /**
      * 注册路由规则
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param string    $type 请求类型
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param string        $type 请求类型
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
@@ -270,12 +270,12 @@ class Route
     /**
      * 设置路由规则
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param string    $type 请求类型
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @param string    $group 所属分组
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param string        $type 请求类型
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
+     * @param string        $group 所属分组
      * @return void
      */
     protected static function setRule($rule, $route, $type = '*', $option = [], $pattern = [], $group = '')
@@ -487,10 +487,10 @@ class Route
     /**
      * 注册路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function any($rule, $route = '', $option = [], $pattern = [])
@@ -501,10 +501,10 @@ class Route
     /**
      * 注册GET路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function get($rule, $route = '', $option = [], $pattern = [])
@@ -515,10 +515,10 @@ class Route
     /**
      * 注册POST路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function post($rule, $route = '', $option = [], $pattern = [])
@@ -529,10 +529,10 @@ class Route
     /**
      * 注册PUT路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function put($rule, $route = '', $option = [], $pattern = [])
@@ -543,10 +543,10 @@ class Route
     /**
      * 注册DELETE路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function delete($rule, $route = '', $option = [], $pattern = [])
@@ -557,10 +557,10 @@ class Route
     /**
      * 注册PATCH路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function patch($rule, $route = '', $option = [], $pattern = [])
@@ -571,10 +571,10 @@ class Route
     /**
      * 注册资源路由
      * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
+     * @param string|array  $rule 路由规则
+     * @param string        $route 路由地址
+     * @param array         $option 路由参数
+     * @param array         $pattern 变量规则
      * @return void
      */
     public static function resource($rule, $route = '', $option = [], $pattern = [])
@@ -667,7 +667,7 @@ class Route
     /**
      * rest方法定义和修改
      * @access public
-     * @param string        $name 方法名称
+     * @param string|array  $name 方法名称
      * @param array|bool    $resource 资源
      * @return void
      */

thinkphp/library/think/Template.php

@@ -64,12 +64,14 @@ class Template
      */
     public function __construct(array $config = [])
     {
-        $this->config['cache_path']   = TEMP_PATH;
-        $this->config                 = array_merge($this->config, $config);
-        $this->config['taglib_begin'] = $this->stripPreg($this->config['taglib_begin']);
-        $this->config['taglib_end']   = $this->stripPreg($this->config['taglib_end']);
-        $this->config['tpl_begin']    = $this->stripPreg($this->config['tpl_begin']);
-        $this->config['tpl_end']      = $this->stripPreg($this->config['tpl_end']);
+        $this->config['cache_path']          = TEMP_PATH;
+        $this->config                        = array_merge($this->config, $config);
+        $this->config['taglib_begin_origin'] = $this->config['taglib_begin'];
+        $this->config['taglib_end_origin']   = $this->config['taglib_end'];
+        $this->config['taglib_begin']        = $this->stripPreg($this->config['taglib_begin']);
+        $this->config['taglib_end']          = $this->stripPreg($this->config['taglib_end']);
+        $this->config['tpl_begin']           = $this->stripPreg($this->config['tpl_begin']);
+        $this->config['tpl_end']             = $this->stripPreg($this->config['tpl_end']);
 
         // 初始化模板编译存储器
         $type          = $this->config['compile_type'] ? $this->config['compile_type'] : 'File';

thinkphp/library/think/Url.php

@@ -210,17 +210,21 @@ class Url
             }
             $module = $module ? $module . '/' : '';
 
-            $controller = Loader::parseName($request->controller());
+            $controller = $request->controller();
             if ('' == $url) {
                 // 空字符串输出当前的 模块/控制器/操作
-                $url = $module . $controller . '/' . $request->action();
+                $action = $request->action();
             } else {
                 $path       = explode('/', $url);
-                $action     = Config::get('url_convert') ? strtolower(array_pop($path)) : array_pop($path);
-                $controller = empty($path) ? $controller : (Config::get('url_convert') ? Loader::parseName(array_pop($path)) : array_pop($path));
+                $action     = array_pop($path);
+                $controller = empty($path) ? $controller : array_pop($path);
                 $module     = empty($path) ? $module : array_pop($path) . '/';
-                $url        = $module . $controller . '/' . $action;
             }
+            if (Config::get('url_convert')) {
+                $action     = strtolower($action);
+                $controller = Loader::parseName($controller);
+            }
+            $url = $module . $controller . '/' . $action;
         }
         return $url;
     }

thinkphp/library/think/View.php

@@ -158,7 +158,7 @@ class View
         try {
             $method = $renderContent ? 'display' : 'fetch';
             // 允许用户自定义模板的字符串替换
-            $replace = array_merge($this->replace, $replace, $this->engine->config('tpl_replace_string'));
+            $replace = array_merge($this->replace, $replace, (array) $this->engine->config('tpl_replace_string'));
             $this->engine->config('tpl_replace_string', $replace);
             $this->engine->$method($template, $vars, $config);
         } catch (\Exception $e) {

thinkphp/library/think/cache/driver/File.php

@@ -27,6 +27,8 @@ class File extends Driver
         'data_compress' => false,
     ];
 
+    protected $expire;
+
     /**
      * 构造函数
      * @param array $options
@@ -61,10 +63,11 @@ class File extends Driver
     /**
      * 取得变量的存储文件名
      * @access protected
-     * @param string $name 缓存变量名
+     * @param  string $name 缓存变量名
+     * @param  bool   $auto 是否自动创建目录
      * @return string
      */
-    protected function getCacheKey($name)
+    protected function getCacheKey($name, $auto = false)
     {
         $name = md5($name);
         if ($this->options['cache_subdir']) {
@@ -76,7 +79,8 @@ class File extends Driver
         }
         $filename = $this->options['path'] . $name . '.php';
         $dir      = dirname($filename);
-        if (!is_dir($dir)) {
+
+        if ($auto && !is_dir($dir)) {
             mkdir($dir, 0755, true);
         }
         return $filename;
@@ -106,13 +110,15 @@ class File extends Driver
         if (!is_file($filename)) {
             return $default;
         }
-        $content = file_get_contents($filename);
+        $content      = file_get_contents($filename);
+        $this->expire = null;
         if (false !== $content) {
             $expire = (int) substr($content, 8, 12);
             if (0 != $expire && time() > filemtime($filename) + $expire) {
                 return $default;
             }
-            $content = substr($content, 32);
+            $this->expire = $expire;
+            $content      = substr($content, 32);
             if ($this->options['data_compress'] && function_exists('gzcompress')) {
                 //启用数据压缩
                 $content = gzuncompress($content);
@@ -140,7 +146,7 @@ class File extends Driver
         if ($expire instanceof \DateTime) {
             $expire = $expire->getTimestamp() - time();
         }
-        $filename = $this->getCacheKey($name);
+        $filename = $this->getCacheKey($name, true);
         if ($this->tag && !is_file($filename)) {
             $first = true;
         }
@@ -170,11 +176,14 @@ class File extends Driver
     public function inc($name, $step = 1)
     {
         if ($this->has($name)) {
-            $value = $this->get($name) + $step;
+            $value  = $this->get($name) + $step;
+            $expire = $this->expire;
         } else {
-            $value = $step;
+            $value  = $step;
+            $expire = 0;
         }
-        return $this->set($name, $value, 0) ? $value : false;
+
+        return $this->set($name, $value, $expire) ? $value : false;
     }
 
     /**
@@ -187,11 +196,14 @@ class File extends Driver
     public function dec($name, $step = 1)
     {
         if ($this->has($name)) {
-            $value = $this->get($name) - $step;
+            $value  = $this->get($name) - $step;
+            $expire = $this->expire;
         } else {
-            $value = -$step;
+            $value  = -$step;
+            $expire = 0;
         }
-        return $this->set($name, $value, 0) ? $value : false;
+
+        return $this->set($name, $value, $expire) ? $value : false;
     }
 
     /**

thinkphp/library/think/console/command/optimize/Config.php

@@ -30,7 +30,7 @@ class Config extends Command
 
     protected function execute(Input $input, Output $output)
     {
-        if ($input->hasArgument('module')) {
+        if ($input->getArgument('module')) {
             $module = $input->getArgument('module') . DS;
         } else {
             $module = '';

thinkphp/library/think/console/command/optimize/Schema.php

@@ -44,7 +44,8 @@ class Schema extends Command
         if ($input->hasOption('module')) {
             $module = $input->getOption('module');
             // 读取模型
-            $list = scandir(APP_PATH . $module . DS . 'model');
+            $path = APP_PATH . $module . DS . 'model';
+            $list = is_dir($path) ? scandir($path) : [];
             $app  = App::$namespace;
             foreach ($list as $file) {
                 if (0 === strpos($file, '.')) {
@@ -66,7 +67,8 @@ class Schema extends Command
             $tables = Db::connect($config)->getTables($dbName);
         } elseif (!\think\Config::get('app_multi_module')) {
             $app  = App::$namespace;
-            $list = scandir(APP_PATH . 'model');
+            $path = APP_PATH . 'model';
+            $list = is_dir($path) ? scandir($path) : [];
             foreach ($list as $file) {
                 if (0 === strpos($file, '.')) {
                     continue;

thinkphp/library/think/db/Builder.php

@@ -26,7 +26,7 @@ abstract class Builder
     protected $exp = ['eq' => '=', 'neq' => '<>', 'gt' => '>', 'egt' => '>=', 'lt' => '<', 'elt' => '<=', 'notlike' => 'NOT LIKE', 'not like' => 'NOT LIKE', 'like' => 'LIKE', 'in' => 'IN', 'exp' => 'EXP', 'notin' => 'NOT IN', 'not in' => 'NOT IN', 'between' => 'BETWEEN', 'not between' => 'NOT BETWEEN', 'notbetween' => 'NOT BETWEEN', 'exists' => 'EXISTS', 'notexists' => 'NOT EXISTS', 'not exists' => 'NOT EXISTS', 'null' => 'NULL', 'notnull' => 'NOT NULL', 'not null' => 'NOT NULL', '> time' => '> TIME', '< time' => '< TIME', '>= time' => '>= TIME', '<= time' => '<= TIME', 'between time' => 'BETWEEN TIME', 'not between time' => 'NOT BETWEEN TIME', 'notbetween time' => 'NOT BETWEEN TIME'];
 
     // SQL表达式
-    protected $selectSql    = 'SELECT%DISTINCT% %FIELD% FROM %TABLE%%FORCE%%UNION%%JOIN%%WHERE%%GROUP%%HAVING%%ORDER%%LIMIT%%LOCK%%COMMENT%';
+    protected $selectSql    = 'SELECT%DISTINCT% %FIELD% FROM %TABLE%%FORCE%%JOIN%%WHERE%%GROUP%%HAVING%%UNION%%ORDER%%LIMIT%%LOCK%%COMMENT%';
     protected $insertSql    = '%INSERT% INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
     protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
     protected $updateSql    = 'UPDATE %TABLE% SET %SET% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
@@ -207,9 +207,6 @@ abstract class Builder
         $item = [];
         foreach ((array) $tables as $key => $table) {
             if (!is_numeric($key)) {
-                if (strpos($key, '@think')) {
-                    $key = strstr($key, '@think', true);
-                }
                 $key    = $this->parseSqlTable($key);
                 $item[] = $this->parseKey($key) . ' ' . (isset($options['alias'][$table]) ? $this->parseKey($options['alias'][$table]) : $this->parseKey($table));
             } else {

thinkphp/library/think/db/Query.php

@@ -58,9 +58,9 @@ class Query
      * 构造函数
      * @access public
      * @param Connection $connection 数据库对象实例
-     * @param string     $model      模型名
+     * @param Model      $model      模型对象
      */
-    public function __construct(Connection $connection = null, $model = '')
+    public function __construct(Connection $connection = null, $model = null)
     {
         $this->connection = $connection ?: Db::connect([], true);
         $this->prefix     = $this->connection->getConfig('prefix');
@@ -133,7 +133,7 @@ class Query
     /**
      * 获取当前的模型对象名
      * @access public
-     * @return string
+     * @return Model|null
      */
     public function getModel()
     {
@@ -707,8 +707,7 @@ class Query
     {
         // 传入的表名为数组
         if (is_array($join)) {
-            $table = key($join);
-            $alias = current($join);
+            $table = $join;
         } else {
             $join = trim($join);
             if (false !== strpos($join, '(')) {
@@ -729,16 +728,9 @@ class Query
                     $table = $this->getTable($table);
                 }
             }
-        }
-        if (isset($alias) && $table != $alias) {
-            if (isset($this->options['alias'][$table])) {
-                $table = $table . '@think' . uniqid();
-            } elseif ($this->gettable() == $table) {
-                $table = $table . '@think' . uniqid();
+            if (isset($alias) && $table != $alias) {
+                $table = [$table => $alias];
             }
-
-            $table = [$table => $alias];
-            $this->alias($table);
         }
         return $table;
     }
@@ -1910,11 +1902,10 @@ class Query
             $with = explode(',', $with);
         }
 
-        $first        = true;
-        $currentModel = $this->model;
+        $first = true;
 
         /** @var Model $class */
-        $class = new $currentModel;
+        $class = $this->model;
         foreach ($with as $key => $relation) {
             $subRelation = '';
             $closure     = false;
@@ -1973,7 +1964,7 @@ class Query
                     $relation = $key;
                 }
                 $relation = Loader::parseName($relation, 1, false);
-                $count    = '(' . (new $this->model)->$relation()->getRelationCountQuery($closure) . ')';
+                $count    = '(' . $this->model->$relation()->getRelationCountQuery($closure) . ')';
                 $this->field([$count => Loader::parseName($relation) . '_count']);
             }
         }
@@ -2365,11 +2356,10 @@ class Query
         // 数据列表读取后的处理
         if (!empty($this->model)) {
             // 生成模型对象
-            $modelName = $this->model;
             if (count($resultSet) > 0) {
                 foreach ($resultSet as $key => $result) {
                     /** @var Model $model */
-                    $model = new $modelName($result);
+                    $model = $this->model->newInstance($result);
                     $model->isUpdate(true);
 
                     // 关联查询
@@ -2389,7 +2379,7 @@ class Query
                 // 模型数据集转换
                 $resultSet = $model->toCollection($resultSet);
             } else {
-                $resultSet = (new $modelName)->toCollection($resultSet);
+                $resultSet = $this->model->toCollection($resultSet);
             }
         } elseif ('collection' == $this->connection->getConfig('resultset_type')) {
             // 返回Collection对象
@@ -2515,7 +2505,7 @@ class Query
                 $result = isset($resultSet[0]) ? $resultSet[0] : null;
             }
 
-            if (isset($cache) && false !== $result) {
+            if (isset($cache) && $result) {
                 // 缓存数据
                 $this->cacheData($key, $result, $cache);
             }
@@ -2525,8 +2515,7 @@ class Query
         if (!empty($result)) {
             if (!empty($this->model)) {
                 // 返回模型对象
-                $model  = $this->model;
-                $result = new $model($result);
+                $result = $this->model->newInstance($result);
                 $result->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null);
                 // 关联查询
                 if (!empty($options['relation'])) {
@@ -2557,7 +2546,8 @@ class Query
     protected function throwNotFound($options = [])
     {
         if (!empty($this->model)) {
-            throw new ModelNotFoundException('model data Not Found:' . $this->model, $this->model, $options);
+            $class = get_class($this->model);
+            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $options);
         } else {
             $table = is_array($options['table']) ? key($options['table']) : $options['table'];
             throw new DataNotFoundException('table data not Found:' . $table, $table, $options);
@@ -2605,7 +2595,9 @@ class Query
     public function chunk($count, $callback, $column = null, $order = 'asc')
     {
         $options = $this->getOptions();
-
+        if (empty($options['table'])) {
+            $options['table'] = $this->getTable();
+        }
         $column = $column ?: $this->getPk($options);
 
         if (isset($options['order'])) {
@@ -2628,7 +2620,7 @@ class Query
         }
         $resultSet = $query->order($column, $order)->select();
 
-        while (!empty($resultSet)) {
+        while (count($resultSet) > 0) {
             if ($resultSet instanceof Collection) {
                 $resultSet = $resultSet->all();
             }
@@ -2649,8 +2641,8 @@ class Query
             }
 
             $resultSet = $query->bind($bind)->order($column, $order)->select();
-
         }
+
         return true;
     }
 

thinkphp/library/think/log/driver/File.php

@@ -86,7 +86,10 @@ class File
     {
         //检测日志文件大小，超过配置大小则备份日志文件重新生成
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
-            rename($destination, dirname($destination) . DS . time() . '-' . basename($destination));
+            try {
+                rename($destination, dirname($destination) . DS . time() . '-' . basename($destination));
+            } catch (\Exception $e) {
+            }
             $this->writed[$destination] = false;
         }
 

thinkphp/library/think/model/Relation.php

@@ -35,6 +35,8 @@ abstract class Relation
     protected $localKey;
     // 基础查询
     protected $baseQuery;
+    // 是否为自关联
+    protected $selfRelation;
 
     /**
      * 获取关联的所属模型
@@ -49,11 +51,11 @@ abstract class Relation
     /**
      * 获取当前的关联模型类
      * @access public
-     * @return string
+     * @return Model
      */
     public function getModel()
     {
-        return $this->model;
+        return $this->query->getModel();
     }
 
     /**
@@ -67,6 +69,28 @@ abstract class Relation
     }
 
     /**
+     * 设置当前关联为自关联
+     * @access public
+     * @param  bool $self 是否自关联
+     * @return $this
+     */
+    public function selfRelation($self = true)
+    {
+        $this->selfRelation = $self;
+        return $this;
+    }
+
+    /**
+     * 当前关联是否为自关联
+     * @access public
+     * @return bool
+     */
+    public function isSelfRelation()
+    {
+        return $this->selfRelation;
+    }
+
+    /**
      * 封装关联数据集
      * @access public
      * @param array $resultSet 数据集

thinkphp/library/think/model/relation/MorphTo.php

@@ -44,6 +44,18 @@ class MorphTo extends Relation
     }
 
     /**
+     * 获取当前的关联模型类的实例
+     * @access public
+     * @return Model
+     */
+    public function getModel()
+    {
+        $morphType = $this->morphType;
+        $model     = $this->parseModel($this->parent->$morphType);
+        return (new $model);
+    }
+
+    /**
      * 延迟获取关联数据
      * @param string   $subRelation 子关联名
      * @param \Closure $closure     闭包查询条件

thinkphp/library/think/model/relation/OneToOne.php

@@ -57,18 +57,18 @@ abstract class OneToOne extends Relation
      */
     public function eagerly(Query $query, $relation, $subRelation, $closure, $first)
     {
-        $name  = Loader::parseName(basename(str_replace('\\', '/', $query->getModel())));
-        $alias = $name;
+        $name = Loader::parseName(basename(str_replace('\\', '/', get_class($query->getModel()))));
+
         if ($first) {
             $table = $query->getTable();
-            $query->table([$table => $alias]);
+            $query->table([$table => $name]);
             if ($query->getOptions('field')) {
                 $field = $query->getOptions('field');
                 $query->removeOption('field');
             } else {
                 $field = true;
             }
-            $query->field($field, false, $table, $alias);
+            $query->field($field, false, $table, $name);
             $field = null;
         }
 
@@ -78,9 +78,9 @@ abstract class OneToOne extends Relation
         $query->via($joinAlias);
 
         if ($this instanceof BelongsTo) {
-            $query->join([$joinTable => $joinAlias], $alias . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey, $this->joinType);
+            $query->join([$joinTable => $joinAlias], $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey, $this->joinType);
         } else {
-            $query->join([$joinTable => $joinAlias], $alias . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey, $this->joinType);
+            $query->join([$joinTable => $joinAlias], $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey, $this->joinType);
         }
 
         if ($closure) {

thinkphp/library/think/template/TagLib.php

@@ -264,8 +264,8 @@ class TagLib
             if (!empty($this->tags[$name]['expression'])) {
                 static $_taglibs;
                 if (!isset($_taglibs[$name])) {
-                    $_taglibs[$name][0] = strlen(ltrim($this->tpl->config('taglib_begin'), '\\') . $name);
-                    $_taglibs[$name][1] = strlen(ltrim($this->tpl->config('taglib_end'), '\\'));
+                    $_taglibs[$name][0] = strlen($this->tpl->config('taglib_begin_origin') . $name);
+                    $_taglibs[$name][1] = strlen($this->tpl->config('taglib_end_origin'));
                 }
                 $result['expression'] = substr($str, $_taglibs[$name][0], -$_taglibs[$name][1]);
                 // 清除自闭合标签尾部/

thinkphp/library/think/template/taglib/Cx.php

@@ -278,7 +278,7 @@ class Cx extends Taglib
      */
     public function tagCase($tag, $content)
     {
-        $value = !empty($tag['expression']) ? $tag['expression'] : $tag['value'];
+        $value = isset($tag['expression']) ? $tag['expression'] : $tag['value'];
         $flag  = substr($value, 0, 1);
         if ('$' == $flag || ':' == $flag) {
             $value = $this->autoBuildVar($value);

thinkphp/library/traits/model/SoftDelete.php

@@ -19,7 +19,10 @@ trait SoftDelete
     {
         $field = $this->getDeleteTimeField();
 
-        return !empty($this->data[$field]);
+        if ($field && !empty($this->data[$field])) {
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -42,7 +45,11 @@ trait SoftDelete
         $model = new static();
         $field = $model->getDeleteTimeField(true);
 
-        return $model->getQuery()->useSoftDelete($field, ['not null', '']);
+        if ($field) {
+            return $model->getQuery()->useSoftDelete($field, ['not null', '']);
+        } else {
+            return $model->getQuery();
+        }
     }
 
     /**
@@ -58,7 +65,7 @@ trait SoftDelete
         }
 
         $name = $this->getDeleteTimeField();
-        if (!$force) {
+        if ($name && !$force) {
             // 软删除
             $this->data[$name] = $this->autoWriteTimestamp($name);
             $result            = $this->isUpdate()->save();
@@ -139,11 +146,15 @@ trait SoftDelete
 
         $name = $this->getDeleteTimeField();
 
-        // 恢复删除
-        return $this->getQuery()
-            ->useSoftDelete($name, ['not null', ''])
-            ->where($where)
-            ->update([$name => null]);
+        if ($name) {
+            // 恢复删除
+            return $this->getQuery()
+                ->useSoftDelete($name, ['not null', ''])
+                ->where($where)
+                ->update([$name => null]);
+        } else {
+            return 0;
+        }
     }
 
     /**
@@ -154,7 +165,8 @@ trait SoftDelete
      */
     protected function base($query)
     {
-        return $query->useSoftDelete($this->getDeleteTimeField(true));
+        $field = $this->getDeleteTimeField(true);
+        return $field ? $query->useSoftDelete($field) : $query;
     }
 
     /**
@@ -169,6 +181,10 @@ trait SoftDelete
         $this->deleteTime :
         'delete_time';
 
+        if (false === $field) {
+            return false;
+        }
+
         if (!strpos($field, '.')) {
             $field = '__TABLE__.' . $field;
         }

vendor/aliyuncs/oss-sdk-php/.travis.yml

@@ -1,10 +1,10 @@
 language: php
 php:
+  - 7.1
   - 7.0
   - 5.6
   - 5.5
   - 5.4
-  - 5.3
 install:
   - composer self-update
   - composer install --no-interaction
@@ -18,3 +18,4 @@ env:
     - secure: nEhsU8aUQqsAJeuger+boh51oTpeo4YNG7vUWbKxdwVDIrcLb+l7r7RvTlxU7mt8IZTWwicgri18mh+Wi04BwX4ulBA1SCs8jPbL51KEo5izoDGGtLSd2fuPHdslYSrwagrvq90EPnDT/7fHWn/TAoT+rueZzjNyCu5IGSgL3GnXaUThsJ82NMePL2YRdP4Q1qmtZPRFBOkOQ6F0heuV8fw8sLyTO3txaCQum9YneGxrWxOl/E8zB0qtlnPwLE8ogaHZMQh2/jThmTbI5UqwRTxV4f0qoD5eJYH+j0fslsSAjsg/HPnSuVcnccK3zSU+s2sV4dPCcISzECJvZEObwipfxOGhdqt5gMcxHhn8qVsbT97iIh106pG/BJCDgQd2EeVW8WfCi6cCuCKIMipvVkMypkmjQHWU1XaqPzILl7g5diW9Ctp2C4Akq5dYdrdu8IrnVK1ShtkQVaWU+S/Bht8VU5gYP7olPW/GdTz7sceU1NOIC4NPXqmWKbfavR98U5dkHMLMvzABYL1Q87h+KhPD1c14NUyw3YENUW7REiF/X5lERRm5H0kJ/1JqAa+AgeHQEGmPVuZV2s/na4b0S1479QRVmSM/6ZzXQpU+Y8jCRfETpUFA4S331369kirHgCqDlxyIntuEKrzivD02/O+5C3eJ0WHRz6QsN2/R4qg=
     - secure: ZTvzNXEZP4efl+a/3VGMmdabfUQp83v5/lecMns039Ro7UuZYPdtbPtpPnpjaTI6Htd22A4Rva5BU/3JCQJAyQvpbKNn5sGou2SmfQu3o0SyhggSB7gWjYAf707aW1j4bHYfP8IjDS5NjuVk3AqXeNSUuLRUXRmwSOB0lSYiRhiTJY+pUdBl382Hx4NbhIU/gmOzRoJCs7coTip8IURXYEHPi5dnDWluajxI+TgNXFccSgEleeQDJajYgXmpLb2EhSj8piipOnVgaCEE5bh5fbp32024Qq38SGHKcbfnwj2IInpZpZESJknRKoqAlFjdOJhork82dBcvAr5JxCBZKx5IuwXcTjxkQ6tRtBeqhPLPFuX3MQ8WrtU+wniPM0RCH/VoFkUKO7JGQDwmoi2AKago4PsuDs4P6Y6CeuOVpcso731GwwMNhIJcyrJJivXprQNEGsEw+9wLjU1qNYs6IIA3S/gPzFrNbdX5Wf8vxt0vLpgYvBNtPnLMejMtknuyfVzf5iKuVVoGPDTEz+ajs06+jfoPfm/4sLTaLghuVH7Adm74OpF769JQNnQYKwJuu4bNlcbLJChulCEMBOx7myqo/9O6RCTuqzHaGmVWNot4RGqRFHgJGl/JJf0WpAVitbhbRH3kGoyKb6jFM74CJbPsE7OORlJLDC3cdD3C8Pk=
     - secure: Qr5NR4CVzBKCQgRgMH0x772TPJ1+brx3UCvtRNu8fi4j3p8bz+HDMjBaBDSFmEB09nunLI55/8mj88/5GXmnpFs8+CPTkcW+QZOcxg3cxpI4SNmxoB12/ZawlFHAqSUaRRE7RUWVkY3KL8tIGjEZcFyUBQ1DVNX3OMpiKs3NLtHa7oUIknyBxdSokm4kpLhSXYe7WmO0vhuZbMZE0S1EISToiBS6AdhGUEbTLJ/vNsIDY07fu6+Vh3HxVbyUFPqUZGlkZpQ+2xMJ3kiqPBMrXtRF/IhhPjORDil6Ns9SQ8/AAlaCddvYvRaT4Pjv2/aX+t3l28qI1qmryPtWXpce5UXecWGYqdRpSJc6Y/pEt4m4FeeGoEFWnSPGIs7FRmeiis8q2rojGZ18i4vI/k4iHmqEBnTlMp3SWnRb9L1adJ8ZAWln8aC88gkQXm67w7+1CxLycerbYj9H1ugqHENuHcxv4uHUcZgEENX3EWatu8i9+K2IUuU/2zcmpu7qtsziYcoyW8DOOmYpJfXGMLtmF9+pqp/Tp6i0tltFSEfmY3N8o7xvv3enLvFHsjL+3ElFdd1blUPSrvZJHgA9M3lJ+QF1RJZCpJqgPlQ0XOZK1Bf4P46zpEj01wKaK4JQrkLPRXhbBOuIJn5O6WlFJyPX4+SaBfwTzb4AvM4aUg2TgTg=
+    - secure: Inw5ftA8fxvhMHRZwoZzATxn4WICJsCq7ZX4y2gI+b/8u0JQIsbLgY9WTYV+XdSxOoNwuVa1oUxEWI0aDORtXKC3XaIXXKrwndag0zxS77JEYwWvQsjM7BhEbF7MF7MYk8rRXpn6mbfGAT/NfqEOx91RCY8UKeMzD0oPkpkBnJ9Ekuod6JBBq+7j3v4mYUItA8pxvw7b4Pdd4z2xzjgOwNhJYMOCpts50DWZI+WXj0HvTYaMXe5mJJtORK5lsr0a9cbsBqAzE6l+3zGI8XkgHn130ux5XH3DE7hZBeti3ZNaO3d2Vv+496/1EObG0rSFk+z3dmNKqjMz4nh3bYIkdLMegwmgCWs2mvQhkwYhzmnPRHVSERrgZjSWnuKn2PKnBar6tui9KaLNgpo2j3jWpwMLJ3bGAfE5JtMppxAxNqj/q+YB2UZo7Mn7EDjkTDjgxCuazTJwWqH7xxCOykWPABBI17P3JaOXQJEK39LavpfSMm3kdmU0ocpUs7FniLuFm6xL71VxY1wHG10yskczEcFHZ3iyIyGM+xum4vbt5y6Yg+zfdExYQsbrxHDDZ3HbHY3tEU0WhM55vrC42NIXRWqXqJ8OAxpl4nivfx96eoBAThiUU9xXtZmh7WRFVYsstoGtxZwfk5+bi+oeVO9kih4xabwbgHgL9BTc1TR1C4U=

vendor/aliyuncs/oss-sdk-php/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ChangeLog - Aliyun OSS SDK for PHP
 
+## v2.3.0 / 2018-01-05
+
+* 修复：putObject支持创建空文件
+* 修复：createBucket支持IA/Archive
+* 增加：支持restoreObject
+* 增加：支持Symlink功能
+* 增加：支持getBucketLocation
+* 增加：支持getBucketMeta
+* 增加：支持代理服务器Proxy
+
 ## v2.2.4 / 2017-04-25
 
 * fix getObject to local file bug

vendor/aliyuncs/oss-sdk-php/README-CN.md

@@ -0,0 +1,149 @@
+# Aliyun OSS SDK for PHP
+
+[![Latest Stable Version](https://poser.pugx.org/aliyuncs/oss-sdk-php/v/stable)](https://packagist.org/packages/aliyuncs/oss-sdk-php)
+[![Build Status](https://travis-ci.org/aliyun/aliyun-oss-php-sdk.svg?branch=master)](https://travis-ci.org/aliyun/aliyun-oss-php-sdk)
+[![Coverage Status](https://coveralls.io/repos/github/aliyun/aliyun-oss-php-sdk/badge.svg?branch=master)](https://coveralls.io/github/aliyun/aliyun-oss-php-sdk?branch=master)
+
+## [README of English](https://github.com/aliyun/aliyun-oss-php-sdk/blob/master/README.md)
+
+## 概述
+
+阿里云对象存储（Object Storage Service，简称OSS），是阿里云对外提供的海量、安全、低成本、高可靠的云存储服务。用户可以通过调用API，在任何应用、任何时间、任何地点上传和下载数据，也可以通过用户Web控制台对数据进行简单的管理。OSS适合存放任意文件类型，适合各种网站、开发企业及开发者使用。
+
+
+## 运行环境
+- PHP 5.3+
+- cURL extension
+
+提示：
+
+- Ubuntu下可以使用apt-get包管理器安装php的cURL扩展 `sudo apt-get install php5-curl`
+
+## 安装方法
+
+1. 如果您通过composer管理您的项目依赖，可以在你的项目根目录运行：
+
+        $ composer require aliyuncs/oss-sdk-php
+
+   或者在你的`composer.json`中声明对Aliyun OSS SDK for PHP的依赖：
+
+        "require": {
+            "aliyuncs/oss-sdk-php": "~2.0"
+        }
+
+   然后通过`composer install`安装依赖。composer安装完成后，在您的PHP代码中引入依赖即可：
+
+        require_once __DIR__ . '/vendor/autoload.php';
+
+2. 您也可以直接下载已经打包好的[phar文件][releases-page]，然后在你
+   的代码中引入这个文件即可：
+
+        require_once '/path/to/oss-sdk-php.phar';
+
+3. 下载SDK源码，在您的代码中引入SDK目录下的`autoload.php`文件：
+
+        require_once '/path/to/oss-sdk/autoload.php';
+
+## 快速使用
+
+### 常用类
+
+| 类名 | 解释 |
+|:------------------|:------------------------------------|
+|OSS\OssClient | OSS客户端类，用户通过OssClient的实例调用接口 |
+|OSS\Core\OssException | OSS异常类，用户在使用的过程中，只需要注意这个异常|
+
+### OssClient初始化
+
+SDK的OSS操作通过OssClient类完成的，下面代码创建一个OssClient对象:
+
+```php
+<?php
+$accessKeyId = "<您从OSS获得的AccessKeyId>"; ;
+$accessKeySecret = "<您从OSS获得的AccessKeySecret>";
+$endpoint = "<您选定的OSS数据中心访问域名，例如oss-cn-hangzhou.aliyuncs.com>";
+try {
+    $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint);
+} catch (OssException $e) {
+    print $e->getMessage();
+}
+```
+
+### 文件操作
+
+文件(又称对象,Object)是OSS中最基本的数据单元，您可以把它简单地理解为文件，用下面代码可以实现一个Object的上传：
+
+```php
+<?php
+$bucket = "<您使用的Bucket名字，注意命名规范>";
+$object = "<您使用的Object名字，注意命名规范>";
+$content = "Hello, OSS!"; // 上传的文件内容
+try {
+    $ossClient->putObject($bucket, $object, $content);
+} catch (OssException $e) {
+    print $e->getMessage();
+}
+```
+
+### 存储空间操作
+
+存储空间(又称Bucket)是一个用户用来管理所存储Object的存储空间,对于用户来说是一个管理Object的单元，所有的Object都必须隶属于某个Bucket。您可以按照下面的代码新建一个Bucket：
+
+```php
+<?php
+$bucket = "<您使用的Bucket名字，注意命名规范>";
+try {
+    $ossClient->createBucket($bucket);
+} catch (OssException $e) {
+    print $e->getMessage();
+}
+```
+
+### 返回结果处理
+
+OssClient提供的接口返回返回数据分为两种：
+
+* Put，Delete类接口，接口返回null，如果没有OssException，即可认为操作成功
+* Get，List类接口，接口返回对应的数据，如果没有OssException，即可认为操作成功，举个例子：
+
+```php
+<?php
+$bucketListInfo = $ossClient->listBuckets();
+$bucketList = $bucketListInfo->getBucketList();
+foreach($bucketList as $bucket) {
+    print($bucket->getLocation() . "\t" . $bucket->getName() . "\t" . $bucket->getCreatedate() . "\n");
+}
+```
+上面代码中的$bucketListInfo的数据类型是 `OSS\Model\BucketListInfo`
+
+
+### 运行Sample程序
+
+1. 修改 `samples/Config.php`， 补充配置信息
+2. 执行 `cd samples/ && php RunAll.php`
+
+### 运行单元测试
+
+1. 执行`composer install`下载依赖的库
+2. 设置环境变量
+
+        export OSS_ACCESS_KEY_ID=access-key-id
+        export OSS_ACCESS_KEY_SECRET=access-key-secret
+        export OSS_ENDPOINT=endpoint
+        export OSS_BUCKET=bucket-name
+
+3. 执行 `php vendor/bin/phpunit`
+
+## License
+
+- MIT
+
+## 联系我们
+
+- [阿里云OSS官方网站](http://oss.aliyun.com)
+- [阿里云OSS官方论坛](http://bbs.aliyun.com)
+- [阿里云OSS官方文档中心](http://www.aliyun.com/product/oss#Docs)
+- 阿里云官方技术支持：[提交工单](https://workorder.console.aliyun.com/#/ticket/createIndex)
+
+[releases-page]: https://github.com/aliyun/aliyun-oss-php-sdk/releases
+[phar-composer]: https://github.com/clue/phar-composer

vendor/aliyuncs/oss-sdk-php/README.md

@@ -1,65 +1,67 @@
-# Aliyun OSS SDK for PHP
+# Alibaba Cloud OSS SDK for PHP
 
 [![Latest Stable Version](https://poser.pugx.org/aliyuncs/oss-sdk-php/v/stable)](https://packagist.org/packages/aliyuncs/oss-sdk-php)
 [![Build Status](https://travis-ci.org/aliyun/aliyun-oss-php-sdk.svg?branch=master)](https://travis-ci.org/aliyun/aliyun-oss-php-sdk)
 [![Coverage Status](https://coveralls.io/repos/github/aliyun/aliyun-oss-php-sdk/badge.svg?branch=master)](https://coveralls.io/github/aliyun/aliyun-oss-php-sdk?branch=master)
 
-## 概述
+## [README of Chinese](https://github.com/aliyun/aliyun-oss-php-sdk/blob/master/README-CN.md)
 
-阿里云对象存储（Object Storage Service，简称OSS），是阿里云对外提供的海量、安全、低成本、高可靠的云存储服务。用户可以通过调用API，在任何应用、任何时间、任何地点上传和下载数据，也可以通过用户Web控制台对数据进行简单的管理。OSS适合存放任意文件类型，适合各种网站、开发企业及开发者使用。
+## Overview
 
+Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring a massive capacity, security, a low cost, and high reliability. You can upload and download data on any application anytime and anywhere by calling APIs, and perform simple management of data through the web console. The OSS can store any type of files and therefore applies to various websites, development enterprises and developers.
 
-## 运行环境
-- PHP 5.3+
-- cURL extension
 
-提示：
+## Run environment
+- PHP 5.3+.
+- cURL extension.
 
-- Ubuntu下可以使用apt-get包管理器安装php的cURL扩展 `sudo apt-get install php5-curl`
+Tips:
 
-## 安装方法
+- In Ubuntu, you can use the ***apt-get*** package manager to install the *PHP cURL extension*: `sudo apt-get install php5-curl`.
 
-1. 如果您通过composer管理您的项目依赖，可以在你的项目根目录运行：
+## Install OSS PHP SDK
 
-        $ composer require aliyuncs/oss-sdk-php
+- If you use the ***composer*** to manage project dependencies, run the following command in your project's root directory:
 
-   或者在你的`composer.json`中声明对Aliyun OSS SDK for PHP的依赖：
+        composer require aliyuncs/oss-sdk-php
+
+   You can also declare the dependency on Alibaba Cloud OSS SDK for PHP in the `composer.json` file.
 
         "require": {
             "aliyuncs/oss-sdk-php": "~2.0"
         }
 
-   然后通过`composer install`安装依赖。composer安装完成后，在您的PHP代码中引入依赖即可：
+   Then run `composer install` to install the dependency. After the Composer Dependency Manager is installed, import the dependency in your PHP code: 
 
         require_once __DIR__ . '/vendor/autoload.php';
 
-2. 您也可以直接下载已经打包好的[phar文件][releases-page]，然后在你
-   的代码中引入这个文件即可：
+- You can also directly download the packaged [PHAR File][releases-page], and 
+   introduce the file to your code: 
 
         require_once '/path/to/oss-sdk-php.phar';
 
-3. 下载SDK源码，在您的代码中引入SDK目录下的`autoload.php`文件：
+- Download the SDK source code, and introduce the `autoload.php` file under the SDK directory to your code: 
 
         require_once '/path/to/oss-sdk/autoload.php';
 
-## 快速使用
+## Quick use
 
-### 常用类
+### Common classes
 
-| 类名 | 解释 |
+| Class | Explanation |
 |:------------------|:------------------------------------|
-|OSS\OssClient | OSS客户端类，用户通过OssClient的实例调用接口 |
-|OSS\Core\OssException | OSS异常类，用户在使用的过程中，只需要注意这个异常|
+|OSS\OSSClient | OSS client class. An OSSClient instance can be used to call the interface.  |
+|OSS\Core\OSSException |OSS Exception class . You only need to pay attention to this exception when you use the OSSClient. |
 
-### OssClient初始化
+### Initialize an OSSClient
 
-SDK的OSS操作通过OssClient类完成的，下面代码创建一个OssClient对象:
+The SDK's operations for the OSS are performed through the OSSClient class. The code below creates an OSSClient object:
 
 ```php
 <?php
-$accessKeyId = "<您从OSS获得的AccessKeyId>"; ;
-$accessKeySecret = "<您从OSS获得的AccessKeySecret>";
-$endpoint = "<您选定的OSS数据中心访问域名，例如oss-cn-hangzhou.aliyuncs.com>";
+$accessKeyId = "<AccessKeyID that you obtain from OSS>";
+$accessKeySecret = "<AccessKeySecret that you obtain from OSS>";
+$endpoint = "<Domain that you select to access an OSS data center, such as "oss-cn-hangzhou.aliyuncs.com>";
 try {
     $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint);
 } catch (OssException $e) {
@@ -67,15 +69,15 @@ try {
 }
 ```
 
-### 文件操作
+### Operations on objects
 
-文件(又称对象,Object)是OSS中最基本的数据单元，您可以把它简单地理解为文件，用下面代码可以实现一个Object的上传：
+Objects are the most basic data units on the OSS. You can simply consider objects as files. The following code uploads an object:
 
 ```php
 <?php
-$bucket = "<您使用的Bucket名字，注意命名规范>";
-$object = "<您使用的Object名字，注意命名规范>";
-$content = "Hello, OSS!"; // 上传的文件内容
+$bucket= "<Name of the bucket in use. Pay attention to naming conventions>";
+$object = "<Name of the object in use. Pay attention to naming conventions>";
+$content = "Hello, OSS!"; // Content of the uploaded file
 try {
     $ossClient->putObject($bucket, $object, $content);
 } catch (OssException $e) {
@@ -83,13 +85,13 @@ try {
 }
 ```
 
-### 存储空间操作
+### Operations on buckets
 
-存储空间(又称Bucket)是一个用户用来管理所存储Object的存储空间,对于用户来说是一个管理Object的单元，所有的Object都必须隶属于某个Bucket。您可以按照下面的代码新建一个Bucket：
+Buckets are the space that you use to manage the stored objects. It is an object management unit for users. Each object must belong to a bucket. You can create a bucket with the following code:
 
 ```php
 <?php
-$bucket = "<您使用的Bucket名字，注意命名规范>";
+$bucket= "<Name of the bucket in use. Pay attention to naming conventions>";
 try {
     $ossClient->createBucket($bucket);
 } catch (OssException $e) {
@@ -97,56 +99,52 @@ try {
 }
 ```
 
-### 返回结果处理
+### Handle returned results
 
-OssClient提供的接口返回返回数据分为两种：
+The OSSClient provides the following two types of returned data from interfaces:
 
-* Put，Delete类接口，接口返回null，如果没有OssException，即可认为操作成功
-* Get，List类接口，接口返回对应的数据，如果没有OssException，即可认为操作成功，举个例子：
+- Put and Delete interfaces: The *PUT* and *DELETE* operations are deemed successful if *null* is returned by the interfaces without *OSSException*.
+- Get and List interfaces: The *GET* and *LIST* operations are deemed successful if the desired data is returned by the interfaces without *OSSException*. For example, 
 
-```php
-<?php
-$bucketListInfo = $ossClient->listBuckets();
-$bucketList = $bucketListInfo->getBucketList();
-foreach($bucketList as $bucket) {
-    print($bucket->getLocation() . "\t" . $bucket->getName() . "\t" . $bucket->getCreatedate() . "\n");
-}
-```
-上面代码中的$bucketListInfo的数据类型是 `OSS\Model\BucketListInfo`
+    ```php
+    <?php
+    $bucketListInfo = $ossClient->listBuckets();
+    $bucketList = $bucketListInfo->getBucketList();
+    foreach($bucketList as $bucket) {
+        print($bucket->getLocation() . "\t" . $bucket->getName() . "\t" . $bucket->getCreatedate() . "\n");
+    }
+    ```
+In the above code, $bucketListInfo falls into the 'OSS\Model\BucketListInfo' data type.
 
 
-### 运行Sample程序
+### Run a sample project
 
-1. 修改 `samples/Config.php`， 补充配置信息
-2. 执行 `cd samples/ && php RunAll.php`
+- Modify `samples/Config.php` to complete the configuration information. 
+- Run `cd samples/ && php RunAll.php`. 
 
-### 运行单元测试
+### Run a unit test
 
-1. 执行`composer install`下载依赖的库
-2. 设置环境变量
+- Run `composer install` to download the dependent libraries. 
+- Set the environment variable. 
 
         export OSS_ACCESS_KEY_ID=access-key-id
         export OSS_ACCESS_KEY_SECRET=access-key-secret
         export OSS_ENDPOINT=endpoint
         export OSS_BUCKET=bucket-name
 
-3. 执行 `php vendor/bin/phpunit`
+- Run `php vendor/bin/phpunit`
 
-## 贡献代码
+## License
 
-0. 开发流程参考：https://github.com/rockuw/oss-sdk-status#development-oss-members-only
-1. 提交代码后，确保travis CI是PASS的
-2. 每发布一个新的版本：
-  - 运行`build-phar.sh`生成相应的phar包（需要安装[phar-composer][phar-composer])
-  - 在[Release页面][releases-page]发布一个版本
-  - 将生成的phar包上传到相应的Release下面
+- MIT
 
-## 联系我们
+## Contact us
 
-- [阿里云OSS官方网站](http://oss.aliyun.com)
-- [阿里云OSS官方论坛](http://bbs.aliyun.com)
-- [阿里云OSS官方文档中心](http://www.aliyun.com/product/oss#Docs)
-- 阿里云官方技术支持：[提交工单](https://workorder.console.aliyun.com/#/ticket/createIndex)
+- [Alibaba Cloud OSS official website](http://oss.aliyun.com).
+- [Alibaba Cloud OSS official forum](http://bbs.aliyun.com).
+- [Alibaba Cloud OSS official documentation center](http://www.aliyun.com/product/oss#Docs).
+- Alibaba Cloud official technical support: [Submit a ticket](https://workorder.console.aliyun.com/#/ticket/createIndex).
 
 [releases-page]: https://github.com/aliyun/aliyun-oss-php-sdk/releases
 [phar-composer]: https://github.com/clue/phar-composer
+

vendor/aliyuncs/oss-sdk-php/samples/Object.php

@@ -30,6 +30,15 @@ Common::println($result['body']);
 $content = $ossClient->getObject($bucket, "b.file");
 Common::println("b.file is fetched, the content is: " . $content);
 
+// 给object添加symlink
+$content = $ossClient->putSymlink($bucket, "test-symlink", "b.file");
+Common::println("test-symlink is created");
+Common::println($result['x-oss-request-id']);
+Common::println($result['etag']);
+
+// 获取symlink
+$content = $ossClient->getSymlink($bucket, "test-symlink");
+Common::println("test-symlink refer to : " . $content[OssClient::OSS_SYMLINK_TARGET]);
 
 // 下载object到本地文件
 $options = array(
@@ -81,7 +90,8 @@ getObjectMeta($ossClient, $bucket);
 deleteObject($ossClient, $bucket);
 deleteObjects($ossClient, $bucket);
 doesObjectExist($ossClient, $bucket);
-
+getSymlink($ossClient, $bucket);
+putSymlink($ossClient, $bucket);
 /**
  * 创建虚拟目录
  *
@@ -267,6 +277,62 @@ function getObject($ossClient, $bucket)
 }
 
 /**
+ * put symlink
+ *
+ * @param OssClient $ossClient OssClient实例
+ * @param string $bucket 存储空间名称
+ * @return null
+ */
+function putSymlink($ossClient, $bucket)
+{
+    $symlink = "test-samples-symlink";
+    $object = "test-samples-object";
+    try {
+        $ossClient->putObject($bucket, $object, 'test-content');
+        $ossClient->putSymlink($bucket, $symlink, $object);
+        $content = $ossClient->getObject($bucket, $symlink);
+    } catch (OssException $e) {
+        printf(__FUNCTION__ . ": FAILED\n");
+        printf($e->getMessage() . "\n");
+        return;
+    }
+    print(__FUNCTION__ . ": OK" . "\n");
+    if ($content == 'test-content') {
+        print(__FUNCTION__ . ": putSymlink checked OK" . "\n");
+    } else {
+        print(__FUNCTION__ . ": putSymlink checked FAILED" . "\n");
+    }
+}
+
+/**
+ * 获取symlink
+ *
+ * @param OssClient $ossClient OssClient实例
+ * @param string $bucket 存储空间名称
+ * @return null
+ */
+function getSymlink($ossClient, $bucket)
+{
+    $symlink = "test-samples-symlink";
+    $object = "test-samples-object";
+    try {
+        $ossClient->putObject($bucket, $object, 'test-content');
+        $ossClient->putSymlink($bucket, $symlink, $object);
+        $content = $ossClient->getSymlink($bucket, $symlink);
+    } catch (OssException $e) {
+        printf(__FUNCTION__ . ": FAILED\n");
+        printf($e->getMessage() . "\n");
+        return;
+    }
+    print(__FUNCTION__ . ": OK" . "\n");
+    if ($content[OssClient::OSS_SYMLINK_TARGET]) {
+        print(__FUNCTION__ . ": getSymlink checked OK" . "\n");
+    } else {
+        print(__FUNCTION__ . ": getSymlink checked FAILED" . "\n");
+    }
+}
+
+/**
  * get_object_to_local_file
  *
  * 获取object

vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php

@@ -171,6 +171,19 @@ class OssUtil
     }
 
     /**
+     * 生成createBucketXmlBody接口的xml消息
+     *
+     * @param string $storageClass
+     * @return string
+     */
+    public static function createBucketXmlBody($storageClass)
+    {
+        $xml = new \SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><CreateBucketConfiguration></CreateBucketConfiguration>');
+        $xml->addChild('StorageClass',  $storageClass);
+        return $xml->asXML();
+    }
+
+    /**
      * 检验$options
      *
      * @param array $options

vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php

@@ -685,7 +685,6 @@ class RequestCore
 
         // Enable a proxy connection if requested.
         if ($this->proxy) {
-            curl_setopt($curl_handle, CURLOPT_HTTPPROXYTUNNEL, true);
 
             $host = $this->proxy['host'];
             $host .= ($this->proxy['port']) ? ':' . $this->proxy['port'] : '';

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/StorageCapacityConfig.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace OSS\Model;
+
+/**
+ * Class StorageCapacityConfig
+ *
+ * @package OSS\Model
+ * @link http://docs.alibaba-inc.com/pages/viewpage.action?pageId=271614763
+ */
+class StorageCapacityConfig implements XmlConfig
+{
+    /**
+     * StorageCapacityConfig constructor.
+     *
+     * @param int $storageCapacity            
+     */
+    public function __construct($storageCapacity)
+    {
+        $this->storageCapacity = $storageCapacity;
+    }
+
+    /**
+     * Not implemented
+     */
+    public function parseFromXml($strXml)
+    {
+        throw new OssException("Not implemented.");
+    }
+
+    /**
+     * 把StorageCapacityConfig序列化成xml
+     *
+     * @return string
+     */
+    public function serializeToXml()
+    {
+        $xml = new \SimpleXMLElement('<?xml version="1.0" encoding="utf-8"?><BucketUserQos></BucketUserQos>');
+        $xml->addChild('StorageCapacity', strval($this->storageCapacity));
+        return $xml->asXML();
+    }
+
+    /**
+     * To string
+     *
+     * @return string
+     */
+    function __toString()
+    {
+        return $this->serializeToXml();
+    }
+
+    /**
+     * Set storage capacity
+     *
+     * @param int $storageCapacity            
+     */
+    public function setStorageCapacity($storageCapacity)
+    {
+        $this->storageCapacity = $storageCapacity;
+    }
+
+    /**
+     * Get storage capacity
+     * 
+     * @return int
+     */
+    public function getStorageCapacity()
+    {
+        return $this->storageCapacity;
+    }
+
+    private $storageCapacity = 0;
+}

vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php

@@ -12,6 +12,7 @@ use OSS\Model\LoggingConfig;
 use OSS\Model\LiveChannelConfig;
 use OSS\Model\LiveChannelInfo;
 use OSS\Model\LiveChannelListInfo;
+use OSS\Model\StorageCapacityConfig;
 use OSS\Result\AclResult;
 use OSS\Result\BodyResult;
 use OSS\Result\GetCorsResult;
@@ -20,6 +21,7 @@ use OSS\Result\GetLoggingResult;
 use OSS\Result\GetRefererResult;
 use OSS\Result\GetWebsiteResult;
 use OSS\Result\GetCnameResult;
+use OSS\Result\GetLocationResult;
 use OSS\Result\HeaderResult;
 use OSS\Result\InitiateMultipartUploadResult;
 use OSS\Result\ListBucketsResult;
@@ -37,6 +39,7 @@ use OSS\Result\GetLiveChannelHistoryResult;
 use OSS\Result\GetLiveChannelInfoResult;
 use OSS\Result\GetLiveChannelStatusResult;
 use OSS\Result\ListLiveChannelResult;
+use OSS\Result\GetStorageCapacityResult;
 use OSS\Result\AppendResult;
 use OSS\Model\ObjectListInfo;
 use OSS\Result\UploadPartResult;
@@ -46,6 +49,7 @@ use OSS\Model\RefererConfig;
 use OSS\Model\WebsiteConfig;
 use OSS\Core\OssUtil;
 use OSS\Model\ListPartsInfo;
+use OSS\Result\SymlinkResult;
 
 /**
  * Class OssClient
@@ -73,9 +77,10 @@ class OssClient
      * @param string $endpoint 您选定的OSS数据中心访问域名，例如oss-cn-hangzhou.aliyuncs.com
      * @param boolean $isCName 是否对Bucket做了域名绑定，并且Endpoint参数填写的是自己的域名
      * @param string $securityToken
+     * @param string $requestProxy 添加代理支持
      * @throws OssException
      */
-    public function __construct($accessKeyId, $accessKeySecret, $endpoint, $isCName = false, $securityToken = NULL)
+    public function __construct($accessKeyId, $accessKeySecret, $endpoint, $isCName = false, $securityToken = NULL, $requestProxy = NULL)
     {
         $accessKeyId = trim($accessKeyId);
         $accessKeySecret = trim($accessKeySecret);
@@ -94,6 +99,8 @@ class OssClient
         $this->accessKeyId = $accessKeyId;
         $this->accessKeySecret = $accessKeySecret;
         $this->securityToken = $securityToken;
+        $this->requestProxy = $requestProxy;
+
         self::checkEnv();
     }
 
@@ -124,6 +131,7 @@ class OssClient
      * @param string $bucket
      * @param string $acl
      * @param array $options
+     * @param string $storageType
      * @return null
      */
     public function createBucket($bucket, $acl = self::OSS_ACL_TYPE_PRIVATE, $options = NULL)
@@ -133,6 +141,11 @@ class OssClient
         $options[self::OSS_METHOD] = self::OSS_HTTP_PUT;
         $options[self::OSS_OBJECT] = '/';
         $options[self::OSS_HEADERS] = array(self::OSS_ACL => $acl);
+        if (isset($options[self::OSS_STORAGE])) {
+            $this->precheckStorage($options[self::OSS_STORAGE]);
+            $options[self::OSS_CONTENT] = OssUtil::createBucketXmlBody($options[self::OSS_STORAGE]);
+            unset($options[self::OSS_STORAGE]);
+        }
         $response = $this->auth($options);
         $result = new PutSetDeleteResult($response);
         return $result->getData();
@@ -176,6 +189,44 @@ class OssClient
         $result = new ExistResult($response);
         return $result->getData();
     }
+    
+    /**
+     * 获取bucket所属的数据中心位置信息
+     *
+     * @param string $bucket
+     * @param array $options
+     * @throws OssException
+     * @return string
+     */
+    public function getBucketLocation($bucket, $options = NULL)
+    {
+        $this->precheckCommon($bucket, NULL, $options, false);
+        $options[self::OSS_BUCKET] = $bucket;
+        $options[self::OSS_METHOD] = self::OSS_HTTP_GET;
+        $options[self::OSS_OBJECT] = '/';
+        $options[self::OSS_SUB_RESOURCE] = 'location';
+        $response = $this->auth($options);
+        $result = new GetLocationResult($response);
+        return $result->getData();
+    }
+    
+    /**
+     * 获取Bucket的Meta信息
+     *
+     * @param string $bucket
+     * @param array $options 具体参考SDK文档
+     * @return array
+     */
+    public function getBucketMeta($bucket, $options = NULL)
+    {
+    	$this->precheckCommon($bucket, NULL, $options, false);
+    	$options[self::OSS_BUCKET] = $bucket;
+    	$options[self::OSS_METHOD] = self::OSS_HTTP_HEAD;
+    	$options[self::OSS_OBJECT] = '/';
+    	$response = $this->auth($options);
+    	$result = new HeaderResult($response);
+    	return $result->getData();
+    }
 
     /**
      * 获取bucket的ACL配置情况
@@ -900,6 +951,51 @@ class OssClient
         $result = new GetRefererResult($response);
         return $result->getData();
     }
+    
+    /**
+     * 设置bucket的容量大小，单位GB
+     * 当bucket的容量大于设置的容量时，禁止继续写入
+     *
+     * @param string $bucket bucket名称
+     * @param int $storageCapacity
+     * @param array $options
+     * @return ResponseCore
+     * @throws null
+     */
+    public function putBucketStorageCapacity($bucket, $storageCapacity, $options = NULL)
+    {
+        $this->precheckCommon($bucket, NULL, $options, false);
+        $options[self::OSS_BUCKET] = $bucket;
+        $options[self::OSS_METHOD] = self::OSS_HTTP_PUT;
+        $options[self::OSS_OBJECT] = '/';
+        $options[self::OSS_SUB_RESOURCE] = 'qos';
+        $options[self::OSS_CONTENT_TYPE] = 'application/xml';
+        $storageCapacityConfig = new StorageCapacityConfig($storageCapacity);
+        $options[self::OSS_CONTENT] = $storageCapacityConfig->serializeToXml();
+        $response = $this->auth($options);
+        $result = new PutSetDeleteResult($response);
+        return $result->getData();
+    }
+    
+    /**
+     * 获取bucket的容量大小，单位GB
+     *
+     * @param string $bucket bucket名称
+     * @param array $options
+     * @throws OssException
+     * @return int
+     */
+    public function getBucketStorageCapacity($bucket, $options = NULL)
+    {
+        $this->precheckCommon($bucket, NULL, $options, false);
+        $options[self::OSS_BUCKET] = $bucket;
+        $options[self::OSS_METHOD] = self::OSS_HTTP_GET;
+        $options[self::OSS_OBJECT] = '/';
+        $options[self::OSS_SUB_RESOURCE] = 'qos';
+        $response = $this->auth($options);
+        $result = new GetStorageCapacityResult($response);
+        return $result->getData();
+    }
 
     /**
      * 获取bucket下的object列表
@@ -975,7 +1071,6 @@ class OssClient
     {
         $this->precheckCommon($bucket, $object, $options);
 
-        OssUtil::validateContent($content);
         $options[self::OSS_CONTENT] = $content;
         $options[self::OSS_BUCKET] = $bucket;
         $options[self::OSS_METHOD] = self::OSS_HTTP_PUT;
@@ -1008,6 +1103,49 @@ class OssClient
     }
 
     /**
+     * 创建symlink
+     * @param string $bucket bucket名称
+     * @param string $symlink symlink名称
+     * @param string $targetObject 目标object名称
+     * @param array $options
+     * @return null
+     */
+    public function putSymlink($bucket, $symlink ,$targetObject, $options = NULL)
+    {
+        $this->precheckCommon($bucket, $symlink, $options);
+
+        $options[self::OSS_BUCKET] = $bucket;
+        $options[self::OSS_METHOD] = self::OSS_HTTP_PUT;
+        $options[self::OSS_OBJECT] = $symlink;
+        $options[self::OSS_SUB_RESOURCE] = self::OSS_SYMLINK;
+        $options[self::OSS_HEADERS][self::OSS_SYMLINK_TARGET] = rawurlencode($targetObject);
+
+        $response = $this->auth($options);
+        $result = new PutSetDeleteResult($response);
+        return $result->getData();
+    }
+
+    /**
+     * 获取symlink
+     *@param string $bucket bucket名称
+     * @param string $symlink symlink名称
+     * @return null
+     */
+    public function getSymlink($bucket, $symlink)
+    {
+        $this->precheckCommon($bucket, $symlink, $options);
+
+        $options[self::OSS_BUCKET] = $bucket;
+        $options[self::OSS_METHOD] = self::OSS_HTTP_GET;
+        $options[self::OSS_OBJECT] = $symlink;
+        $options[self::OSS_SUB_RESOURCE] = self::OSS_SYMLINK;
+
+        $response = $this->auth($options);
+        $result = new SymlinkResult($response);
+        return $result->getData();
+    }
+
+    /**
      * 上传本地文件
      *
      * @param string $bucket bucket名称
@@ -1058,7 +1196,6 @@ class OssClient
     {
         $this->precheckCommon($bucket, $object, $options);
 
-        OssUtil::validateContent($content);
         $options[self::OSS_CONTENT] = $content;
         $options[self::OSS_BUCKET] = $bucket;
         $options[self::OSS_METHOD] = self::OSS_HTTP_POST;
@@ -1282,6 +1419,27 @@ class OssClient
     }
 
     /**
+     * 针对Archive类型的Object读取
+     * 需要使用Restore操作让服务端执行解冻任务
+     *
+     * @param string $bucket bucket名称
+     * @param string $object object名称
+     * @return null
+     * @throws OssException
+     */
+    public function restoreObject($bucket, $object, $options = NULL)
+    {
+        $this->precheckCommon($bucket, $object, $options);
+        $options[self::OSS_BUCKET] = $bucket;
+        $options[self::OSS_METHOD] = self::OSS_HTTP_POST;
+        $options[self::OSS_OBJECT] = $object;
+        $options[self::OSS_SUB_RESOURCE] = self::OSS_RESTORE;
+        $response = $this->auth($options);
+        $result = new PutSetDeleteResult($response);
+        return $result->getData();
+    }
+
+    /**
      * 获取分片大小，根据用户提供的part_size，重新计算一个更合理的partsize
      *
      * @param int $partSize
@@ -1751,6 +1909,29 @@ class OssClient
     }
 
     /**
+     * 校验option restore
+     *
+     * @param string $restore
+     * @throws OssException
+     */
+    private function precheckStorage($storage)
+    {
+        if (is_string($storage)) {
+            switch ($storage) {
+                    case self::OSS_STORAGE_ARCHIVE:
+                        return;
+                    case self::OSS_STORAGE_IA:
+                        return;
+                    case self::OSS_STORAGE_STANDARD:
+                        return;
+                    default:
+                        break;
+            }
+        }
+        throw new OssException('storage name is invalid');
+    }
+
+    /**
      * 校验bucket,options参数
      *
      * @param string $bucket
@@ -1893,7 +2074,7 @@ class OssClient
         $this->requestUrl = $scheme . $hostname . $resource_uri . $signable_query_string . $non_signable_resource;
 
         //创建请求
-        $request = new RequestCore($this->requestUrl);
+        $request = new RequestCore($this->requestUrl, $this->requestProxy);
         $request->set_useragent($this->generateUserAgent());
         // Streaming uploads
         if (isset($options[self::OSS_FILE_UPLOAD])) {
@@ -2216,7 +2397,9 @@ class OssClient
             self::OSS_LIVE_CHANNEL_START_TIME,
             self::OSS_LIVE_CHANNEL_END_TIME,
             self::OSS_PROCESS,
-            self::OSS_POSITION
+            self::OSS_POSITION,
+            self::OSS_SYMLINK,
+            self::OSS_RESTORE,
         );
 
         foreach ($signableList as $item) {
@@ -2476,6 +2659,16 @@ class OssClient
     const OSS_DEFAULT_PREFIX = 'x-oss-';
     const OSS_CHECK_MD5 = 'checkmd5';
     const DEFAULT_CONTENT_TYPE = 'application/octet-stream';
+    const OSS_SYMLINK_TARGET = 'x-oss-symlink-target';
+    const OSS_SYMLINK = 'symlink';
+    const OSS_HTTP_CODE = 'http_code';
+    const OSS_REQUEST_ID = 'x-oss-request-id';
+    const OSS_INFO = 'info';
+    const OSS_STORAGE = 'storage';
+    const OSS_RESTORE = 'restore';
+    const OSS_STORAGE_STANDARD = 'Standard';
+    const OSS_STORAGE_IA = 'IA';
+    const OSS_STORAGE_ARCHIVE = 'Archive';
 
     //私有URL变量
     const OSS_URL_ACCESS_KEY_ID = 'OSSAccessKeyId';
@@ -2520,8 +2713,8 @@ class OssClient
     );
     // OssClient版本信息
     const OSS_NAME = "aliyun-sdk-php";
-    const OSS_VERSION = "2.2.4";
-    const OSS_BUILD = "20170425";
+    const OSS_VERSION = "2.3.0";
+    const OSS_BUILD = "20180105";
     const OSS_AUTHOR = "";
     const OSS_OPTIONS_ORIGIN = 'Origin';
     const OSS_OPTIONS_REQUEST_METHOD = 'Access-Control-Request-Method';
@@ -2539,6 +2732,7 @@ class OssClient
     private $accessKeySecret;
     private $hostname;
     private $securityToken;
+    private $requestProxy = null;
     private $enableStsInUrl = false;
     private $timeout = 0;
     private $connectTimeout = 0;

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetLocationResult.php

@@ -0,0 +1,30 @@
+<?php
+namespace OSS\Result;
+
+use OSS\Core\OssException;
+
+/**
+ * Class GetLocationResult getBucketLocation接口返回结果类，封装了
+ * 返回的xml数据的解析
+ *
+ * @package OSS\Result
+ */
+class GetLocationResult extends Result
+{
+
+    /**
+     * Parse data from response
+     * 
+     * @return string
+     * @throws OssException
+     */
+    protected function parseDataFromResponse()
+    {
+        $content = $this->rawResponse->body;
+        if (empty($content)) {
+            throw new OssException("body is null");
+        }
+        $xml = simplexml_load_string($content);
+        return $xml;
+    }
+}

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetStorageCapacityResult.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace OSS\Result;
+
+use OSS\Core\OssException;
+
+/**
+ * Class AclResult getBucketAcl接口返回结果类，封装了
+ * 返回的xml数据的解析
+ *
+ * @package OSS\Result
+ */
+class GetStorageCapacityResult extends Result
+{
+    /**
+     * Parse data from response
+     * 
+     * @return string
+     * @throws OssException
+     */
+    protected function parseDataFromResponse()
+    {
+        $content = $this->rawResponse->body;
+        if (empty($content)) {
+            throw new OssException("body is null");
+        }
+        $xml = simplexml_load_string($content);
+        if (isset($xml->StorageCapacity)) {
+            return intval($xml->StorageCapacity);
+        } else {
+            throw new OssException("xml format exception");
+        }
+    }
+}

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/SymlinkResult.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace OSS\Result;
+
+use OSS\Core\OssException;
+use OSS\OssClient;
+
+/**
+ *
+ * @package OSS\Result
+ */
+class SymlinkResult extends Result
+{
+    /**
+     * @return string
+     * @throws OssException
+     */
+    protected function parseDataFromResponse()
+    {
+        $this->rawResponse->header[OssClient::OSS_SYMLINK_TARGET] = rawurldecode($this->rawResponse->header[OssClient::OSS_SYMLINK_TARGET]);
+        return $this->rawResponse->header;
+    }
+}
+

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php

@@ -47,7 +47,7 @@ class CallbackTest extends TestOssClientBase
         
         $json = 
         '{
-            "callbackUrl":"callback.oss-demo.com:23450",
+            "callbackUrl":"oss-demo.aliyuncs.com:23450",
             "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
             "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
             "callbackBodyType":"application/json"
@@ -139,7 +139,7 @@ class CallbackTest extends TestOssClientBase
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size}}",
                 "callbackBodyType":"application/json"
@@ -151,7 +151,7 @@ class CallbackTest extends TestOssClientBase
        {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}",
                 "callbackBodyType":"application/x-www-form-urlencoded"
@@ -163,7 +163,7 @@ class CallbackTest extends TestOssClientBase
        {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}"
             }';
@@ -174,7 +174,7 @@ class CallbackTest extends TestOssClientBase
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\" 春水碧于天，画船听雨眠。\":\"垆边人似月，皓腕凝霜雪。\"}",
                 "callbackBodyType":"application/json"
@@ -186,7 +186,7 @@ class CallbackTest extends TestOssClientBase
         {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"春水碧于天，画船听雨眠。垆边人似月，皓腕凝霜雪",
                 "callbackBodyType":"application/x-www-form-urlencoded"
@@ -198,7 +198,7 @@ class CallbackTest extends TestOssClientBase
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
                 "callbackBodyType":"application/json"
@@ -218,7 +218,7 @@ class CallbackTest extends TestOssClientBase
         {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}&my_var1=${x:var1}&my_var2=${x:var2}",
                 "callbackBodyType":"application/x-www-form-urlencoded"

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketStorageCapacityTest.php

@@ -0,0 +1,56 @@
+<?php
+namespace OSS\Tests;
+
+use OSS\Core\OssException;
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestOssClientBase.php';
+
+class OssClientBucketStorageCapacityTest extends TestOssClientBase
+{
+    public function testBucket()
+    {
+        try {
+            $storageCapacity = $this->ossClient->getBucketStorageCapacity($this->bucket);
+            $this->assertEquals($storageCapacity, -1);
+        } catch (OssException $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            $this->ossClient->putBucketStorageCapacity($this->bucket, 1000);
+        } catch (OssException $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            Common::waitMetaSync();
+            $storageCapacity = $this->ossClient->getBucketStorageCapacity($this->bucket);
+            $this->assertEquals($storageCapacity, 1000);
+        } catch (OssException $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            $this->ossClient->putBucketStorageCapacity($this->bucket, 0);
+
+            Common::waitMetaSync();
+
+            $storageCapacity = $this->ossClient->getBucketStorageCapacity($this->bucket);
+            $this->assertEquals($storageCapacity, 0);
+
+            $this->ossClient->putObject($this->bucket, 'test-storage-capacity','test-content');
+            $this->assertTrue(false);
+        } catch (OssException $e) {
+            $this->assertEquals('Bucket storage exceed max storage capacity.',$e->getErrorMessage());
+        }
+
+        try {
+            $this->ossClient->putBucketStorageCapacity($this->bucket, -2);
+            $this->assertTrue(false);
+        } catch (OssException $e) {
+            $this->assertEquals(400, $e->getHTTPStatus());
+            $this->assertEquals('InvalidArgument', $e->getErrorCode());
+        }
+    }
+
+}

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientBucketTest.php

@@ -10,6 +10,9 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestOssClientBase.php';
 
 class OssClientBucketTest extends TestOssClientBase
 {
+    private $iaBucket;
+    private $archiveBucket;
+
     public function testBucketWithInvalidName()
     {
         try {
@@ -36,14 +39,75 @@ class OssClientBucketTest extends TestOssClientBase
 
         $bucketListInfo = $this->ossClient->listBuckets();
         $this->assertNotNull($bucketListInfo);
+        
         $bucketList = $bucketListInfo->getBucketList();
         $this->assertTrue(is_array($bucketList));
         $this->assertGreaterThan(0, count($bucketList));
+        
         $this->ossClient->putBucketAcl($this->bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
         Common::waitMetaSync();
         $this->assertEquals($this->ossClient->getBucketAcl($this->bucket), OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
 
         $this->assertTrue($this->ossClient->doesBucketExist($this->bucket));
         $this->assertFalse($this->ossClient->doesBucketExist($this->bucket . '-notexist'));
+        
+        $this->assertEquals($this->ossClient->getBucketLocation($this->bucket), 'oss-us-west-1');
+        
+        $res = $this->ossClient->getBucketMeta($this->bucket);
+        $this->assertEquals('200', $res['info']['http_code']);
+        $this->assertEquals('oss-us-west-1', $res['x-oss-bucket-region']);
+    }
+
+    public function  testCreateBucketWithStorageType()
+    {
+        $object = 'storage-object';
+
+        $this->ossClient->putObject($this->archiveBucket, $object,'testcontent');
+        try {
+            $this->ossClient->getObject($this->archiveBucket, $object);
+            $this->assertTrue(false);
+        } catch (OssException $e) {
+            $this->assertEquals('403', $e->getHTTPStatus());
+            $this->assertEquals('InvalidObjectState', $e->getErrorCode());
+        }
+
+        $this->ossClient->putObject($this->iaBucket, $object,'testcontent');
+        $result = $this->ossClient->getObject($this->iaBucket, $object);
+        $this->assertEquals($result, 'testcontent');
+
+        $this->ossClient->putObject($this->bucket, $object,'testcontent');
+        $result = $this->ossClient->getObject($this->bucket, $object);
+        $this->assertEquals($result, 'testcontent');
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->iaBucket = 'ia-' . $this->bucket;
+        $this->archiveBucket = 'archive-' . $this->bucket;
+        $options = array(
+            OssClient::OSS_STORAGE => OssClient::OSS_STORAGE_IA
+        );
+
+        $this->ossClient->createBucket($this->iaBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options);
+
+        $options = array(
+            OssClient::OSS_STORAGE => OssClient::OSS_STORAGE_ARCHIVE
+        );
+
+        $this->ossClient->createBucket($this->archiveBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options);
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        $object = 'storage-object';
+
+        $this->ossClient->deleteObject($this->iaBucket, $object);
+        $this->ossClient->deleteObject($this->archiveBucket, $object);
+        $this->ossClient->deleteBucket($this->iaBucket);
+        $this->ossClient->deleteBucket($this->archiveBucket);
     }
 }

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientImageTest.php

@@ -38,7 +38,7 @@ class OssClinetImageTest extends \PHPUnit_Framework_TestCase
         $options = array(
             OssClient::OSS_FILE_DOWNLOAD => $this->download_file,
             OssClient::OSS_PROCESS => "image/resize,m_fixed,h_100,w_100", );
-        $this->check($options, 100, 100, 3587, 'jpg');
+        $this->check($options, 100, 100, 3267, 'jpg');
     }
     
     public function testImageCrop()
@@ -46,7 +46,7 @@ class OssClinetImageTest extends \PHPUnit_Framework_TestCase
         $options = array(
             OssClient::OSS_FILE_DOWNLOAD => $this->download_file,
             OssClient::OSS_PROCESS => "image/crop,w_100,h_100,x_100,y_100,r_1", );
-        $this->check($options, 100, 100, 2281, 'jpg');
+        $this->check($options, 100, 100, 1969, 'jpg');
     }
 
     public function testImageRotate()
@@ -54,7 +54,7 @@ class OssClinetImageTest extends \PHPUnit_Framework_TestCase
         $options = array(
             OssClient::OSS_FILE_DOWNLOAD => $this->download_file,
             OssClient::OSS_PROCESS => "image/rotate,90", );
-        $this->check($options, 267, 400, 21509, 'jpg');
+        $this->check($options, 267, 400, 20998, 'jpg');
     }
 
     public function testImageSharpen()
@@ -62,7 +62,7 @@ class OssClinetImageTest extends \PHPUnit_Framework_TestCase
         $options = array(
             OssClient::OSS_FILE_DOWNLOAD => $this->download_file,
             OssClient::OSS_PROCESS => "image/sharpen,100", );
-        $this->check($options, 400, 267, 24183, 'jpg');
+        $this->check($options, 400, 267, 23015, 'jpg');
     }
 
     public function testImageWatermark()
@@ -70,7 +70,7 @@ class OssClinetImageTest extends \PHPUnit_Framework_TestCase
         $options = array(
             OssClient::OSS_FILE_DOWNLOAD => $this->download_file,
             OssClient::OSS_PROCESS => "image/watermark,text_SGVsbG8g5Zu-54mH5pyN5YqhIQ", );
-        $this->check($options, 400, 267, 26953, 'jpg');
+        $this->check($options, 400, 267, 26369, 'jpg');
     }
 
     public function testImageFormat()
@@ -86,7 +86,7 @@ class OssClinetImageTest extends \PHPUnit_Framework_TestCase
         $options = array(
             OssClient::OSS_FILE_DOWNLOAD => $this->download_file,
             OssClient::OSS_PROCESS => "image/resize,m_fixed,w_100,h_100", );
-        $this->check($options, 100, 100, 3587, 'jpg');
+        $this->check($options, 100, 100, 3267, 'jpg');
     }
 
     private function check($options, $width, $height, $size, $type)

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientRestoreObjectTest.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace OSS\Tests;
+
+use OSS\Core\OssException;
+use OSS\OssClient;
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestOssClientBase.php';
+
+
+class OssClientRestoreObjectTest extends TestOssClientBase
+{
+    private $iaBucket;
+    private $archiveBucket;
+
+    public function testIARestoreObject()
+    {
+        $object = 'storage-object';
+
+        $this->ossClient->putObject($this->iaBucket, $object,'testcontent');
+        try{
+            $this->ossClient->restoreObject($this->iaBucket, $object);
+            $this->assertTrue(false);
+        }catch (OssException $e){
+            $this->assertEquals('400', $e->getHTTPStatus());
+            $this->assertEquals('OperationNotSupported', $e->getErrorCode());
+        }
+    }
+
+    public function testNullObjectRestoreObject()
+    {
+        $object = 'null-object';
+
+        try{
+            $this->ossClient->restoreObject($this->bucket, $object);
+            $this->assertTrue(false);
+        }catch (OssException $e){
+            $this->assertEquals('404', $e->getHTTPStatus());
+        }
+    }
+
+    public function testArchiveRestoreObject()
+    {
+        $object = 'storage-object';
+
+        $this->ossClient->putObject($this->archiveBucket, $object,'testcontent');
+        try{
+            $this->ossClient->getObject($this->archiveBucket, $object);
+            $this->assertTrue(false);
+        }catch (OssException $e){
+            $this->assertEquals('403', $e->getHTTPStatus());
+            $this->assertEquals('InvalidObjectState', $e->getErrorCode());
+        }
+        $result = $this->ossClient->restoreObject($this->archiveBucket, $object);
+        common::waitMetaSync();
+        $this->assertEquals('202', $result['info']['http_code']);
+
+        try{
+            $this->ossClient->restoreObject($this->archiveBucket, $object);
+        }catch(OssException $e){
+            $this->assertEquals('409', $e->getHTTPStatus());
+            $this->assertEquals('RestoreAlreadyInProgress', $e->getErrorCode());
+        }
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->iaBucket = 'ia-' . $this->bucket;
+        $this->archiveBucket = 'archive-' . $this->bucket;
+        $options = array(
+            OssClient::OSS_STORAGE => OssClient::OSS_STORAGE_IA
+        );
+
+        $this->ossClient->createBucket($this->iaBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options);
+
+        $options = array(
+            OssClient::OSS_STORAGE => OssClient::OSS_STORAGE_ARCHIVE
+        );
+
+        $this->ossClient->createBucket($this->archiveBucket, OssClient::OSS_ACL_TYPE_PRIVATE, $options);
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        $object = 'storage-object';
+
+        $this->ossClient->deleteObject($this->iaBucket, $object);
+        $this->ossClient->deleteObject($this->archiveBucket, $object);
+        $this->ossClient->deleteBucket($this->iaBucket);
+        $this->ossClient->deleteBucket($this->archiveBucket);
+    }
+}

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssClientTest.php

@@ -5,6 +5,7 @@ namespace OSS\Tests;
 use OSS\Core\OssException;
 use OSS\OssClient;
 
+
 class OssClientTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstrunct()
@@ -98,14 +99,118 @@ class OssClientTest extends \PHPUnit_Framework_TestCase
     public function testConstrunct9()
     {
         try {
-	    $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
-	    $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
-	    $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
-            $ossClient = new OssClient($accessKeyId, $accessKeySecret , $endpoint, false);
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false);
             $ossClient->listBuckets();
         } catch (OssException $e) {
             $this->assertFalse(true);
         }
     }
 
+    public function testSupportPutEmptyObject()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret , $endpoint, false);
+            $ossClient->putObject($bucket,'test_emptybody','');
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
+    public function testCreateObjectDir()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $object='test-dir';
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false);
+            $ossClient->createObjectDir($bucket,$object);
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
+    public function testGetBucketCors()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false);
+            $ossClient->getBucketCors($bucket);
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
+    public function testGetBucketCname()
+    {
+        try {
+            $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+            $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+            $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+            $bucket = getenv('OSS_BUCKET');
+            $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false);
+            $ossClient->getBucketCname($bucket);
+        } catch (OssException $e) {
+            $this->assertFalse(true);
+        }
+    }
+
+    public function testProxySupport()
+    {
+        $accessKeyId = ' ' . getenv('OSS_ACCESS_KEY_ID') . ' ';
+        $accessKeySecret = ' ' . getenv('OSS_ACCESS_KEY_SECRET') . ' ';
+        $endpoint = ' ' . getenv('OSS_ENDPOINT') . '/ ';
+        $bucket = getenv('OSS_BUCKET') . '-proxy';
+        $requestProxy  = getenv('OSS_PROXY');
+        $key = 'test-proxy-srv-object';
+        $content = 'test-content';
+        $proxys = parse_url($requestProxy);
+
+        $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint, false, null, $requestProxy);
+
+        $result = $ossClient->createBucket($bucket);
+        $this->checkProxy($result, $proxys);
+
+        $result = $ossClient->putObject($bucket, $key, $content);
+        $this->checkProxy($result, $proxys);
+        $result = $ossClient->getObject($bucket, $key);
+        $this->assertEquals($content, $result);
+
+        // list object
+        $objectListInfo = $ossClient->listObjects($bucket);
+        $objectList = $objectListInfo->getObjectList();
+        $this->assertNotNull($objectList);
+        $this->assertTrue(is_array($objectList));
+        $objects = array();
+        foreach ($objectList as $value) {
+            $objects[] = $value->getKey();
+        }
+        $this->assertEquals(1, count($objects));
+        $this->assertTrue(in_array($key, $objects));
+
+        $result = $ossClient->deleteObject($bucket, $key);
+        $this->checkProxy($result,$proxys);
+
+        $result = $ossClient->deleteBucket($bucket);
+        $this->checkProxy($result, $proxys);
+    }
+
+    private function checkProxy($result, $proxys)
+    {
+        $this->assertEquals($result['info']['primary_ip'], $proxys['host']);
+        $this->assertEquals($result['info']['primary_port'], $proxys['port']);
+        $this->assertTrue(array_key_exists('via', $result));
+    }
+
 }

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/OssUtilTest.php

@@ -5,6 +5,7 @@ namespace OSS\Tests;
 
 use OSS\Core\OssException;
 use OSS\Core\OssUtil;
+use OSS\OssClient;
 
 class OssUtilTest extends \PHPUnit_Framework_TestCase
 {
@@ -106,6 +107,15 @@ BBBB;
         $this->assertEquals($this->cleanXml(OssUtil::createCompleteMultipartUploadXmlBody($a)), $xml);
     }
 
+    public function testCreateBucketXmlBody()
+    {
+        $xml = <<<BBBB
+<?xml version="1.0" encoding="UTF-8"?><CreateBucketConfiguration><StorageClass>Standard</StorageClass></CreateBucketConfiguration>
+BBBB;
+        $storageClass ="Standard";
+        $this->assertEquals($this->cleanXml(OssUtil::createBucketXmlBody($storageClass)), $xml);
+    }
+
     public function testValidateBucket()
     {
         $this->assertTrue(OssUtil::validateBucket("xxx"));
@@ -211,4 +221,5 @@ BBBB;
     {
         return str_replace("\n", "", str_replace("\r", "", $xml));
     }
+
 }

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/StorageCapacityTest.php

@@ -0,0 +1,59 @@
+<?php
+namespace OSS\Tests;
+
+use OSS\Http\ResponseCore;
+use OSS\Model\StorageCapacityConfig;
+use OSS\Result\GetStorageCapacityResult;
+use OSS\Core\OssException;
+
+class StorageCapacityTest extends \PHPUnit_Framework_TestCase
+{
+
+    private $inValidXml = <<<BBBB
+<?xml version="1.0" encoding="UTF-8"?>
+<BucketUserQos>
+   <OssStorageCapacity>1</OssStorageCapacity>
+</BucketUserQos>
+BBBB;
+
+    private $validXml = <<<BBBB
+<?xml version="1.0" encoding="UTF-8"?>
+<BucketUserQos>
+   <StorageCapacity>1</StorageCapacity>
+</BucketUserQos>
+BBBB;
+
+    public function testParseInValidXml()
+    {
+        $response = new ResponseCore(array(), $this->inValidXml, 300);
+        try {
+            new GetStorageCapacityResult($response);
+            $this->assertTrue(false);
+        } catch (OssException $e) {}
+    }
+
+    public function testParseEmptyXml()
+    {
+        $response = new ResponseCore(array(), "", 300);
+        try {
+            new GetStorageCapacityResult($response);
+            $this->assertTrue(false);
+        } catch (OssException $e) {}
+    }
+
+    public function testParseValidXml()
+    {
+        $response = new ResponseCore(array(), $this->validXml, 200);
+        $result = new GetStorageCapacityResult($response);
+        $this->assertEquals($result->getData(), 1);
+    }
+
+    public function testSerializeToXml()
+    {
+        $xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<BucketUserQos><StorageCapacity>1</StorageCapacity></BucketUserQos>\n";
+        
+        $storageCapacityConfig = new StorageCapacityConfig(1);
+        $content = $storageCapacityConfig->serializeToXml();
+        $this->assertEquals($content, $xml);
+    }
+}

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/SymlinkTest.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace OSS\Tests;
+
+use OSS\OssClient;
+use OSS\Result\SymlinkResult;
+use OSS\Core\OssException;
+use OSS\Http\ResponseCore;
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestOssClientBase.php';
+
+class SymlinkTest extends TestOssClientBase
+{
+    public function testPutSymlink()
+    {
+        $bucket = getenv('OSS_BUCKET');
+        $symlink = 'test-link';
+        $special_object = 'exist_object^$#!~';
+        $object = 'exist_object';
+
+        $this->ossClient ->putObject($bucket, $object, 'test_content');
+        $this->ossClient->putSymlink($bucket, $symlink, $object);
+        $result = $this->ossClient->getObject($bucket, $symlink);
+        $this->assertEquals('test_content', $result);
+
+        $this->ossClient ->putObject($bucket, $special_object, 'test_content');
+        $this->ossClient->putSymlink($bucket, $symlink, $special_object);
+        $result = $this->ossClient->getObject($bucket, $symlink);
+        $this->assertEquals('test_content', $result);
+    }
+
+    public function testGetSymlink()
+    {
+        $bucket = getenv('OSS_BUCKET');
+        $symlink = 'test-link';
+        $object = 'exist_object^$#!~';
+
+        $result = $this->ossClient->getSymlink($bucket, $symlink);
+        $this->assertEquals($result[OssClient::OSS_SYMLINK_TARGET], $object);
+        $this->assertEquals('200', $result[OssClient::OSS_INFO][OssClient::OSS_HTTP_CODE]);
+        $this->assertTrue(isset($result[OssClient::OSS_ETAG]));
+        $this->assertTrue(isset($result[OssClient::OSS_REQUEST_ID]));
+    }
+
+    public function testPutNullSymlink()
+    {
+        $bucket = getenv('OSS_BUCKET');
+        $symlink = 'null-link';
+        $object_not_exist = 'not_exist_object+$#!b不';
+        $this->ossClient->putSymlink($bucket, $symlink, $object_not_exist);
+
+        try{
+            $this->ossClient->getObject($bucket, $symlink);
+            $this->assertTrue(false);
+        }catch (OssException $e){
+            $this->assertEquals('The symlink target object does not exist', $e->getErrorMessage());
+        }
+    }
+
+    public function testGetNullSymlink()
+    {
+        $bucket = getenv('OSS_BUCKET');
+        $symlink = 'null-link-new';
+
+        try{
+            $result = $this->ossClient->getSymlink($bucket, $symlink);
+            $this->assertTrue(false);
+        }catch (OssException $e){
+            $this->assertEquals('The specified key does not exist.', $e->getErrorMessage());
+        }
+    }
+}
+
+

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInite852dc75b22dac3e2b90bb7b0bb60e3a::getLoader();
+return ComposerAutoloaderInit2a71d9dff46ddf4e8b4d8221715776c3::getLoader();

vendor/composer/autoload_classmap.php

@@ -50,6 +50,7 @@ return array(
     'OSS\\Model\\PartInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/PartInfo.php',
     'OSS\\Model\\PrefixInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/PrefixInfo.php',
     'OSS\\Model\\RefererConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/RefererConfig.php',
+    'OSS\\Model\\StorageCapacityConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/StorageCapacityConfig.php',
     'OSS\\Model\\UploadInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/UploadInfo.php',
     'OSS\\Model\\WebsiteConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/WebsiteConfig.php',
     'OSS\\Model\\XmlConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/XmlConfig.php',
@@ -67,8 +68,10 @@ return array(
     'OSS\\Result\\GetLiveChannelHistoryResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelHistoryResult.php',
     'OSS\\Result\\GetLiveChannelInfoResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelInfoResult.php',
     'OSS\\Result\\GetLiveChannelStatusResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelStatusResult.php',
+    'OSS\\Result\\GetLocationResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLocationResult.php',
     'OSS\\Result\\GetLoggingResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLoggingResult.php',
     'OSS\\Result\\GetRefererResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetRefererResult.php',
+    'OSS\\Result\\GetStorageCapacityResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetStorageCapacityResult.php',
     'OSS\\Result\\GetWebsiteResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetWebsiteResult.php',
     'OSS\\Result\\HeaderResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/HeaderResult.php',
     'OSS\\Result\\InitiateMultipartUploadResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/InitiateMultipartUploadResult.php',
@@ -80,6 +83,7 @@ return array(
     'OSS\\Result\\PutLiveChannelResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutLiveChannelResult.php',
     'OSS\\Result\\PutSetDeleteResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutSetDeleteResult.php',
     'OSS\\Result\\Result' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php',
+    'OSS\\Result\\SymlinkResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/SymlinkResult.php',
     'OSS\\Result\\UploadPartResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/UploadPartResult.php',
     'Qiniu\\Auth' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Auth.php',
     'Qiniu\\Cdn\\CdnManager' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite852dc75b22dac3e2b90bb7b0bb60e3a
+class ComposerAutoloaderInit2a71d9dff46ddf4e8b4d8221715776c3
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInite852dc75b22dac3e2b90bb7b0bb60e3a
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInite852dc75b22dac3e2b90bb7b0bb60e3a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit2a71d9dff46ddf4e8b4d8221715776c3', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInite852dc75b22dac3e2b90bb7b0bb60e3a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit2a71d9dff46ddf4e8b4d8221715776c3', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit2a71d9dff46ddf4e8b4d8221715776c3::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInite852dc75b22dac3e2b90bb7b0bb60e3a
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit2a71d9dff46ddf4e8b4d8221715776c3::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiree852dc75b22dac3e2b90bb7b0bb60e3a($fileIdentifier, $file);
+            composerRequire2a71d9dff46ddf4e8b4d8221715776c3($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequiree852dc75b22dac3e2b90bb7b0bb60e3a($fileIdentifier, $file)
+function composerRequire2a71d9dff46ddf4e8b4d8221715776c3($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a
+class ComposerStaticInit2a71d9dff46ddf4e8b4d8221715776c3
 {
     public static $files = array (
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@@ -133,6 +133,7 @@ class ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a
         'OSS\\Model\\PartInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/PartInfo.php',
         'OSS\\Model\\PrefixInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/PrefixInfo.php',
         'OSS\\Model\\RefererConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/RefererConfig.php',
+        'OSS\\Model\\StorageCapacityConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/StorageCapacityConfig.php',
         'OSS\\Model\\UploadInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/UploadInfo.php',
         'OSS\\Model\\WebsiteConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/WebsiteConfig.php',
         'OSS\\Model\\XmlConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/XmlConfig.php',
@@ -150,8 +151,10 @@ class ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a
         'OSS\\Result\\GetLiveChannelHistoryResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelHistoryResult.php',
         'OSS\\Result\\GetLiveChannelInfoResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelInfoResult.php',
         'OSS\\Result\\GetLiveChannelStatusResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelStatusResult.php',
+        'OSS\\Result\\GetLocationResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLocationResult.php',
         'OSS\\Result\\GetLoggingResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLoggingResult.php',
         'OSS\\Result\\GetRefererResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetRefererResult.php',
+        'OSS\\Result\\GetStorageCapacityResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetStorageCapacityResult.php',
         'OSS\\Result\\GetWebsiteResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetWebsiteResult.php',
         'OSS\\Result\\HeaderResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/HeaderResult.php',
         'OSS\\Result\\InitiateMultipartUploadResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/InitiateMultipartUploadResult.php',
@@ -163,6 +166,7 @@ class ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a
         'OSS\\Result\\PutLiveChannelResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutLiveChannelResult.php',
         'OSS\\Result\\PutSetDeleteResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutSetDeleteResult.php',
         'OSS\\Result\\Result' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php',
+        'OSS\\Result\\SymlinkResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/SymlinkResult.php',
         'OSS\\Result\\UploadPartResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/UploadPartResult.php',
         'Qiniu\\Auth' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Auth.php',
         'Qiniu\\Cdn\\CdnManager' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php',
@@ -387,9 +391,9 @@ class ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInite852dc75b22dac3e2b90bb7b0bb60e3a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit2a71d9dff46ddf4e8b4d8221715776c3::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit2a71d9dff46ddf4e8b4d8221715776c3::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit2a71d9dff46ddf4e8b4d8221715776c3::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -49,18 +49,18 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/wechat-php-sdk.git",
-            "reference": "f1aa56a3749c6dfa6a87b454eefc9d5b8322cc6b"
+            "reference": "390beea5af5b3c330cbf460d3f118300827ace93"
         },
         "dist": {
             "type": "zip",
-            "url": "https://files.phpcomposer.com/files/zoujingli/wechat-php-sdk/f1aa56a3749c6dfa6a87b454eefc9d5b8322cc6b.zip",
-            "reference": "f1aa56a3749c6dfa6a87b454eefc9d5b8322cc6b",
+            "url": "https://files.phpcomposer.com/files/zoujingli/wechat-php-sdk/390beea5af5b3c330cbf460d3f118300827ace93.zip",
+            "reference": "390beea5af5b3c330cbf460d3f118300827ace93",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2017-12-28T10:44:09+00:00",
+        "time": "2018-01-16T07:03:09+00:00",
         "type": "project",
         "installation-source": "dist",
         "autoload": {
@@ -79,59 +79,6 @@
         ]
     },
     {
-        "name": "topthink/framework",
-        "version": "v5.0.14",
-        "version_normalized": "5.0.14.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/top-think/framework.git",
-            "reference": "3d1bdfbc19a7e7fd323be1dd53c4bacbe7bfb706"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://files.phpcomposer.com/files/top-think/framework/3d1bdfbc19a7e7fd323be1dd53c4bacbe7bfb706.zip",
-            "reference": "3d1bdfbc19a7e7fd323be1dd53c4bacbe7bfb706",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0",
-            "topthink/think-installer": "~1.0"
-        },
-        "require-dev": {
-            "johnkary/phpunit-speedtrap": "^1.0",
-            "mikey179/vfsstream": "~1.6",
-            "phpdocumentor/reflection-docblock": "^2.0",
-            "phploc/phploc": "2.*",
-            "phpunit/phpunit": "4.8.*",
-            "sebastian/phpcpd": "2.*"
-        },
-        "time": "2018-01-01T12:44:11+00:00",
-        "type": "think-framework",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "think\\": "library/think"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "Apache-2.0"
-        ],
-        "authors": [
-            {
-                "name": "liu21st",
-                "email": "liu21st@gmail.com"
-            }
-        ],
-        "description": "the new thinkphp framework",
-        "homepage": "http://thinkphp.cn/",
-        "keywords": [
-            "framework",
-            "orm",
-            "thinkphp"
-        ]
-    },
-    {
         "name": "qiniu/php-sdk",
         "version": "v7.2.2",
         "version_normalized": "7.2.2.0",
@@ -221,6 +168,59 @@
         ]
     },
     {
+        "name": "topthink/framework",
+        "version": "v5.0.15",
+        "version_normalized": "5.0.15.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/top-think/framework.git",
+            "reference": "7c1375791fe8772e33282ee8611ea465dc215fca"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://files.phpcomposer.com/files/top-think/framework/7c1375791fe8772e33282ee8611ea465dc215fca.zip",
+            "reference": "7c1375791fe8772e33282ee8611ea465dc215fca",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.4.0",
+            "topthink/think-installer": "~1.0"
+        },
+        "require-dev": {
+            "johnkary/phpunit-speedtrap": "^1.0",
+            "mikey179/vfsstream": "~1.6",
+            "phpdocumentor/reflection-docblock": "^2.0",
+            "phploc/phploc": "2.*",
+            "phpunit/phpunit": "4.8.*",
+            "sebastian/phpcpd": "2.*"
+        },
+        "time": "2018-01-31T08:40:10+00:00",
+        "type": "think-framework",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "think\\": "library/think"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "Apache-2.0"
+        ],
+        "authors": [
+            {
+                "name": "liu21st",
+                "email": "liu21st@gmail.com"
+            }
+        ],
+        "description": "the new thinkphp framework",
+        "homepage": "http://thinkphp.cn/",
+        "keywords": [
+            "framework",
+            "orm",
+            "thinkphp"
+        ]
+    },
+    {
         "name": "topthink/think-captcha",
         "version": "v1.0.7",
         "version_normalized": "1.0.7.0",
@@ -260,20 +260,20 @@
     },
     {
         "name": "topthink/think-mongo",
-        "version": "v1.8",
-        "version_normalized": "1.8.0.0",
+        "version": "v1.8.2",
+        "version_normalized": "1.8.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/top-think/think-mongo.git",
-            "reference": "f7dc55d6bb9d22142ae262f15a3d269850218335"
+            "reference": "5433e971b4892b09cbec49090c690f5d4350a981"
         },
         "dist": {
             "type": "zip",
-            "url": "https://files.phpcomposer.com/files/top-think/think-mongo/f7dc55d6bb9d22142ae262f15a3d269850218335.zip",
-            "reference": "f7dc55d6bb9d22142ae262f15a3d269850218335",
+            "url": "https://files.phpcomposer.com/files/top-think/think-mongo/5433e971b4892b09cbec49090c690f5d4350a981.zip",
+            "reference": "5433e971b4892b09cbec49090c690f5d4350a981",
             "shasum": ""
         },
-        "time": "2017-12-15T10:35:03+00:00",
+        "time": "2018-01-30T07:12:02+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -381,23 +381,23 @@
     },
     {
         "name": "symfony/options-resolver",
-        "version": "v3.4.2",
-        "version_normalized": "3.4.2.0",
+        "version": "v3.4.4",
+        "version_normalized": "3.4.4.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/options-resolver.git",
-            "reference": "4576693efc58c022c3fe9f144aa61d204c86ad2c"
+            "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://files.phpcomposer.com/files/symfony/options-resolver/4576693efc58c022c3fe9f144aa61d204c86ad2c.zip",
-            "reference": "4576693efc58c022c3fe9f144aa61d204c86ad2c",
+            "url": "https://files.phpcomposer.com/files/symfony/options-resolver/f3109a6aedd20e35c3a33190e932c2b063b7b50e.zip",
+            "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e",
             "shasum": ""
         },
         "require": {
             "php": "^5.5.9|>=7.0.8"
         },
-        "time": "2017-12-14T19:40:10+00:00",
+        "time": "2018-01-11T07:56:07+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -500,17 +500,17 @@
     },
     {
         "name": "aliyuncs/oss-sdk-php",
-        "version": "v2.2.4",
-        "version_normalized": "2.2.4.0",
+        "version": "v2.3.0",
+        "version_normalized": "2.3.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git",
-            "reference": "0b9b85b6c5c38cfc4ef3b0205a5a62d1e36acf2e"
+            "reference": "e69f57916678458642ac9d2fd341ae78a56996c8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://files.phpcomposer.com/files/aliyun/aliyun-oss-php-sdk/0b9b85b6c5c38cfc4ef3b0205a5a62d1e36acf2e.zip",
-            "reference": "0b9b85b6c5c38cfc4ef3b0205a5a62d1e36acf2e",
+            "url": "https://files.phpcomposer.com/files/aliyun/aliyun-oss-php-sdk/e69f57916678458642ac9d2fd341ae78a56996c8.zip",
+            "reference": "e69f57916678458642ac9d2fd341ae78a56996c8",
             "shasum": ""
         },
         "require": {
@@ -520,7 +520,7 @@
             "phpunit/phpunit": "~4.0",
             "satooshi/php-coveralls": "~1.0"
         },
-        "time": "2017-04-25T09:15:12+00:00",
+        "time": "2018-01-08T06:59:35+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

vendor/symfony/options-resolver/CHANGELOG.md

@@ -31,7 +31,7 @@ CHANGELOG
  * deprecated OptionsResolver::isKnown() in favor of isDefined()
  * [BC BREAK] OptionsResolver::isRequired() returns true now if a required
    option has a default value set
- * [BC BREAK] merged Options into OptionsResolver and turned Options into an 
+ * [BC BREAK] merged Options into OptionsResolver and turned Options into an
    interface
  * deprecated Options::overload() (now in OptionsResolver)
  * deprecated Options::set() (now in OptionsResolver)
@@ -42,7 +42,7 @@ CHANGELOG
    lazy option/normalizer closures now
  * [BC BREAK] removed Traversable interface from Options since using within
    lazy option/normalizer closures resulted in exceptions
- * [BC BREAK] removed Options::all() since using within lazy option/normalizer 
+ * [BC BREAK] removed Options::all() since using within lazy option/normalizer
    closures resulted in exceptions
  * [BC BREAK] OptionDefinitionException now extends LogicException instead of
    RuntimeException

vendor/symfony/options-resolver/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

vendor/symfony/options-resolver/OptionsResolver.php

@@ -883,7 +883,7 @@ class OptionsResolver implements Options
             $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array
                 $value,
                 function ($value) use ($type) {
-                    return (function_exists($isFunction = 'is_'.$type) && !$isFunction($value)) || !$value instanceof $type;
+                    return !self::isValueValidType($type, $value);
                 }
             );
 
@@ -896,7 +896,7 @@ class OptionsResolver implements Options
             return false;
         }
 
-        if ((function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type) {
+        if (self::isValueValidType($type, $value)) {
             return true;
         }
 
@@ -1073,4 +1073,9 @@ class OptionsResolver implements Options
 
         return implode(', ', $values);
     }
+
+    private static function isValueValidType($type, $value)
+    {
+        return (function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type;
+    }
 }

vendor/symfony/options-resolver/Tests/OptionsResolverTest.php

@@ -486,6 +486,15 @@ class OptionsResolverTest extends TestCase
         $this->resolver->setAllowedTypes('foo', 'string');
     }
 
+    public function testResolveTypedArray()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'string[]');
+        $options = $this->resolver->resolve(array('foo' => array('bar', 'baz')));
+
+        $this->assertSame(array('foo' => array('bar', 'baz')), $options);
+    }
+
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
      */

vendor/topthink/think-mongo/src/Builder.php

@@ -124,7 +124,7 @@ class Builder
         $result = [];
         foreach ($data as $key => $val) {
             $item = $this->parseKey($key);
-            if (is_array($val) && isset($val[0]) && 0 === strpos($val[0], '$')) {
+            if (is_array($val) && isset($val[0]) && is_string($val[0]) && 0 === strpos($val[0], '$')) {
                 $result[$val[0]][$item] = $this->parseValue($val[1], $key);
             } else {
                 $result['$set'][$item] = $this->parseValue($val, $key);
@@ -460,6 +460,7 @@ class Builder
             'aggregate'    => $options['table'],
             'allowDiskUse' => true,
             'pipeline'     => $pipeline,
+            'cursor'       => \stdClass,
         ];
 
         foreach (['explain', 'collation', 'bypassDocumentValidation', 'readConcern'] as $option) {
@@ -498,6 +499,7 @@ class Builder
             'aggregate'    => $options['table'],
             'allowDiskUse' => true,
             'pipeline'     => $pipeline,
+            'cursor'       => new \stdClass,
         ];
 
         foreach (['explain', 'collation', 'bypassDocumentValidation', 'readConcern'] as $option) {

vendor/topthink/think-mongo/src/Query.php

@@ -385,8 +385,8 @@ class Query
             $result = Cache::get($guid);
         }
         if (!$result) {
-            if (isset($this->options['field'])) {
-                unset($this->options['field']);
+            if (isset($this->options['projection'])) {
+                unset($this->options['projection']);
             }
             if ($key && '*' != $field) {
                 $field = $key . ',' . $field;
@@ -512,7 +512,7 @@ class Query
         }
         return $result;
     }
-    
+
     /**
      * 聚合查询
      * @access public
@@ -523,7 +523,7 @@ class Query
     public function aggregate($aggregate, $field)
     {
         $result = $this->cmd('aggregate', [$aggregate, $field]);
-        return isset($result[0]['result'][0]['aggregate']) ? $result[0]['result'][0]['aggregate'] : 0;
+        return isset($result[0]['aggregate']) ? $result[0]['aggregate'] : 0;
     }
 
     /**

vendor/zoujingli/wechat-php-sdk/.gitignore

@@ -0,0 +1 @@
+.idea

vendor/zoujingli/wechat-php-sdk/README.md

@@ -26,7 +26,7 @@
 
 **若对您有帮助，可以赞助并支持下作者哦，谢谢！**
 --
-![](https://git.kancloud.cn/repos/zoujingli/wechat-php-sdk/raw/master/image/%E8%B5%9E%E5%8A%A9.png?access-token=49255b63935edafaf42aec9376136528&v1)
+![](http://plugs.ctolog.com/pay.png)
 
 
 **官方接口文档链接**

vendor/zoujingli/wechat-php-sdk/Wechat/Lib/Cache.php

@@ -134,10 +134,10 @@ class Cache
      */
     static public function getFileExt($content)
     {
-        $types = [
+        $types = array(
             255216 => 'jpg', 7173 => 'gif', 6677 => 'bmp', 13780 => 'png',
             7368   => 'mp3', 4838 => 'wma', 7784 => 'mid', 6063 => 'xml',
-        ];
+        );
         $typeInfo = @unpack("C2chars", substr($content, 0, 2));
         $typeCode = intval($typeInfo['chars1'] . $typeInfo['chars2']);
         return isset($types[$typeCode]) ? $types[$typeCode] : 'mp4';

vendor/zoujingli/wechat-php-sdk/Wechat/Lib/Common.php

@@ -166,7 +166,7 @@ class Common
     public function getAccessToken($appid = '', $appsecret = '', $token = '')
     {
         if (!$appid || !$appsecret) {
-            list($appid, $appsecret) = [$this->appid, $this->appsecret];
+            list($appid, $appsecret) = array($this->appid, $this->appsecret);
         }
         if ($token) {
             return $this->access_token = $token;

vendor/zoujingli/wechat-php-sdk/Wechat/Lib/Tools.php

@@ -134,7 +134,9 @@ class Tools
      */
     static public function json_encode($array)
     {
-        return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', create_function('$matches', 'return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");'), json_encode($array));
+        return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', function ($matches) {
+            return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");
+        }, json_encode($array));
     }
 
     /**

vendor/zoujingli/wechat-php-sdk/Wechat/WechatCard.php

@@ -79,7 +79,7 @@ class WechatCard extends Common
         if (($jsapi_ticket = Tools::getCache($authname))) {
             return $jsapi_ticket;
         }
-        $result = Tools::httpGet(self::API_URL_PREFIX . self::GET_TICKET_URL . "access_token={$this->access_token}" . '&type=wx_card');
+        $result = Tools::httpGet(self::API_URL_PREFIX . self::GET_TICKET_URL . "access_token={$this->access_token}&type=wx_card");
         if ($result) {
             $json = json_decode($result, true);
             if (empty($json) || !empty($json['errcode'])) {
@@ -125,31 +125,36 @@ class WechatCard extends Common
      */
     public function createAddCardJsPackage($cardid = null, $data = array())
     {
-
-        function _sign($cardid = null, $attr = array(), $self)
-        {
-            unset($attr['outer_id']);
-            $attr['cardId'] = $cardid;
-            $attr['timestamp'] = time();
-            $attr['api_ticket'] = $self->getJsCardTicket();
-            $attr['nonce_str'] = Tools::createNoncestr();
-            $attr['signature'] = $self->getTicketSignature($attr);
-            unset($attr['api_ticket']);
-            return $attr;
-        }
-
         $cardList = array();
         if (is_array($cardid)) {
             foreach ($cardid as $id) {
-                $cardList[] = array('cardId' => $id, 'cardExt' => json_encode(_sign($id, $data, $this)));
+                $cardList[] = array('cardId' => $id, 'cardExt' => json_encode($this->_cardSign($id, $data)));
             }
         } else {
-            $cardList[] = array('cardId' => $cardid, 'cardExt' => json_encode(_sign($cardid, $data, $this)));
+            $cardList[] = array('cardId' => $cardid, 'cardExt' => json_encode($this->_cardSign($cardid, $data)));
         }
         return array('cardList' => $cardList);
     }
 
     /**
+     * 卡券数据签名
+     * @param null|string $cardid
+     * @param array $attr
+     * @return array
+     */
+    private function _cardSign($cardid = null, $attr = array())
+    {
+        unset($attr['outer_id']);
+        $attr['cardId'] = $cardid;
+        $attr['timestamp'] = time();
+        $attr['api_ticket'] = $this->getJsCardTicket();
+        $attr['nonce_str'] = Tools::createNoncestr();
+        $attr['signature'] = $this->getTicketSignature($attr);
+        unset($attr['api_ticket']);
+        return $attr;
+    }
+
+    /**
      * 获取微信卡券签名
      * @param array $arrdata 签名数组
      * @param string $method 签名方法

vendor/zoujingli/wechat-php-sdk/Wechat/WechatUser.php

@@ -84,7 +84,7 @@ class WechatUser extends Common
         if (!$this->access_token && !$this->getAccessToken()) {
             return false;
         }
-        $result = Tools::httpGet(self::API_URL_PREFIX . self::USER_GET_URL . "access_token={$this->access_token}" . '&next_openid=' . $next_openid);
+        $result = Tools::httpGet(self::API_URL_PREFIX . self::USER_GET_URL . "access_token={$this->access_token}&next_openid={$next_openid}");
         if ($result) {
             $json = json_decode($result, true);
             if (empty($json) || !empty($json['errcode'])) {