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/.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/.styleci.yml b/.styleci.yml index 296cab4..5328b61 100644 --- a/.styleci.yml +++ b/.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 diff --git a/.travis.yml b/.travis.yml index 90c61e0..483530d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ 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: # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355 @@ -39,5 +39,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 diff --git a/CHANGELOG.md b/CHANGELOG.md index c2ced46..2672b3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ # Change Log -## Unreleased + +## UNRELEASED ### Changed - AddHostPlugin also sets the port if specified + ## 1.2.0 - 2016-07-14 ### Added diff --git a/composer.json b/composer.json index 305c27e..c44509e 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "php-http/httplug": "^1.0", "php-http/message-factory": "^1.0", "php-http/message": "^1.2", - "symfony/options-resolver": "^2.6|^3.0" + "symfony/options-resolver": "^2.6 || ^3.0" }, "require-dev": { "phpspec/phpspec": "^2.4", @@ -33,7 +33,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