From 644aed4e9e434d716882fd6aa69506bf84e497f1 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Tue, 30 Aug 2016 16:24:37 +0200
Subject: [PATCH 1/3] File object (taken from #41)

---
 src/File.php          | 59 +++++++++++++++++++++++++++++++++++++++++++
 src/FileInterface.php | 23 +++++++++++++++++
 tests/FileTest.php    | 20 +++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 src/File.php
 create mode 100644 src/FileInterface.php
 create mode 100644 tests/FileTest.php

diff --git a/src/File.php b/src/File.php
new file mode 100644
index 00000000..61e14cc8
--- /dev/null
+++ b/src/File.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace React\Http;
+
+use React\Stream\ReadableStreamInterface;
+
+class File implements FileInterface
+{
+    /**
+     * @var string
+     */
+    protected $filename;
+
+    /**
+     * @var string
+     */
+    protected $contentType;
+
+    /**
+     * @var ReadableStreamInterface
+     */
+    protected $stream;
+
+    /**
+     * @param string $filename
+     * @param string $contentType
+     * @param ReadableStreamInterface $stream
+     */
+    public function __construct($filename, $contentType, ReadableStreamInterface $stream)
+    {
+        $this->filename = $filename;
+        $this->contentType = $contentType;
+        $this->stream = $stream;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContentType()
+    {
+        return $this->contentType;
+    }
+
+    /**
+     * @return ReadableStreamInterface
+     */
+    public function getStream()
+    {
+        return $this->stream;
+    }
+}
diff --git a/src/FileInterface.php b/src/FileInterface.php
new file mode 100644
index 00000000..227b8feb
--- /dev/null
+++ b/src/FileInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace React\Http;
+
+use React\Stream\ReadableStreamInterface;
+
+interface FileInterface
+{
+    /**
+     * @return string
+     */
+    public function getFilename();
+
+    /**
+     * @return string
+     */
+    public function getContentType();
+
+    /**
+     * @return ReadableStreamInterface
+     */
+    public function getStream();
+}
diff --git a/tests/FileTest.php b/tests/FileTest.php
new file mode 100644
index 00000000..7b9b116b
--- /dev/null
+++ b/tests/FileTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace React\Tests\Http;
+
+use React\Http\File;
+use React\Stream\ThroughStream;
+
+class FileTest extends TestCase
+{
+    public function testGetters()
+    {
+        $filename = 'bar.txt';
+        $type = 'text/text';
+        $stream = new ThroughStream();
+        $file = new File($filename, $type, $stream);
+        $this->assertEquals($filename, $file->getFilename());
+        $this->assertEquals($type, $file->getContentType());
+        $this->assertEquals($stream, $file->getStream());
+    }
+}

From 08d38f4ddccb46233dd5b78e5c7bbad4a8aad042 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Tue, 30 Aug 2016 20:49:44 +0200
Subject: [PATCH 2/3] Make the file object and interface resemble the PSR-7
 UploadedFile(Interface)
 https://github.com/reactphp/http/pull/62#issuecomment-243472724

---
 src/{File.php => UploadedFile.php}                   |  6 +++---
 src/{FileInterface.php => UploadedFileInterface.php} |  6 +++---
 tests/{FileTest.php => UploadedFileTest.php}         | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{File.php => UploadedFile.php} (87%)
 rename src/{FileInterface.php => UploadedFileInterface.php} (67%)
 rename tests/{FileTest.php => UploadedFileTest.php} (51%)

diff --git a/src/File.php b/src/UploadedFile.php
similarity index 87%
rename from src/File.php
rename to src/UploadedFile.php
index 61e14cc8..32351fac 100644
--- a/src/File.php
+++ b/src/UploadedFile.php
@@ -4,7 +4,7 @@
 
 use React\Stream\ReadableStreamInterface;
 
-class File implements FileInterface
+class UploadedFile implements UploadedFileInterface
 {
     /**
      * @var string
@@ -36,7 +36,7 @@ public function __construct($filename, $contentType, ReadableStreamInterface $st
     /**
      * @return string
      */
-    public function getFilename()
+    public function getClientFilename()
     {
         return $this->filename;
     }
@@ -44,7 +44,7 @@ public function getFilename()
     /**
      * @return string
      */
-    public function getContentType()
+    public function getClientMediaType()
     {
         return $this->contentType;
     }
diff --git a/src/FileInterface.php b/src/UploadedFileInterface.php
similarity index 67%
rename from src/FileInterface.php
rename to src/UploadedFileInterface.php
index 227b8feb..4576eb1c 100644
--- a/src/FileInterface.php
+++ b/src/UploadedFileInterface.php
@@ -4,17 +4,17 @@
 
 use React\Stream\ReadableStreamInterface;
 
-interface FileInterface
+interface UploadedFileInterface
 {
     /**
      * @return string
      */
-    public function getFilename();
+    public function getClientFilename();
 
     /**
      * @return string
      */
-    public function getContentType();
+    public function getClientMediaType();
 
     /**
      * @return ReadableStreamInterface
diff --git a/tests/FileTest.php b/tests/UploadedFileTest.php
similarity index 51%
rename from tests/FileTest.php
rename to tests/UploadedFileTest.php
index 7b9b116b..b3aa97df 100644
--- a/tests/FileTest.php
+++ b/tests/UploadedFileTest.php
@@ -2,19 +2,19 @@
 
 namespace React\Tests\Http;
 
-use React\Http\File;
+use React\Http\UploadedFile;
 use React\Stream\ThroughStream;
 
-class FileTest extends TestCase
+class UploadedFileTest extends TestCase
 {
     public function testGetters()
     {
         $filename = 'bar.txt';
         $type = 'text/text';
         $stream = new ThroughStream();
-        $file = new File($filename, $type, $stream);
-        $this->assertEquals($filename, $file->getFilename());
-        $this->assertEquals($type, $file->getContentType());
+        $file = new UploadedFile($filename, $type, $stream);
+        $this->assertEquals($filename, $file->getClientFilename());
+        $this->assertEquals($type, $file->getClientMediaType());
         $this->assertEquals($stream, $file->getStream());
     }
 }

From 751a67e701ff35787b0a7621b311056a7dee2b31 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Wed, 14 Sep 2016 09:17:59 +0200
Subject: [PATCH 3/3] Marked UploadedFile as internal

---
 src/UploadedFile.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/UploadedFile.php b/src/UploadedFile.php
index 32351fac..9e26267d 100644
--- a/src/UploadedFile.php
+++ b/src/UploadedFile.php
@@ -4,6 +4,9 @@
 
 use React\Stream\ReadableStreamInterface;
 
+/**
+ * @internal
+ */
 class UploadedFile implements UploadedFileInterface
 {
     /**