Update package

sagikazarmark · sagikazarmark · commit 705c780ec820 · 2015-12-15T14:03:48.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -7,6 +7,3 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.yml*]
-indent_size = 2
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,14 @@
+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
+CONDUCT.md       export-ignore
 CONTRIBUTING.md  export-ignore
+phpspec.yml.ci   export-ignore
+phpspec.yml.dist export-ignore
+phpunit.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 build/
 vendor/
 composer.lock
+phpspec.yml
+phpunit.xml
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
+ * with composer.
+ *
+ * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
+ * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
+ */
+
+use SLLH\StyleCIBridge\ConfigBridge;
+
+return ConfigBridge::create();
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,11 +1,8 @@
 filter:
-  paths: [src/*]
+    paths: [src/*]
 checks:
-  php:
-    code_rating: true
-    duplication: true
+    php:
+        code_rating: true
+        duplication: true
 tools:
-  external_code_coverage: true
-  php_code_sniffer:
-    config:
-      standard: "PSR2"
+    external_code_coverage: true
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,11 @@
+preset: symfony
+
+finder:
+    exclude:
+        - "spec"
+        - "tests"
+    path:
+        - "src"
+
+enabled:
+    - short_array_syntax
diff --git a/.travis.yml b/.travis.yml
@@ -3,35 +3,39 @@ language: php
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.composer/cache
+    directories:
+        - $HOME/.composer/cache
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
 
 env:
-  global:
-    - TEST_COMMAND="composer test"
+    global:
+        - TEST_COMMAND="composer test"
+
+branches:
+    except:
+        - /^analysis-.*$/
 
 matrix:
-  fast_finish: true
-  include:
-    - php: 5.4
-      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
+    fast_finish: true
+    include:
+        - php: 5.4
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
-  - travis_retry composer self-update
+    - travis_retry composer self-update
 
 install:
-  - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
 
 script:
-  - $TEST_COMMAND
+    - $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
+    - 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
diff --git a/CONDUCT.md b/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/)
diff --git a/CONTRIBUTING.md b/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 [security@php-http.org](mailto:security@php-http.org) 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 git@github.com:your-name/repo-name.git
@@ -41,7 +44,8 @@ Then install the dependencies through [Composer](https://getcomposer.org/):
 $ composer install
 ```
 
-Write code and tests. When you are ready, run the tests. (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
@@ -54,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
@@ -67,7 +75,7 @@ $ git rebase -i HEAD~3
 If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
 
 ``` bash
-$ git remote add upstream git@github.com:php-http/repo-name.git
+$ git remote add upstream git@github.com:orga/repo-name.git
 $ git pull --rebase upstream master
 $ git push -f origin feature-or-bug-fix-description
 ```
@@ -81,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.
diff --git a/README.md b/README.md
@@ -7,7 +7,8 @@
 [![Quality Score](https://img.shields.io/scrutinizer/g/php-http/plugins.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/plugins)
 [![Total Downloads](https://img.shields.io/packagist/dt/php-http/plugins.svg?style=flat-square)](https://packagist.org/packages/php-http/plugins)
 
-**Plugins for Httplug.**
+**Plugins for HTTPlug.**
+
 
 ## Install
 
@@ -30,12 +31,13 @@ $ 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 [security@php-http.org](mailto:security@php-http.org).
+If you discover any security related issues, please contact us at [security@httplug.io](mailto:security@httplug.io)
+or [security@php-http.org](mailto:security@php-http.org).
 
 
 ## License
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "php-http/plugins",
-    "description": "Plugins for Httplug",
+    "description": "Plugins for HTTPlug",
     "license": "MIT",
     "keywords": ["plugin", "http", "psr7"],
     "homepage": "http://php-http.org",
diff --git a/phpspec.yml.ci b/phpspec.yml.ci
@@ -1,10 +1,10 @@
 suites:
-  plugin_suite:
-    namespace: Http\Client\Plugin
-    psr4_prefix: Http\Client\Plugin
+    plugin_suite:
+        namespace: Http\Client\Plugin
+        psr4_prefix: Http\Client\Plugin
 formatter.name: pretty
 extensions:
-  - PhpSpec\Extension\CodeCoverageExtension
+    - PhpSpec\Extension\CodeCoverageExtension
 code_coverage:
-  format: clover
-  output: build/coverage.xml
+    format: clover
+    output: build/coverage.xml
diff --git a/phpspec.yml.dist b/phpspec.yml.dist
@@ -1,5 +1,5 @@
 suites:
-  plugin_suite:
-    namespace: Http\Client\Plugin
-    psr4_prefix: Http\Client\Plugin
+    plugin_suite:
+        namespace: Http\Client\Plugin
+        psr4_prefix: Http\Client\Plugin
 formatter.name: pretty

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "php-http/plugins",`
`3`		`- "description": "Plugins for Httplug",`
	`3`	`+ "description": "Plugins for HTTPlug",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"keywords": ["plugin", "http", "psr7"],`
`6`	`6`	`"homepage": "http://php-http.org",`