Merge branch 'master' into v1.5

awheel · Apr 27, 2017 · 8d387de · 8d387de
2 parents 57a6ed3 + 1d5333c
commit 8d387de
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG-1.md b/CHANGELOG-1.md
@@ -1,11 +1,12 @@
 # CHANGELOG for 1.X
 
-## v1.5.2
+## v1.5.4
+- Request::file() 注释调整, 返回值注释改为 UploadFile
+
+## v1.5.3
 - 修正配置获取错误
 
 ## v1.5.2
-
-### 修正
 - 修正获取请求头部信息
 - Request 添加 acceptWebP 方法判断浏览器是否支持 webp
 - 时区从配置文件读取

diff --git a/src/App.php b/src/App.php
@@ -146,6 +146,7 @@ public function run()
             $kernel = $this->make('HttpKernel');
 
             $request = Request::createFromGlobals();
+            $request::enableHttpMethodParameterOverride();
             $response = $kernel->handle($request);
 
             $response->send();

diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -2,6 +2,7 @@
 
 namespace awheel\Http;
 
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 /**
@@ -36,7 +37,7 @@ public function all()
      *
      * @param $key
      *
-     * @return mixed
+     * @return UploadedFile
      */
     public function file($key)
     {

diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -37,11 +37,12 @@ public function setContentType($contentType)
     public function setContent($content)
     {
         if (is_array($content) || $content instanceof ArrayAccess || $content instanceof JsonSerializable) {
-            $this->headers->add(['Content-Type' => 'application/json']);
+            $this->headers->add(['Content-Type' => 'application/json; charset=utf-8']);
             $content = json_encode($content, JSON_UNESCAPED_UNICODE);
         }
 
         parent::setContent($content);
+        parent::setCharset('utf-8');
 
         return $this;
     }