Skip to content

Added support for multipart stream created from uri streams #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 14, 2017
Merged

Added support for multipart stream created from uri streams #27

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dffb33
Added support for multipart uri streams by ensuring content from non-…
Mats Jan 16, 2017
edb3165
Reverted to Diactoros dependency.
Mats Jan 16, 2017
ec9a031
refactoring: improved naming in line with other tests.
Mats Jan 16, 2017
b303f78
when building the stream changed from toString via string casting to …
Mats Feb 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/MultipartStreamBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,14 @@ public function build()
$this->getHeaders($data['headers'])."\r\n";

// Convert the stream to string
$streams .= (string) $data['contents'];
/* @var $contentStream StreamInterface */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good

$contentStream = $data['contents'];
if ($contentStream->isSeekable()) {
$streams .= (string) $data['contents'];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even though the output it the same. I think I would like to change this line to:

$streams .= $contentStream->_toString();

It will increase readability.

Copy link
Contributor Author

@Mats Mats Feb 12, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great to hear you plan to merge the PR next week. I agree with your comment about readability and have made the change from string casting to explicitly calling __toString().

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. Thank you.

} else {
$streams .= $contentStream->getContents();
}

$streams .= "\r\n";
}

Expand Down
15 changes: 15 additions & 0 deletions tests/FunctionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,21 @@ public function testSupportResources()
$this->assertTrue(false !== strpos($multipartStream, 'Content-Type: image/png'));
}

public function testSupportURIResources()
{
$builder = new MultipartStreamBuilder();
$resource = 'https://raw.githubusercontent.com/php-http/multipart-stream-builder/master/tests/Resources/httplug.png';
$stream = fopen($resource, 'r');
$builder->addResource('image', $stream);
$multipartStream = (string) $builder->build();

$this->assertTrue(false !== strpos($multipartStream, 'Content-Disposition: form-data; name="image"; filename="httplug.png"'));
$this->assertTrue(false !== strpos($multipartStream, 'Content-Type: image/png'));

$uriResourceContents = file_get_contents($resource);
$this->assertContains($uriResourceContents, $multipartStream);
}

public function testResourceFilenameIsNotLocaleAware()
{
// Get current locale
Expand Down