From f8af6f3eb0404fa779b329aafc3c63402a1d16d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rk=20S=C3=A1gi-Kaz=C3=A1r?=
 <mark.sagikazar@gmail.com>
Date: Fri, 15 Jul 2016 17:06:37 +0200
Subject: [PATCH 1/3] Improve package

---
 .gitattributes                   | 28 +++++++++++++++-------------
 .gitignore                       | 12 ++++++------
 CHANGELOG.md                     |  6 ++++--
 composer.json                    |  2 +-
 phpspec.yml.ci => phpspec.ci.yml |  0
 5 files changed, 26 insertions(+), 22 deletions(-)
 rename phpspec.yml.ci => phpspec.ci.yml (100%)

diff --git a/.gitattributes b/.gitattributes
index 7ae0617..4644cad 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,15 @@
-.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
-phpspec.yml.ci   export-ignore
-phpspec.yml.dist export-ignore
-phpunit.xml.dist export-ignore
-spec/            export-ignore
-tests/           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
diff --git a/.gitignore b/.gitignore
index da734f1..a9d76ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-.puli/
-build/
-vendor/
-composer.lock
-phpspec.yml
-phpunit.xml
+/.puli/
+/build/
+/vendor/
+/composer.lock
+/phpspec.yml
+/phpunit.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b90aaca..ce2c410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,14 @@
 # Change Log
 
+
 ## 1.3.1 - 2016-07-15
 
 ### Fixed
 
 - FullHttpMessageFormatter will not read from streams that you cannot rewind (non-seekable)
 - FullHttpMessageFormatter will not read from the stream if $maxBodyLength is zero
-- FullHttpMessageFormatter rewinds streams after they are read.
+- FullHttpMessageFormatter rewinds streams after they are read
+
 
 ## 1.3.0 - 2016-07-14
 
@@ -15,7 +17,7 @@
 - FullHttpMessageFormatter to include headers and body in the formatted message
 
 ### Fixed
- 
+
 - #41: Response builder broke header value
 
 
diff --git a/composer.json b/composer.json
index a0da5dd..0efd08a 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
     },
     "scripts": {
         "test": "vendor/bin/phpspec run",
-        "test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
+        "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
     },
     "extra": {
         "branch-alias": {
diff --git a/phpspec.yml.ci b/phpspec.ci.yml
similarity index 100%
rename from phpspec.yml.ci
rename to phpspec.ci.yml

From 2fdc522aec1375bec54fc897b8095c62129886f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rk=20S=C3=A1gi-Kaz=C3=A1r?=
 <mark.sagikazar@gmail.com>
Date: Fri, 15 Jul 2016 20:56:30 +0200
Subject: [PATCH 2/3] Improve package

---
 .gitattributes | 6 +++---
 .gitignore     | 4 ++--
 .travis.yml    | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 4644cad..c47225a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
-/.editorconfig    export-ignore
-/.gitattributes   export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
 /.github/         export-ignore
-/.gitignore       export-ignore
+.gitignore        export-ignore
 /.php_cs          export-ignore
 /.scrutinizer.yml export-ignore
 /.styleci.yml     export-ignore
diff --git a/.gitignore b/.gitignore
index a9d76ff..16b4a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/.puli/
+/behat.yml
 /build/
-/vendor/
 /composer.lock
 /phpspec.yml
 /phpunit.xml
+/vendor/
diff --git a/.travis.yml b/.travis.yml
index 7a4a218..9bbb449 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ matrix:
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
+    - if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
     - travis_retry composer self-update
 
 install:
@@ -37,5 +38,5 @@ 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
+    - 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

From aeed9626dde92860653b911efce6760876113673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rk=20S=C3=A1gi-Kaz=C3=A1r?=
 <mark.sagikazar@gmail.com>
Date: Fri, 15 Jul 2016 23:57:58 +0200
Subject: [PATCH 3/3] Fix styleci config

---
 .styleci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.styleci.yml b/.styleci.yml
index 3417c41..5328b61 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -9,3 +9,6 @@ finder:
 
 enabled:
     - short_array_syntax
+
+disabled:
+    - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198