Update package data

.editorconfig

@@ -1,13 +1,12 @@
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
+end_of_line = lf
 indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.yml*]
-indent_style = space
 indent_size = 2

.gitattributes

@@ -5,5 +5,6 @@ spec/            export-ignore
 .scrutinizer.yml export-ignore
 .travis.yml      export-ignore
 CONTRIBUTING.md  export-ignore
+CONDUCT.md       export-ignore
 phpspec.yml.ci   export-ignore
 phpspec.yml.dist export-ignore

.travis.yml

@@ -1,30 +1,39 @@
 language: php
 
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - hhvm
 
+env:
+  global:
+    - TEST_COMMAND="composer test"
+
 matrix:
   allow_failures:
     - php: 7.0
-    - php: hhvm
+  fast_finish: true
   include:
     - php: 5.5
-      env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-        - COVERAGE=true
-        - PHPSPEC_FLAGS="-c phpspec.yml.ci"
+      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
-install:
+before_install:
   - travis_retry composer self-update
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.4" ]]; then composer remove "zendframework/zend-diactoros" --dev --no-update; fi
+
+install:
   - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
 
-script: vendor/bin/phpspec run ${PHPSPEC_FLAGS}
+script:
+  - $TEST_COMMAND
 
-after_script:
+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

CONDUCT.md

@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

CONTRIBUTING.md

@@ -15,7 +15,9 @@ please be as precise as possible. Here is a little list of required information:
 
 ## Security issues
 
-If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected]) instead of submitting an issue on Github. This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability.
+If you discover any security related issues,
+please contact us at the [security email address](../../#security) instead of submitting an issue on Github.
+This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability.
 
 
 ## Feature requests
@@ -28,7 +30,8 @@ easily understood/implement it.
 
 ## Sending a Pull Request
 
-If you're here, you are going to fix a bug or implement a feature and you're the best! To do it, first fork the repository, clone it and create a new branch with the following commands:
+If you're here, you are going to fix a bug or implement a feature and you're the best!
+To do it, first fork the repository, clone it and create a new branch with the following commands:
 
 ``` bash
 $ git clone [email protected]:your-name/repo-name.git
@@ -41,7 +44,12 @@ Then install the dependencies through [Composer](https://getcomposer.org/):
 $ composer install
 ```
 
-Write code and tests. When you are ready, find the testing command in the [README](README.md) and execute it. (This is usually [PHPUnit](http://phpunit.de/) or [PHPSpec](http://phpspec.net/))
+Write code and tests. When you are ready, run the tests.
+(This is usually [PHPUnit](http://phpunit.de/) or [PHPSpec](http://phpspec.net/))
+
+``` bash
+$ composer test
+```
 
 When you are ready with the code, tested it and documented it, you can commit and push it with the following commands:
 
@@ -50,11 +58,15 @@ $ git commit -m "Feature or bug fix description"
 $ git push origin feature-or-bug-fix-description
 ```
 
-**Note:** Please write your commit messages in the imperative and follow the [guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages.
+**Note:** Please write your commit messages in the imperative and follow the
+[guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages.
 
 Then [create a pull request](https://help.github.com/articles/creating-a-pull-request/) on GitHub.
 
-Please make sure that each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting with the following commands (here, we assume you would like to squash 3 commits in a single one):
+Please make sure that each individual commit in your pull request is meaningful.
+If you had to make multiple intermediate commits while developing,
+please squash them before submitting with the following commands
+(here, we assume you would like to squash 3 commits in a single one):
 
 ``` bash
 $ git rebase -i HEAD~3
@@ -77,4 +89,12 @@ you must follow these rules.
 
 ## Semver
 
-We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes, please let us know why you think it is important. In this case, your patch can only be included in the next major version.
+We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes,
+please let us know why you think it is important.
+In this case, your patch can only be included in the next major version.
+
+
+## Code of Conduct
+
+This project is released with a [Contributor Code of Conduct](CONDUCT.md).
+By participating in this project you agree to abide by its terms.

README.md

@@ -1,4 +1,4 @@
-# HTTP Discovery
+# HTTPlug Discovery
 
 [![Latest Version](https://img.shields.io/github/release/php-http/discovery.svg?style=flat-square)](https://github.com/php-http/discovery/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
@@ -27,18 +27,19 @@ Please see the [official documentation](http://php-http.readthedocs.org/en/lates
 ## Testing
 
 ``` bash
-$ phpspec run
+$ composer test
 ```
 
 
 ## Contributing
 
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
+Please see [CONTRIBUTING](CONTRIBUTING.md) and [CONDUCT](CONDUCT.md) for details.
 
 
 ## Security
 
-If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected]).
+If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected])
+or [[email protected]](mailto:[email protected]).
 
 
 ## License

composer.json

@@ -16,23 +16,27 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/message-factory": "~0.2@dev"
+        "php-http/message-factory": "^0.4"
     },
     "require-dev": {
         "zendframework/zend-diactoros": "^1.0",
         "guzzlehttp/psr7": "^1.0",
-        "phpspec/phpspec": "^2.2",
+        "phpspec/phpspec": "^2.4@dev",
         "henrikbjorn/phpspec-code-coverage" : "^1.0"
     },
     "suggest": {
-        "zendframework/zend-diactoros": "Used with Diactoros MessageFactory",
-        "guzzlehttp/psr7": "Used with Guzzle PSR-7 MessageFactory"
+        "zendframework/zend-diactoros": "Used with Diactoros Factories",
+        "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories"
     },
     "autoload": {
         "psr-4": {
             "Http\\Discovery\\": "src/"
         }
     },
+    "scripts": {
+        "test": "vendor/bin/phpspec run",
+        "test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"