From 81713354216909a97895cee79c6d438cd41234a4 Mon Sep 17 00:00:00 2001 From: Ha Phan Date: Tue, 13 Mar 2018 13:51:35 +0800 Subject: [PATCH 1/3] Bumped up php-coveralls to remove dated guzzle --- .travis.yml | 3 +++ composer.json | 6 +++--- phpunit.xml.dist | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fa1b011..81677f5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,9 @@ before_script: after_script: - php vendor/bin/coveralls -v +after_success: + - travis_retry php vendor/bin/php-coveralls -v + notifications: email: - jamie.hannaford@rackspace.com diff --git a/composer.json b/composer.json index 8d82623f..7abc54b2 100644 --- a/composer.json +++ b/composer.json @@ -46,9 +46,9 @@ "require-dev": { "phpunit/phpunit": "^6.5", "sami/sami": "dev-master", - "psr/log": "~1.0", - "satooshi/php-coveralls": "~1.0", - "jakub-onderka/php-parallel-lint": "0.*", + "psr/log": "^1.0", + "satooshi/php-coveralls": "^2.0", + "jakub-onderka/php-parallel-lint": "^1.0", "friendsofphp/php-cs-fixer": "^2.9" }, "extra": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2493eb9e..032b639b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,8 @@ - + + + tests/unit From caba37a4bd9486254415f8d02c1423613c80ae57 Mon Sep 17 00:00:00 2001 From: Ha Phan Date: Tue, 13 Mar 2018 14:09:31 +0800 Subject: [PATCH 2/3] Display code coverage from coverall --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81c94f82..a14f677b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # PHP OpenStack SDK [![Build Status](https://travis-ci.org/php-opencloud/openstack.svg?branch=master)](https://travis-ci.org/php-opencloud/openstack) -[![Code Coverage](https://scrutinizer-ci.com/g/php-opencloud/openstack/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/php-opencloud/openstack/?branch=master) +![Coveralls github](https://img.shields.io/coveralls/github/php-opencloud/openstack/master.svg?style=flat) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/php-opencloud/openstack/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/php-opencloud/openstack/?branch=master) `php-opencloud/openstack` is an SDK which allows PHP developers to easily connect to OpenStack APIs in a simple and From 6626533b473d67551396ddfe9214e5899b54dfa7 Mon Sep 17 00:00:00 2001 From: Ha Phan Date: Tue, 13 Mar 2018 14:13:21 +0800 Subject: [PATCH 3/3] Re-organise README.md --- README.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a14f677b..9b3d0684 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # PHP OpenStack SDK [![Build Status](https://travis-ci.org/php-opencloud/openstack.svg?branch=master)](https://travis-ci.org/php-opencloud/openstack) -![Coveralls github](https://img.shields.io/coveralls/github/php-opencloud/openstack/master.svg?style=flat) +[![Coveralls github](https://img.shields.io/coveralls/github/php-opencloud/openstack/master.svg?style=flat-square)](https://coveralls.io/github/php-opencloud/openstack) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/php-opencloud/openstack/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/php-opencloud/openstack/?branch=master) `php-opencloud/openstack` is an SDK which allows PHP developers to easily connect to OpenStack APIs in a simple and @@ -15,12 +15,11 @@ OpenStack services, and versions of services, are supported. * [Contributing guide](/CONTRIBUTING.md) * [Code of Conduct](/CODE_OF_CONDUCT.md) -## Backward incompatibility +## Getting help + +- Meet us on Slack: https://phpopencloud.slack.com ([Get your invitation](https://launchpass.com/phpopencloud)) +- Report and issue: https://github.com/php-opencloud/openstack/issues -Due to new [object typehint](https://wiki.php.net/rfc/object-typehint) since PHP 7.2, `Object` is a reserved keyword -thus class `OpenStack\ObjectStore\v1\Models\Object` had to be renamed to -`OpenStack\ObjectStore\v1\Models\StorageObject`. See [#184](https://github.com/php-opencloud/openstack/pull/184) for -details. ### Version Guidance @@ -29,14 +28,18 @@ details. | `^2.0` | Maintained (Bug fixes only) | `>=7.0,<7.2` | March 2016 - March 2018 | | `^3.0` | Latest | `^7.0` | March 2018 - March 2020 | -## Getting help - -- Meet us on Slack: https://phpopencloud.slack.com ([Get your invitation](https://launchpass.com/phpopencloud)) -- Report and issue: https://github.com/php-opencloud/openstack/issues +## Upgrade from 2.x to 3.x + +Due to new [object typehint](https://wiki.php.net/rfc/object-typehint) since PHP 7.2, `Object` is a reserved keyword +thus class `OpenStack\ObjectStore\v1\Models\Object` had to be renamed to +`OpenStack\ObjectStore\v1\Models\StorageObject`. + +This change was introduced in [#184](https://github.com/php-opencloud/openstack/pull/184). ## Requirements * PHP 7.0 +* `ext-curl` ## How to install @@ -51,4 +54,4 @@ taken the time to write a [contributing guide](CONTRIBUTING.md) for folks intere If you're not sure how you can get involved, feel free to [submit an issue](https://github.com/php-opencloud/openstack/issues/new) or [contact us](https://developer.rackspace.com/support/). You don't need to be a PHP expert - all members of the -community are welcome! +community are welcome! \ No newline at end of file