Merge pull request #444 from sunnyos/master

add uploadfile getFile method

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 > 日期时间都是大概的时间点
 
+## 2019.06.24
+
+- 添加文件上传获取文件信息 getFile (@sunny)
+
 ## 2019.04.29
 
 - ws server 模块路由支持变量(@inhere)

composer.json

@@ -150,12 +150,6 @@
     "branch-alias": {
     }
   },
-  "repositories": {
-    "packagist": {
-      "type": "composer",
-      "url": "https://packagist.laravel-china.org"
-    }
-  },
   "scripts": {
     "component": "php run.php -c phpunit.xml",
     "aop": "php run.php -c src/aop/phpunit.xml",

src/http-message/src/Upload/UploadedFile.php

@@ -44,6 +44,11 @@ class UploadedFile implements UploadedFileInterface
      */
     private $moved;
 
+    /**
+     * @var string
+     */
+    private $path;
+
     /**
      * @param string $tmpFile
      * @param int $size
@@ -206,6 +211,19 @@ private function setFile(string $tmpFile): self
         return $this;
     }
 
+    /**
+     * @return array
+     */
+    public function getFile()
+    {
+        return [
+            'size' => $this->getSize(),
+            'type' => $this->getClientMediaType(),
+            'file' => $this->getPath(),
+            'fileName' => $this->getClientFilename()
+        ];
+    }
+
     /**
      * @return bool
      */
@@ -261,6 +279,23 @@ private function isStringNotEmpty($param): bool
         return is_string($param) && false === empty($param);
     }
 
+    /**
+     * @return string
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * @param string $path
+     */
+    public function setPath(string $path): void
+    {
+        $this->path = $path;
+    }
+
+
     /**
      * check file upload
      */
@@ -286,5 +321,6 @@ public function validateSavePath($targetPath)
                 throw new \RuntimeException("Cannot create directory");
             }
         }
+        $this->setPath($targetPath);
     }
 }