Skip to content
This repository was archived by the owner on Jan 6, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 15 additions & 13 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
spec/ export-ignore
tests/ export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.php_cs export-ignore
.scrutinizer.yml export-ignore
.styleci.yml export-ignore
.travis.yml export-ignore
CONTRIBUTING export-ignore
phpspec.yml.ci export-ignore
phpspec.yml.dist export-ignore
phpunit.xml.dist export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
/.github/ export-ignore
.gitignore export-ignore
/.php_cs export-ignore
/.scrutinizer.yml export-ignore
/.styleci.yml export-ignore
/.travis.yml export-ignore
/behat.yml.dist export-ignore
/features/ export-ignore
/phpspec.ci.yml export-ignore
/phpspec.yml.dist export-ignore
/phpunit.xml.dist export-ignore
/spec/ export-ignore
/tests/ export-ignore
3 changes: 3 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Contributing

Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
| Q | A
| ------------ | ---
| Bug? | no|yes
| New Feature? | no|yes
| Version | Specific version or SHA of a commit


#### Actual Behavior

What is the actual behavior?


#### Expected Behavior

What is the behavior you expect?


#### Steps to Reproduce

What are the steps to reproduce this bug? Please add code examples,
screenshots or links to GitHub repositories that reproduce the problem.


#### Possible Solutions

If you have already ideas how to solve the issue, add them here.
(remove this section if not needed)
43 changes: 43 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
| Q | A
| --------------- | ---
| Bug fix? | no|yes
| New feature? | no|yes
| BC breaks? | no|yes
| Deprecations? | no|yes
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| Documentation | if this is a new feature, link to pull request in https://github.com/php-http/documentation that adds relevant documentation
| License | MIT


#### What's in this PR?

Explain what the changes in this PR do.


#### Why?

Which problem does the PR fix? (remove this section if you linked an issue above)


#### Example Usage

``` php
// If you added new features, show examples of how to use them here
// (remove this section if not a new feature)

$foo = new Foo();

// Now we can do
$foo->doSomething();
```


#### Checklist

- [ ] Updated CHANGELOG.md to describe BC breaks / deprecations | new feature | bugfix
- [ ] Documentation pull request created (if not simply a bugfix)


#### To Do

- [ ] If the PR is not complete but you want to discuss the approach, list what remains to be done here
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.puli/
build/
vendor/
composer.lock
phpspec.yml
phpunit.xml
/behat.yml
/build/
/composer.lock
/phpspec.yml
/phpunit.xml
/vendor/
4 changes: 4 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ finder:
- "spec"
path:
- "src"
- "tests"

enabled:
- short_array_syntax

disabled:
- phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sudo: false

cache:
directories:
- $HOME/.composer/cache
- $HOME/.composer/cache/files

php:
- 5.5
Expand All @@ -29,17 +29,17 @@ matrix:
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"

before_install:
- travis_retry composer self-update
- if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi

install:
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction

before_script:
- vendor/bin/http_test_server > /dev/null 2>&1 &

script:
- $TEST_COMMAND

after_script:
- 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
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Change Log


## UNRELEASED
## 1.0.0 - 2016-07-18

### Changed

- Improved package files
- Discovery updated to ^1.0
- Client now requires a Response factory instead of a Message factory


Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING

This file was deleted.

8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"require-dev": {
"ext-curl": "*",
"php-http/adapter-integration-tests": "^0.4",
"php-http/client-integration-tests": "^0.5.1",
"guzzlehttp/ringphp": "^1.1"
},
"provide": {
Expand All @@ -44,9 +44,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "0.7-dev"
"dev-master": "1.0-dev"
}
},
"prefer-stable": true,
"minimum-stability": "beta"
}
}
2 changes: 1 addition & 1 deletion tests/ExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ExceptionTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->guzzleRequest = new GuzzleRequest('GET', 'http://foo.com');
$this->guzzleResponse = new GuzzleResponse('400', [], Stream::factory('message body'), ['protocol_version'=>'1,1']);
$this->guzzleResponse = new GuzzleResponse('400', [], Stream::factory('message body'), ['protocol_version' => '1,1']);
}

protected function makeRequest(GuzzleExceptions\TransferException $exception)
Expand Down
2 changes: 1 addition & 1 deletion tests/HttpAdapterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function createHttpAdapter()
}

/**
* Returns a handler for the client
* Returns a handler for the client.
*
* @return object
*/
Expand Down