Merge pull request php-opencloud#228 from php-opencloud/backport

haphan · web-flow · commit 28a60087f3fb · 2018-03-14T09:58:20.000+08:00
Bumped dependencies to remove guzzle/guzzle
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,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/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)
+[![Coverage Status](https://coveralls.io/repos/github/php-opencloud/openstack/badge.svg?branch=master)](https://coveralls.io/github/php-opencloud/openstack?branch=master)
 [![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,28 +15,31 @@ 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 an 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
+## Version Guidance
 
-| Version   | Status                      | PHP Version   | Life span               |
+| Version   | Status                      | PHP Version   | End of life             |
 | --------- | --------------------------- | ------------- | ----------------------- |
-| `^2.0`    | Maintained (Bug fixes only) | `>=7.0,<7.2`  | March 2016 - March 2018 |
-| `^3.0`    | Latest                      | `>=7.0`       | March 2018 - March 2020 |
+| `^3.0`    | Latest                      | `>=7.0`       | March 2020              |
+| `^2.0`    | Maintained (Bug fixes only) | `>=7.0,<7.2`  | March 2018              |
 
-## 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
 
diff --git a/composer.json b/composer.json
@@ -44,11 +44,11 @@
         "justinrainbow/json-schema": "~5.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
+        "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"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-
+<phpunit bootstrap="./vendor/autoload.php" colors="true" strict="true">
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
     <testsuites>
         <testsuite name="OpenStack">
             <directory>tests/unit</directory>
@@ -18,4 +20,4 @@
         </whitelist>
     </filter>
 
-</phpunit>
+</phpunit>
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
@@ -672,7 +672,8 @@ private function attachVolumeToServer()
 
         $this->volume->waitUntil('in-use');
 
-        $this->logStep('Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',
+        $this->logStep(
+            'Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',
             array_merge($replacements, ['{volumeAttachmentId}' => $volumeAttachment->id])
         );
     }
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
@@ -5,7 +5,7 @@
 use OpenStack\Common\Resource\Deletable;
 use Psr\Log\LoggerInterface;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestInterface
+abstract class TestCase extends \PHPUnit\Framework\TestCase implements TestInterface
 {
     protected $logger;
     private $startPoint;
diff --git a/tests/unit/Common/Api/OperationTest.php b/tests/unit/Common/Api/OperationTest.php
@@ -6,7 +6,7 @@
 use OpenStack\Common\Api\Parameter;
 use OpenStack\Test\Fixtures\ComputeV2Api;
 
-class OperationTest extends \PHPUnit_Framework_TestCase
+class OperationTest extends \PHPUnit\Framework\TestCase
 {
     private $operation;
 
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -48,13 +48,17 @@ public function test_it_sends_a_request_when_operations_are_executed()
         $this->client->request('GET', 'test', ['headers' => []])->willReturn(new Response());
 
         $this->operator->execute($this->def, []);
+
+        $this->addToAssertionCount(1);
     }
 
     public function test_it_sends_a_request_when_async_operations_are_executed()
     {
         $this->client->requestAsync('GET', 'test', ['headers' => []])->willReturn(new Promise());
 
         $this->operator->executeAsync($this->def, []);
+
+        $this->addToAssertionCount(1);
     }
 
     public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_to_method_name()
@@ -90,10 +94,12 @@ public function test_it_returns_a_model_instance()
     {
         $this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class));
     }
+
     public function test_it_populates_models_from_response()
     {
         $this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, new Response(200)));
     }
+
     public function test_it_populates_models_from_arrays()
     {
         $data = ['flavor' => [], 'image' => []];
diff --git a/tests/unit/Common/Api/ParameterTest.php b/tests/unit/Common/Api/ParameterTest.php
@@ -5,7 +5,7 @@
 use OpenStack\Common\Api\Parameter;
 use OpenStack\Test\Fixtures\ComputeV2Api;
 
-class ParameterTest extends \PHPUnit_Framework_TestCase
+class ParameterTest extends \PHPUnit\Framework\TestCase
 {
     private $param;
     private $data;
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
@@ -13,12 +13,12 @@
 use OpenStack\Common\Error\Builder;
 use OpenStack\Common\Error\UserInputError;
 
-class BuilderTest extends \PHPUnit_Framework_TestCase
+class BuilderTest extends \PHPUnit\Framework\TestCase
 {
     private $builder;
     private $client;
 
-    public function __construct()
+    public function setUp()
     {
         $this->client = $this->prophesize(ClientInterface::class);
         $this->builder = new Builder($this->client->reveal());
diff --git a/tests/unit/Common/JsonPathTest.php b/tests/unit/Common/JsonPathTest.php
@@ -4,7 +4,7 @@
 
 use OpenStack\Common\JsonPath;
 
-class JsonPathTest extends \PHPUnit_Framework_TestCase
+class JsonPathTest extends \PHPUnit\Framework\TestCase
 {
     private $jsonPath;
 
diff --git a/tests/unit/Common/Transport/JsonSerializerTest.php b/tests/unit/Common/Transport/JsonSerializerTest.php
@@ -8,7 +8,7 @@
 use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Transport\JsonSerializer;
 
-class JsonSerializerTest extends \PHPUnit_Framework_TestCase
+class JsonSerializerTest extends \PHPUnit\Framework\TestCase
 {
     /** @var JsonSerializer */
     private $serializer;
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
@@ -49,20 +49,34 @@ public function test_it_retrieves()
 
         $this->floatingIp->retrieve();
 
-        $this->assertEquals('376da547-b977-4cfe-9cba-275c80debf57',
-                            $this->floatingIp->floatingNetworkId);
-        $this->assertEquals('d23abc8d-2991-4a55-ba98-2aaea84cc72f',
-                            $this->floatingIp->routerId);
-        $this->assertEquals('10.0.0.3',
-                            $this->floatingIp->fixedIpAddress);
-        $this->assertEquals('172.24.4.228',
-                            $this->floatingIp->floatingIpAddress);
-        $this->assertEquals('4969c491a3c74ee4af974e6d800c62de',
-                            $this->floatingIp->tenantId);
+        $this->assertEquals(
+            '376da547-b977-4cfe-9cba-275c80debf57',
+                            $this->floatingIp->floatingNetworkId
+        );
+        $this->assertEquals(
+            'd23abc8d-2991-4a55-ba98-2aaea84cc72f',
+                            $this->floatingIp->routerId
+        );
+        $this->assertEquals(
+            '10.0.0.3',
+                            $this->floatingIp->fixedIpAddress
+        );
+        $this->assertEquals(
+            '172.24.4.228',
+                            $this->floatingIp->floatingIpAddress
+        );
+        $this->assertEquals(
+            '4969c491a3c74ee4af974e6d800c62de',
+                            $this->floatingIp->tenantId
+        );
         $this->assertEquals('ACTIVE', $this->floatingIp->status);
-        $this->assertEquals('ce705c24-c1ef-408a-bda3-7bbd946164ab',
-                            $this->floatingIp->portId);
-        $this->assertEquals('2f245a7b-796b-4f26-9cf9-9e82d248fda7',
-                            $this->floatingIp->id);
+        $this->assertEquals(
+            'ce705c24-c1ef-408a-bda3-7bbd946164ab',
+                            $this->floatingIp->portId
+        );
+        $this->assertEquals(
+            '2f245a7b-796b-4f26-9cf9-9e82d248fda7',
+                            $this->floatingIp->id
+        );
     }
 }
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
@@ -8,7 +8,7 @@
 use GuzzleHttp\Psr7\Response;
 use Prophecy\Argument;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     /** @var \Prophecy\Prophecy\ObjectProphecy */
     protected $client;

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,8 @@ private function attachVolumeToServer()`
`672`	`672`
`673`	`673`	`$this->volume->waitUntil('in-use');`
`674`	`674`
`675`		`- $this->logStep('Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',`
	`675`	`+ $this->logStep(`
	`676`	`+ 'Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',`
`676`	`677`	`array_merge($replacements, ['{volumeAttachmentId}' => $volumeAttachment->id])`
`677`	`678`	`);`
`678`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use OpenStack\Common\Resource\Deletable;`
`6`	`6`	`use Psr\Log\LoggerInterface;`
`7`	`7`
`8`		`-abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestInterface`
	`8`	`+abstract class TestCase extends \PHPUnit\Framework\TestCase implements TestInterface`
`9`	`9`	`{`
`10`	`10`	`protected $logger;`
`11`	`11`	`private $startPoint;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use OpenStack\Common\Api\Parameter;`
`7`	`7`	`use OpenStack\Test\Fixtures\ComputeV2Api;`
`8`	`8`
`9`		`-class OperationTest extends \PHPUnit_Framework_TestCase`
	`9`	`+class OperationTest extends \PHPUnit\Framework\TestCase`
`10`	`10`	`{`
`11`	`11`	`private $operation;`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,17 @@ public function test_it_sends_a_request_when_operations_are_executed()`
`48`	`48`	`$this->client->request('GET', 'test', ['headers' => []])->willReturn(new Response());`
`49`	`49`
`50`	`50`	`$this->operator->execute($this->def, []);`
	`51`	`+`
	`52`	`+ $this->addToAssertionCount(1);`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`public function test_it_sends_a_request_when_async_operations_are_executed()`
`54`	`56`	`{`
`55`	`57`	`$this->client->requestAsync('GET', 'test', ['headers' => []])->willReturn(new Promise());`
`56`	`58`
`57`	`59`	`$this->operator->executeAsync($this->def, []);`
	`60`	`+`
	`61`	`+ $this->addToAssertionCount(1);`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_to_method_name()`
`@@ -90,10 +94,12 @@ public function test_it_returns_a_model_instance()`
`90`	`94`	`{`
`91`	`95`	`$this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class));`
`92`	`96`	`}`
	`97`	`+`
`93`	`98`	`public function test_it_populates_models_from_response()`
`94`	`99`	`{`
`95`	`100`	`$this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, new Response(200)));`
`96`	`101`	`}`
	`102`	`+`
`97`	`103`	`public function test_it_populates_models_from_arrays()`
`98`	`104`	`{`
`99`	`105`	`$data = ['flavor' => [], 'image' => []];`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@`
`13`	`13`	`use OpenStack\Common\Error\Builder;`
`14`	`14`	`use OpenStack\Common\Error\UserInputError;`
`15`	`15`
`16`		`-class BuilderTest extends \PHPUnit_Framework_TestCase`
	`16`	`+class BuilderTest extends \PHPUnit\Framework\TestCase`
`17`	`17`	`{`
`18`	`18`	`private $builder;`
`19`	`19`	`private $client;`
`20`	`20`
`21`		`- public function __construct()`
	`21`	`+ public function setUp()`
`22`	`22`	`{`
`23`	`23`	`$this->client = $this->prophesize(ClientInterface::class);`
`24`	`24`	`$this->builder = new Builder($this->client->reveal());`