better multipart/form-data fix

tipsyphp · May 24, 2016 · 3dac011 · 3dac011
1 parent 00855dc
commit 3dac011
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Request.php b/src/Request.php
@@ -31,10 +31,10 @@ public function __construct($args = []) {
 				case 'POST':
 					if ($this->_contentType() === 'application/json') {
 						$this->_properties = json_decode($this->content(), 'array');
-						// } elseif ($_SERVER['CONTENT_TYPE'] === 'application/x-www-form-urlencoded') {
+					} elseif ($this->_contentType() === 'multipart/form-data') {
+						$this->_properties = $_REQUEST;
 					} else  {
 						$this->_properties = $_POST;
-						$this->_properties = $_REQUEST;
 					}
 					break;
 

diff --git a/tests/RestTest.php b/tests/RestTest.php
@@ -11,6 +11,28 @@ public function setUp() {
 		$this->setupDb($this->tip);
 	}
 
+	public function testMultipartFormPost() {
+		$_REQUEST['__url'] = 'test';
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_SERVER['CONTENT_TYPE'] = 'multipart/form-data; separater blah blah';
+		$_REQUEST['data'] = 'blah';
+
+		$this->tip->service('TestModel', []);
+
+		$this->tip->router()
+			->post('test',function($TestModel, $Request) {
+				$TestModel->test = 'hi';
+				$TestModel->data = $Request->data;
+				echo $TestModel->json();
+			});
+
+		$this->ob();
+		$this->tip->run();
+		$check = $this->ob(false);
+		$this->assertEquals(json_encode(['test' => 'hi', 'data' => 'blah']), $check);
+	}
+
+
 	public function testFormPost() {
 		$_REQUEST['__url'] = 'test';
 		$_SERVER['REQUEST_METHOD'] = 'POST';