Merge pull request #198 from php-opencloud/php-7.2

Merge branch php-7.2 to master

Author: haphan

.php_cs.dist

@@ -0,0 +1,19 @@
+<?php
+if (!file_exists(__DIR__.'/src')) {
+    exit(0);
+}
+return PhpCsFixer\Config::create()
+    ->setRules(
+        [
+            '@PSR2'                => true,
+            'array_syntax'         => ['syntax' => 'short'],
+            'protected_to_private' => false
+        ]
+    )
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__.'/src')
+            ->append([__FILE__, __DIR__.'/samples'])
+    );

.travis.yml

@@ -2,8 +2,6 @@ language: php
 
 sudo: false
 
-dist: precise
-
 cache:
   directories:
     - $HOME/.composer/cache
@@ -12,6 +10,7 @@ matrix:
   include:
     - php: 7.0
     - php: 7.1
+    - php: 7.2
     - php: nightly
   allow_failures:
     - php: nightly
@@ -25,7 +24,7 @@ before_install:
 before_script:
   - composer install --prefer-source
   - vendor/bin/parallel-lint --exclude vendor .
-  - vendor/bin/php-cs-fixer fix --dry-run --diff --level psr2 .
+  - vendor/bin/php-cs-fixer fix --dry-run --diff
   - phpenv config-add ./xdebug.ini
 
 after_script:

README.md

@@ -12,11 +12,23 @@ OpenStack services, and versions of services, are supported.
 
 * [Official documentation](http://docs.os.php-opencloud.com/)
 * [Reference documentation](http://refdocs.os.php-opencloud.com)
-* [Developer support](https://developer.rackspace.com/)
-* [Mailing list](https://groups.google.com/forum/#!forum/php-opencloud)
 * [Contributing guide](/CONTRIBUTING.md)
 * [Code of Conduct](/CODE_OF_CONDUCT.md)
 
+## Backward incompatibility
+
+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   | Status                      | PHP Version   | Life span               |
+| --------- | --------------------------- | ------------- | ----------------------- |
+| `^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))

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.*",
-        "friendsofphp/php-cs-fixer": "^1.0"
+        "friendsofphp/php-cs-fixer": "^2.9"
     }
 }

doc/services/object-store/v1/objects.rst

@@ -27,7 +27,7 @@ Download an object
 ------------------
 
 .. sample:: object_store/v1/objects/download.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Object.html#method_download
+.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download
 
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
 consult `Guzzle's docs`_.
@@ -88,19 +88,19 @@ Copy object
 -----------
 
 .. sample:: object_store/v1/objects/copy.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Object.html#method_copy
+.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy
 
 Delete object
 -------------
 
 .. sample:: object_store/v1/objects/delete.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Object.html#method_delete
+.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete
 
 Get metadata
 ------------
 
 .. sample:: object_store/v1/objects/get_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Object.html#method_getMetadata
+.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
 correspond to the values set either when the object was created, or when a previous ``mergeMetadata`` or
@@ -110,7 +110,7 @@ Replace all metadata with new values
 ------------------------------------
 
 .. sample:: object_store/v1/objects/reset_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Object.html#method_resetMetadata
+.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
 items which not specified in the new set will be removed. For example, say an account has the following metadata
@@ -140,7 +140,7 @@ Merge new metadata values with existing
 ---------------------------------------
 
 .. sample:: object_store/v1/objects/merge_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Object.html#method_mergeMetadata
+.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
 metadata items which are not specified in the new set will be preserved. For example, say an account has the following

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true" strict="true">
 
     <testsuites>
         <testsuite name="OpenStack">

samples/object_store/v1/objects/create.php

@@ -17,7 +17,7 @@
     'content' => '{objectContent}',
 ];
 
-/** @var \OpenStack\ObjectStore\v1\Models\Object $object */
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
 $object = $openstack->objectStoreV1()
                     ->getContainer('{containerName}')
                     ->createObject($options);

samples/object_store/v1/objects/create_from_stream.php

@@ -22,7 +22,7 @@
     'stream' => $stream,
 ];
 
-/** @var \OpenStack\ObjectStore\v1\Models\Object $object */
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
 $object = $openstack->objectStoreV1()
     ->getContainer('{containerName}')
     ->createObject($options);

samples/object_store/v1/objects/create_large_object.php

@@ -27,7 +27,7 @@
 $options['segmentContainer'] = 'test_segments';
 
 
-/** @var \OpenStack\ObjectStore\v1\Models\Object $object */
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
 $object = $openstack->objectStoreV1()
                     ->getContainer('test')
                     ->createLargeObject($options);

samples/object_store/v1/objects/get.php

@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-/** @var \OpenStack\ObjectStore\v1\Models\Object $object */
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
 $object = $openstack->objectStoreV1()
                     ->getContainer('{containerName}')
                     ->getObject('{objectName}');