Added tests

Author: Nyholm

.travis.yml

@@ -0,0 +1,40 @@
+language: php
+
+sudo: false
+
+cache:
+    directories:
+        - $HOME/.composer/cache/files
+
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+
+env:
+    global:
+        - TEST_COMMAND="composer test"
+
+branches:
+    except:
+        - /^analysis-.*$/
+
+matrix:
+    fast_finish: true
+    include:
+        - php: 5.5
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
+
+before_install:
+    - travis_retry composer self-update
+
+install:
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
+
+script:
+    - $TEST_COMMAND
+
+after_success:
+    - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+    - if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

composer.json

@@ -16,11 +16,25 @@
         "php-http/message-factory": "^1.0",
         "php-http/discovery": "^0.9"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^5.4",
+        "php-http/message": "^1.0",
+        "zendframework/zend-diactoros": "^1.3.5"
+    },
     "autoload": {
         "psr-4": {
             "Http\\Message\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "tests\\Http\\Message\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"

phpunit.xml.dist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="./vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         syntaxCheck="true">
+    <testsuites>
+        <testsuite name="MultipartStream tests">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>

src/MultipartStreamBuilder.php

@@ -54,7 +54,7 @@ public function __construct(StreamFactory $streamFactory = null)
      * 
      * @return MultipartStreamBuilder
      */
-    public function addResource($name, $resource, array $options)
+    public function addResource($name, $resource, array $options = [])
     {
         $stream = $this->streamFactory->createStream($resource);
 
@@ -68,7 +68,7 @@ public function addResource($name, $resource, array $options)
             $options['filename'] = null;
             $uri = $stream->getMetadata('uri');
             if (substr($uri, 0, 6) !== 'php://') {
-                $config['filename'] = $uri;
+                $options['filename'] = $uri;
             }
 
         }
@@ -91,15 +91,15 @@ public function build()
 
             // Add start and headers
             $streams .= "--{$this->getBoundary()}\r\n".
-                $this->getHeaders($data['headers'])."\r\n\r\n";
+                $this->getHeaders($data['headers'])."\r\n";
 
             // Convert the stream to string
             $streams .= (string) $data['contents'];
             $streams .= "\r\n";
         }
 
         // Append end
-        $streams[] = "--{$this->getBoundary()}--\r\n";
+        $streams .= "--{$this->getBoundary()}--\r\n";
 
         return $this->streamFactory->createStream($streams);
     }

tests/FunctionTest.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace tests\Http\Message;
+
+use Http\Message\MultipartStreamBuilder;
+use Zend\Diactoros\Stream;
+
+class FunctionalTest extends \PHPUnit_Framework_TestCase
+{
+    public function testSupportStreams()
+    {
+        $body = 'stream contents';
+
+        $builder = new MultipartStreamBuilder();
+        $builder->addResource('foobar', $this->createStream($body));
+
+        $multipartStream = (string) $builder->build();
+        $this->assertTrue(false !== strpos($multipartStream, $body));
+    }
+
+    public function testSupportResources()
+    {
+        $resource = fopen(__DIR__.'/Resources/httplug.png', 'r');
+
+        $builder = new MultipartStreamBuilder();
+        $builder->addResource('image', $resource);
+
+        $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'));
+    }
+
+    public function testHeaders()
+    {
+        $builder = new MultipartStreamBuilder();
+        $builder->addResource('foobar', 'stream contents', ['headers' => ['Content-Type' => 'html/image', 'content-length'=>'4711', 'CONTENT-DISPOSITION'=>'none']]);
+
+        $multipartStream = (string) $builder->build();
+        $this->assertTrue(false !== strpos($multipartStream, 'Content-Type: html/image'));
+        $this->assertTrue(false !== strpos($multipartStream, 'content-length: 4711'));
+        $this->assertTrue(false !== strpos($multipartStream, 'CONTENT-DISPOSITION: none'));
+
+        // Make sure we do not add extra headers with a different case
+        $this->assertTrue(false === strpos($multipartStream, 'Content-Disposition:'));
+    }
+
+    public function testContentLength()
+    {
+        $builder = new MultipartStreamBuilder();
+        $builder->addResource('foobar', 'stream contents');
+
+        $multipartStream = (string) $builder->build();
+        $this->assertTrue(false !== strpos($multipartStream, 'Content-Length: 15'));
+    }
+
+    public function testFormName()
+    {
+        $builder = new MultipartStreamBuilder();
+        $builder->addResource('a-formname', 'string');
+
+        $multipartStream = (string) $builder->build();
+        $this->assertTrue(false !== strpos($multipartStream, 'Content-Disposition: form-data; name="a-formname"'));
+    }
+
+    public function testBoundary()
+    {
+        $boundary = 'SpecialBoundary';
+        $builder = new MultipartStreamBuilder();
+        $builder->addResource('content0', 'string');
+        $builder->setBoundary($boundary);
+
+        $multipartStream = (string) $builder->build();
+        $this->assertEquals(2, substr_count($multipartStream, $boundary));
+
+
+        $builder->addResource('content1', 'string');
+        $builder->addResource('content2', 'string');
+        $builder->addResource('content3', 'string');
+
+        $multipartStream = (string) $builder->build();
+        $this->assertEquals(5, substr_count($multipartStream, $boundary));
+    }
+
+    /**
+     * @param $body
+     *
+     * @return Stream
+     */
+    private function createStream($body)
+    {
+        $stream = new Stream('php://memory', 'rw');
+        $stream->write($body);
+        $stream->rewind();
+
+        return $stream;
+    }
+}