From c553ad7a24eed03912924441640aec7c229e25d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rk=20S=C3=A1gi-Kaz=C3=A1r?= Date: Wed, 13 Jan 2016 18:52:52 +0100 Subject: [PATCH] Update package files --- .editorconfig | 4 --- .gitattributes | 7 ++++- .gitignore | 3 +- .php_cs | 13 ++++++++ .scrutinizer.yml | 13 +++----- .styleci.yml | 10 ++++++ .travis.yml | 43 ++++++++++++++------------ CHANGELOG.md | 8 +++++ CONTRIBUTING | 1 + CONTRIBUTING.md | 80 ------------------------------------------------ LICENSE | 1 + README.md | 7 +++-- composer.json | 8 ++--- 13 files changed, 77 insertions(+), 121 deletions(-) create mode 100644 .php_cs create mode 100644 .styleci.yml create mode 100644 CONTRIBUTING delete mode 100644 CONTRIBUTING.md diff --git a/.editorconfig b/.editorconfig index cac5bb7..d741e40 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,3 @@ trim_trailing_whitespace = true insert_final_newline = true indent_style = space indent_size = 4 - -[*.yml*] -indent_style = space -indent_size = 2 diff --git a/.gitattributes b/.gitattributes index eecf37d..5dd7941 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,13 @@ +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.md export-ignore +CONTRIBUTING export-ignore +phpspec.yml.ci export-ignore +phpspec.yml.dist export-ignore phpunit.xml.dist export-ignore diff --git a/.gitignore b/.gitignore index 0af9785..da734f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ +.puli/ build/ vendor/ composer.lock +phpspec.yml phpunit.xml -/.puli diff --git a/.php_cs b/.php_cs new file mode 100644 index 0000000..23ba165 --- /dev/null +++ b/.php_cs @@ -0,0 +1,13 @@ + /dev/null 2>&1 & + - vendor/bin/http_test_server > /dev/null 2>&1 & script: - - $TEST_COMMAND + - $TEST_COMMAND after_script: - - 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 50970f6..f994621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Change Log +## UNRELEASED + +### Changed + +- Updated package files +- Updated to latest HTTPlug + + ## 0.1.0 - 2015-06-12 ### Added diff --git a/CONTRIBUTING b/CONTRIBUTING new file mode 100644 index 0000000..841914a --- /dev/null +++ b/CONTRIBUTING @@ -0,0 +1 @@ +Please see http://docs.php-http.org/en/latest/development/contributing.html diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index f6c4a0a..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,80 +0,0 @@ -# Contributing - -If you're here, you would like to contribute to this repository and you're really welcome! - - -## Bug reports - -If you find a bug or a documentation issue, please report it or even better: fix it :). If you report it, -please be as precise as possible. Here is a little list of required information: - - - Precise description of the bug - - Details of your environment (for example: OS, PHP version, installed extensions) - - Backtrace which might help identifing the bug - - -## Security issues - -If you discover any security related issues, please contact us at [security@php-http.org](mailto:security@php-http.org) instead of submitting an issue on Github. This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability. - - -## Feature requests - -If you think a feature is missing, please report it or even better: implement it :). If you report it, describe the more -precisely what you would like to see implemented and we will discuss what is the best approach for it. If you can do -some research before submitting it and link the resources to your description, you're awesome! It will allow us to more -easily understood/implement it. - - -## Sending a Pull Request - -If you're here, you are going to fix a bug or implement a feature and you're the best! To do it, first fork the repository, clone it and create a new branch with the following commands: - -``` bash -$ git clone git@github.com:your-name/repo-name.git -$ git checkout -b feature-or-bug-fix-description -``` - -Then install the dependencies through [Composer](https://getcomposer.org/): - -``` bash -$ composer install -``` - -Write code and tests. When you are ready, find the testing command in the [README](README.md) and execute it. (This is usually [PHPUnit](http://phpunit.de/) or [PHPSpec](http://phpspec.net/)) - -When you are ready with the code, tested it and documented it, you can commit and push it with the following commands: - -``` bash -$ git commit -m "Feature or bug fix description" -$ git push origin feature-or-bug-fix-description -``` - -**Note:** Please write your commit messages in the imperative and follow the [guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages. - -Then [create a pull request](https://help.github.com/articles/creating-a-pull-request/) on GitHub. - -Please make sure that each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting with the following commands (here, we assume you would like to squash 3 commits in a single one): - -``` bash -$ git rebase -i HEAD~3 -``` - -If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands: - -``` bash -$ git remote add upstream git@github.com:php-http/repo-name.git -$ git pull --rebase upstream master -$ git push -f origin feature-or-bug-fix-description -``` - - -## Coding standard - -This repository follows the [PSR-2 standard](http://www.php-fig.org/psr/psr-2/) and so, if you want to contribute, -you must follow these rules. - - -## Semver - -We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes, please let us know why you think it is important. In this case, your patch can only be included in the next major version. diff --git a/LICENSE b/LICENSE index 5d359fe..48741e4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright (c) 2014-2015 Eric GELOEN +Copyright (c) 2015-2016 PHP HTTP Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index fb4a975..a34d115 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,19 @@ Please see the [official documentation](http://php-http.readthedocs.org/en/lates ## Testing ``` bash -$ phpunit +$ composer test ``` ## Contributing -Please see [CONTRIBUTING](CONTRIBUTING.md) for details. +Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html). ## Security -If you discover any security related issues, please contact us at [security@php-http.org](mailto:security@php-http.org). +If you discover any security related issues, please contact us at [security@httplug.io](mailto:security@httplug.io) +or [security@php-http.org](mailto:security@php-http.org). ## License diff --git a/composer.json b/composer.json index 92cd5a3..ab6f618 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Guzzle 5 HTTP Adapter", "license": "MIT", "keywords": ["guzzle", "http"], - "homepage": "http://php-http.org", + "homepage": "http://httplug.io", "authors": [ { "name": "Eric GELOEN", @@ -16,14 +16,14 @@ ], "require": { "php": ">=5.4", - "php-http/httplug": "1.0.0-beta", - "php-http/discovery": "~0.5", + "php-http/httplug": "^1.0", + "php-http/discovery": "~0.6.4", "guzzlehttp/guzzle": "^5.1" }, "require-dev": { "ext-curl": "*", "guzzlehttp/ringphp": "^1.1", - "php-http/adapter-integration-tests": "dev-master", + "php-http/adapter-integration-tests": "^0.2", "php-http/client-common": "^0.1.1", "guzzlehttp/psr7": "^1.2" },