Merge pull request #18 from laszlof/merge-latest

Merge in latest upstream

Author: clwells

.php_cs.dist

@@ -1,13 +1,17 @@
 <?php
+
 if (!file_exists(__DIR__.'/src')) {
     exit(0);
 }
+
 return PhpCsFixer\Config::create()
     ->setRules(
         [
-            '@PSR2'                => true,
-            'array_syntax'         => ['syntax' => 'short'],
-            'protected_to_private' => false
+            '@PSR2'                  => true,
+            '@Symfony'               => true,
+            'array_syntax'           => ['syntax' => 'short'],
+            'binary_operator_spaces' => ['default' => 'align'],
+            'protected_to_private'   => false,
         ]
     )
     ->setUsingCache(false)

.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
+    - thanhha.work@gmail.com

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 
@@ -10,33 +10,36 @@ OpenStack services, and versions of services, are supported.
 
 ## Links
 
-* [Official documentation](http://docs.os.php-opencloud.com/)
+* [Official documentation](https://php-openstack-sdk.readthedocs.io/en/latest/)
 * [Reference documentation](http://refdocs.os.php-opencloud.com)
 * [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
 
@@ -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!

composer.json

@@ -32,23 +32,21 @@
             "OpenStack\\Integration\\": "tests/integration/"
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/php-opencloud/Sami"
-        }
-    ],
     "require": {
         "php": "~7.0",
-        "guzzlehttp/guzzle": "~6.1",
-        "justinrainbow/json-schema": "~5.2"
+        "guzzlehttp/guzzle": "^6.1",
+        "justinrainbow/json-schema": "^5.2"
     },
     "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.*",
-        "friendsofphp/php-cs-fixer": "^2.9"
+        "psr/log": "^1.0",
+        "php-coveralls/php-coveralls": "^2.0",
+        "jakub-onderka/php-parallel-lint": "^1.0",
+        "friendsofphp/php-cs-fixer": "^2.13"
+    },
+    "extra": {
+        "branch-alias": {
+           "dev-master": "3.0-dev"
+        }
     }
 }

doc/_exts/samples.py

@@ -32,7 +32,10 @@ def run(self):
 def visit_download_reference(self, node):
   self.context.append('<a href="javascript:void(0);" class="toggle btn">Show auth code</a>')
 
+def depart_download_reference(self, node):
+  self.body.append(self.context.pop())
+
 def setup(app):
-  app.add_node(download_reference, html=(visit_download_reference, HTMLTranslator.depart_download_reference))
+  app.add_node(download_reference, html=(visit_download_reference, depart_download_reference))
   app.add_directive('sample', Sample)
   return {'version': '0.1'}

doc/conf.py

@@ -23,7 +23,7 @@
 lexers['php-annotations'] = PhpLexer(startinline=True, linenos=1)
 primary_domain = 'php'
 
-extensions = ['sphinxcontrib.phpdomain', 'samples', 'refdoc']
+extensions = ['samples', 'refdoc', 'sphinx.ext.autodoc', 'sphinx.ext.autosummary', 'sphinxcontrib.phpdomain']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'php-opencloud'

doc/services/identity/v2/authentication.rst

@@ -0,0 +1,12 @@
+Authentication
+==============
+
+Identity v2.0
+-------------
+
+We recommend users to use identity v3 when possible.
+
+RackSpace cloud and OVH cloud, however, are still using Keystone v2.0. This following code will work for such providers.
+
+
+.. sample:: identity/v2/authentication.php

doc/services/identity/v2/index.rst

@@ -0,0 +1,7 @@
+Identity v2
+===========
+
+.. toctree::
+    :maxdepth: 3
+
+    authentication

doc/services/networking/v2/index.rst

@@ -6,4 +6,8 @@ Networking v2
 
     networks
     subnets
-    ports
+    ports
+    loadbalancers
+    loadbalancer-pools
+    loadbalancer-listeners
+    loadbalancer-healthmonitors

doc/services/networking/v2/loadbalancer-healthmonitors.rst

@@ -1,32 +1,32 @@
 LoadBalancer HealthMonitors
-=====
+===========================
 
 Create HealthMonitor
------------
+--------------------
 
 .. sample:: networking/v2/lbaas/healthmonitors/create.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerHealthMonitor
 
 Get HealthMonitor
------------
+-----------------
 
 .. sample:: networking/v2/lbaas/healthmonitors/get.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerHealthMonitor
 
 List HealthMonitors
------------
+-------------------
 
 .. sample:: networking/v2/lbaas/healthmonitors/list.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerHealthMonitors
 
 Update HealthMonitor
------------
+--------------------
 
 .. sample:: networking/v2/lbaas/healthmonitors/update.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_update
 
 Delete HealthMonitor
------------
+--------------------
 
 .. sample:: networking/v2/lbaas/healthmonitors/delete.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_delete