Clientbase
/
wellrested
mirror of https://github.com/basemaster/wellrested.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update reading $_FILES to UploadedFiles to conform to updates to PSR-7

This commit is contained in:
PJ Dietz 2015-04-30 20:45:26 -04:00
parent adf8def961
commit b76883c9e9
2 changed files with 91 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Message/ServerRequest.php
View File

@ -365,32 +365,51 @@ class ServerRequest extends Request implements ServerRequestInterface
} }
} }
protected function readUploadedFiles($files) protected function readUploadedFiles($input)
{ {
$uploadedFiles = []; $uploadedFiles = [];
foreach ($files as $name => $file) { foreach ($input as $name => $value) {
if (is_array($file["name"])) { $this->addUploadedFilesToBranch($uploadedFiles, $name, $value);
for ($index = 0, $u = count($file["name"]); $index < $u; ++$index) {
$uploadedFile = new UploadedFile(
$file["name"][$index],
$file["type"][$index],
$file["size"][$index],
$file["tmp_name"][$index],
$file["error"][$index]
);
$uploadedFiles[$name][$index] = $uploadedFile;
}
} else {
$index = 0;
$uploadedFile = new UploadedFile(
$file["name"], $file["type"], $file["size"], $file["tmp_name"], $file["error"]
);
$uploadedFiles[$name][$index] = $uploadedFile;
}
} }
$this->uploadedFiles = $uploadedFiles; $this->uploadedFiles = $uploadedFiles;
} }
protected function addUploadedFilesToBranch(&$branch, $name, $value)
{
if (isset($value["name"], $value["type"], $value["tmp_name"], $value["error"], $value["size"])) {
// This is a file. It may be a single file, or a list of files.
// Check if the "name" element is a list array.
if (is_array($value["name"]) && (array_keys($value["name"]) === range(0, count($value["name"]) - 1))) {
$list = [];
for ($index = 0, $u = count($value["name"]); $index < $u; ++$index) {
$uploadedFile = new UploadedFile(
$value["name"][$index],
$value["type"][$index],
$value["size"][$index],
$value["tmp_name"][$index],
$value["error"][$index]
);
$list[] = $uploadedFile;
}
$branch[$name] = $list;
} else {
// All expected keys are present. This is an uploaded file.
$uploadedFile = new UploadedFile(
$value["name"], $value["type"], $value["size"], $value["tmp_name"], $value["error"]
);
$branch[$name] = $uploadedFile;
}
} else {
// Add another branch
$nextBranch = [];
foreach ($value as $nextName => $nextValue) {
$this->addUploadedFilesToBranch($nextBranch, $nextName, $nextValue);
}
$branch[$name] = $nextBranch;
}
}
protected function readUri() protected function readUri()
{ {
$uri = ""; $uri = "";

81
test/tests/unit/Message/ServerRequestTest.php
View File

@ -285,10 +285,11 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase
* @covers WellRESTed\Message\ServerRequest::getServerRequest * @covers WellRESTed\Message\ServerRequest::getServerRequest
* @covers WellRESTed\Message\ServerRequest::readUploadedFiles * @covers WellRESTed\Message\ServerRequest::readUploadedFiles
* @covers WellRESTed\Message\ServerRequest::getUploadedFiles * @covers WellRESTed\Message\ServerRequest::getUploadedFiles
* @covers WellRESTed\Message\ServerRequest::addUploadedFilesToBranch
* @preserveGlobalState disabled * @preserveGlobalState disabled
* @dataProvider uploadedFileProvider * @dataProvider uploadedFileProvider
*/ */
public function testGetServerRequestProvidesUploadedFiles($file, $name, $index) public function testGetServerRequestProvidesUploadedFiles($file, $path)
{ {
$_SERVER = [ $_SERVER = [
"HTTP_HOST" => "localhost", "HTTP_HOST" => "localhost",
@ -296,46 +297,68 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase
"HTTP_CONTENT_TYPE" => "application/x-www-form-urlencoded" "HTTP_CONTENT_TYPE" => "application/x-www-form-urlencoded"
]; ];
$_FILES = [ $_FILES = [
"file" => [ "single" => [
"name" => "index.html", "name" => "single.txt",
"type" => "text/html", "type" => "text/plain",
"tmp_name" => "/tmp/php9hNlHe", "tmp_name" => "/tmp/php9hNlHe",
"error" => 0, "error" => UPLOAD_ERR_OK,
"size" => 524 "size" => 524
], ],
"fileList" => [ "nested" => [
"name" => [ "level2" => [
"data.json", "name" => "nested.json",
"" "type" => "application/json",
], "tmp_name" => "/tmp/phpadhjk",
"type" => [ "error" => UPLOAD_ERR_OK,
"application/json", "size" => 1024
"" ]
], ],
"tmp_name" => [ "nestedList" => [
"/tmp/phpUigZSO", "level2" => [
"" "name" => [
], 0 => "nestedList0.jpg",
"error" => [ 1 => "nestedList1.jpg",
0, 2 => ""
4 ],
], "type" => [
"size" => [ 0 => "image/jpeg",
1024, 1 => "image/jpeg",
0 2 => ""
],
"tmp_name" => [
0 => "/tmp/phpjpg0",
1 => "/tmp/phpjpg1",
2 => ""
],
"error" => [
0 => UPLOAD_ERR_OK,
1 => UPLOAD_ERR_OK,
2 => UPLOAD_ERR_NO_FILE
],
"size" => [
0 => 256,
1 => 4096,
2 => 0
]
] ]
] ]
]; ];
$request = ServerRequest::getServerRequest(); $request = ServerRequest::getServerRequest();
$this->assertEquals($file, $request->getUploadedFiles()[$name][$index]); $current = $request->getUploadedFiles();
foreach ($path as $item) {
$current = $current[$item];
}
$this->assertEquals($file, $current);
} }
public function uploadedFileProvider() public function uploadedFileProvider()
{ {
return [ return [
[new UploadedFile("index.html", "text/html", 524, "/tmp/php9hNlHe", 0), "file", 0], [new UploadedFile("single.txt", "text/plain", 524, "/tmp/php9hNlHe", UPLOAD_ERR_OK), ["single"]],
[new UploadedFile("data.json", "application/json", 1024, "/tmp/phpUigZSO", 0), "fileList", 0], [new UploadedFile("nested.json", "application/json", 1024, "/tmp/phpadhjk", UPLOAD_ERR_OK), ["nested", "level2"]],
[new UploadedFile("", "", 0, "", 4), "fileList", 1] [new UploadedFile("nestedList0.jpg", "image/jpeg", 256, "/tmp/phpjpg0", UPLOAD_ERR_OK), ["nestedList", "level2", 0]],
[new UploadedFile("nestedList1.jpg", "image/jpeg", 4096, "/tmp/phpjpg1", UPLOAD_ERR_OK), ["nestedList", "level2", 1]],
[new UploadedFile("", "", 0, "", UPLOAD_ERR_NO_FILE), ["nestedList", "level2", 2]]
]; ];
} }