From af95370e038a3b3930852671d0848a83d7d4a5fc 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: Tue, 2 Aug 2016 10:43:35 +0200
Subject: [PATCH] Generic package improvements

---
 .gitattributes                   | 28 +++++++++++++++-------------
 .github/ISSUE_TEMPLATE.md        |  4 ++--
 .gitignore                       | 11 ++++++-----
 .travis.yml                      |  8 +++++---
 composer.json                    |  4 ++--
 phpspec.yml.ci => phpspec.ci.yml |  0
 6 files changed, 30 insertions(+), 25 deletions(-)
 rename phpspec.yml.ci => phpspec.ci.yml (100%)

diff --git a/.gitattributes b/.gitattributes
index 7ae0617..c47225a 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/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 49ec72b..d4ecf20 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 | Q            | A
 | ------------ | ---
-| Bug?         | no
-| New Feature? | no
+| Bug?         | no|yes
+| New Feature? | no|yes
 | Version      | Specific version or SHA of a commit
 
 
diff --git a/.gitignore b/.gitignore
index 7608c4b..16b4a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-build/
-vendor/
-composer.lock
-phpspec.yml
-phpunit.xml
+/behat.yml
+/build/
+/composer.lock
+/phpspec.yml
+/phpunit.xml
+/vendor/
diff --git a/.travis.yml b/.travis.yml
index e3a0481..44dc5af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,14 +29,16 @@ 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 ]]; then phpenv config-rm xdebug.ini || true; fi
 
 install:
+    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
+    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
     - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
 
 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
diff --git a/composer.json b/composer.json
index 59019b5..aa8bde7 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "psr/cache": "^1.0",
         "php-http/client-common": "^1.1",
         "php-http/message-factory": "^1.0",
-        "symfony/options-resolver": "^2.6|^3.0"
+        "symfony/options-resolver": "^2.6 || ^3.0"
     },
     "require-dev": {
         "phpspec/phpspec": "^2.5",
@@ -28,7 +28,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