Skip to content

Commit b233d7e

Browse files
authored
Merge pull request #1 from Nyholm/no-stream
Remove our stream implementation
2 parents b2b9b10 + 963307f commit b233d7e

File tree

9 files changed

+194
-312
lines changed

9 files changed

+194
-312
lines changed

.travis.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
language: php
2+
3+
sudo: false
4+
5+
cache:
6+
directories:
7+
- $HOME/.composer/cache/files
8+
9+
php:
10+
- 5.5
11+
- 5.6
12+
- 7.0
13+
- hhvm
14+
15+
env:
16+
global:
17+
- TEST_COMMAND="composer test"
18+
19+
branches:
20+
except:
21+
- /^analysis-.*$/
22+
23+
matrix:
24+
fast_finish: true
25+
include:
26+
- php: 5.5
27+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
28+
29+
before_install:
30+
- travis_retry composer self-update
31+
32+
install:
33+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
34+
35+
script:
36+
- $TEST_COMMAND
37+
38+
after_success:
39+
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
40+
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $builder
2525
->addResource('baz', 'string', ['headers' => ['Content-Type' => 'text/plain']]);
2626

2727
$multipartStream = $builder->build();
28-
$boundary = $multipartStream->getBoundary();
28+
$boundary = $builder->getBoundary();
2929

3030
$request = MessageFactoryDiscovery::find()->createRequest(
3131
'POST',

composer.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,25 @@
1616
"php-http/message-factory": "^1.0",
1717
"php-http/discovery": "^0.9"
1818
},
19+
"require-dev": {
20+
"phpunit/phpunit": "^5.4",
21+
"php-http/message": "^1.0",
22+
"zendframework/zend-diactoros": "^1.3.5"
23+
},
1924
"autoload": {
2025
"psr-4": {
2126
"Http\\Message\\": "src/"
2227
}
2328
},
29+
"autoload-dev": {
30+
"psr-4": {
31+
"tests\\Http\\Message\\": "tests/"
32+
}
33+
},
34+
"scripts": {
35+
"test": "vendor/bin/phpunit",
36+
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
37+
},
2438
"extra": {
2539
"branch-alias": {
2640
"dev-master": "0.2-dev"

phpunit.xml.dist

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<phpunit bootstrap="./vendor/autoload.php"
4+
colors="true"
5+
convertErrorsToExceptions="true"
6+
convertNoticesToExceptions="true"
7+
convertWarningsToExceptions="true"
8+
syntaxCheck="true">
9+
<testsuites>
10+
<testsuite name="MultipartStream tests">
11+
<directory suffix="Test.php">./tests</directory>
12+
</testsuite>
13+
</testsuites>
14+
15+
<filter>
16+
<whitelist>
17+
<directory>./</directory>
18+
<exclude>
19+
<directory>./tests</directory>
20+
<directory>./vendor</directory>
21+
</exclude>
22+
</whitelist>
23+
</filter>
24+
</phpunit>

src/MultipartStream.php

Lines changed: 0 additions & 278 deletions
This file was deleted.

0 commit comments

Comments
 (0)