diff --git a/.gitattributes b/.gitattributes index 7c676b3c..30da17f8 100644 --- a/.gitattributes +++ b/.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.yml.ci 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 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 00000000..fb288d91 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Contributing + +Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html). diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..d4ecf20f --- /dev/null +++ b/.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) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..323987b5 --- /dev/null +++ b/.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 diff --git a/.gitignore b/.gitignore index d8e81907..16b4a200 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ -.puli/ -build/ -vendor/ -composer.lock -phpspec.yml -phpunit.xml -puli.json -puli.phar +/behat.yml +/build/ +/composer.lock +/phpspec.yml +/phpunit.xml +/vendor/ diff --git a/.styleci.yml b/.styleci.yml index 170a12d8..435b5fb4 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -7,3 +7,6 @@ finder: enabled: - short_array_syntax + +disabled: + - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198 diff --git a/.travis.yml b/.travis.yml index 2af3d2dd..e0ae0b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,17 +30,13 @@ matrix: - php: 5.5 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.* -before_install: - - travis_retry composer self-update - install: - - wget https://github.com/puli/cli/releases/download/1.0.0-beta10/puli.phar && chmod +x puli.phar - composer require symfony/symfony:${SYMFONY_VERSION} --no-update - - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction + - 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/CHANGELOG.md b/CHANGELOG.md index 897fefda..c43ded37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ # Change Log + ## 1.1.1 - 2016-06-30 ### Changed - Removed Puli logic and require `php-http/discovery:0.9` which makes Puli optional. + ## 1.1.0 - 2016-05-19 ### Added @@ -20,7 +22,6 @@ - **[BC] PluginClientFactory returns an instance of `Http\Client\Common\PluginClient`** (see [php-http/client-common#14](https://github.com/php-http/client-common/pull/14)) - Plugins are loaded from their new packages - ### Fixed - Puli autoload issue on >=PHP 5.6, see [puli/issues#190](https://github.com/puli/issues/issues/190) diff --git a/CONTRIBUTING b/CONTRIBUTING deleted file mode 100644 index 841914ae..00000000 --- a/CONTRIBUTING +++ /dev/null @@ -1 +0,0 @@ -Please see http://docs.php-http.org/en/latest/development/contributing.html diff --git a/composer.json b/composer.json index a0f600ba..ef088300 100644 --- a/composer.json +++ b/composer.json @@ -23,9 +23,9 @@ "php-http/cache-plugin": "^1.0", "php-http/logger-plugin": "^1.0", "php-http/stopwatch-plugin": "^1.0", - "symfony/options-resolver": "^2.7|^3.0", - "symfony/event-dispatcher": "^2.7|^3.0", - "symfony/framework-bundle": "^2.7|^3.0", + "symfony/options-resolver": "^2.7 || ^3.0", + "symfony/event-dispatcher": "^2.7 || ^3.0", + "symfony/framework-bundle": "^2.7 || ^3.0", "php-http/discovery": "^0.9" }, "require-dev": { @@ -36,16 +36,13 @@ "php-http/react-adapter": "^0.2", "php-http/buzz-adapter": "^0.2", "php-http/message": "^1.0", - "symfony/symfony": "^2.7|^3.0", + "symfony/symfony": "^2.7 || ^3.0", "polishsymfonycommunity/symfony-mocker-container": "^1.0", "matthiasnoback/symfony-dependency-injection-test": "^0.7" }, "conflict": { "php-http/guzzle6-adapter": "<1.1" }, - "suggest": { - "php-http/discovery": "Used for automatic service discovery" - }, "autoload": { "psr-4": { "Http\\HttplugBundle\\": "" @@ -57,9 +54,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } - }, - "prefer-stable": true, - "minimum-stability": "beta" + } }