Improve package

.gitattributes

@@ -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.ci.yml   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

.github/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing
+
+Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).

.github/ISSUE_TEMPLATE.md

@@ -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)

.github/PULL_REQUEST_TEMPLATE.md

@@ -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

.gitignore

@@ -1,9 +1,8 @@
-.puli/
-bin/*
-!bin/puli.phar
-build/
-vendor/
-composer.lock
-phpspec.yml
-phpunit.xml
-puli.json
+/.puli/
+/behat.yml
+/build/
+/composer.lock
+/phpspec.yml
+/phpunit.xml
+/puli.json
+/vendor/

.styleci.yml

@@ -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

.travis.yml

@@ -4,7 +4,7 @@ sudo: false
 
 cache:
     directories:
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
 php:
     - 5.5
@@ -29,14 +29,15 @@ 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
+    - wget https://github.com/puli/cli/releases/download/1.0.0-beta10/puli.phar && chmod +x puli.phar
+    - 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

composer.json

@@ -11,14 +11,14 @@
         }
     ],
     "require": {
-        "php": "^5.5|^7.0"
+        "php": "^5.5 || ^7.0"
     },
     "require-dev": {
         "php-http/httplug": "^1.0",
         "php-http/message-factory": "^1.0",
-        "puli/composer-plugin": "1.0.0-beta9",
+        "puli/composer-plugin": "1.0.0-beta9 || 1.0.0-beta10",
         "phpspec/phpspec": "^2.4",
-        "henrikbjorn/phpspec-code-coverage" : "^1.0"
+        "henrikbjorn/phpspec-code-coverage" : "^2.0.2"
     },
     "suggest": {
         "puli/composer-plugin": "Sets up Puli which is recommended for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details.",
@@ -35,20 +35,14 @@
         }
     },
     "scripts": {
-        "test": "bin/phpspec run",
-        "test-ci": "bin/phpspec run -c phpspec.ci.yml"
+        "test": "vendor/bin/phpspec run",
+        "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
     },
-    "bin": [
-        "bin/puli.phar"
-    ],
     "extra": {
         "branch-alias": {
             "dev-master": "0.10-dev"
         }
     },
-    "config": {
-        "bin-dir": "bin"
-    },
     "prefer-stable": true,
     "minimum-stability": "beta"
 }

phpspec.ci.yml

@@ -2,9 +2,10 @@ suites:
     discovery_suite:
         namespace: Http\Discovery
         psr4_prefix: Http\Discovery
+formatter.name: pretty
+bootstrap: spec/autoload.php
 extensions:
     - PhpSpec\Extension\CodeCoverageExtension
 code_coverage:
     format: clover
     output: build/coverage.xml
-bootstrap: spec/autoload.php