Merge pull request #87 from nextcloud/os-bump

Bump php-opencloud/openstack to 3.0.5
nextcloud · Mar 19, 2018 · d18387e · d18387e
2 parents 8168fc1 + 8c59ad5
commit d18387e
Show file tree

Hide file tree

Showing 143 changed files with 1,778 additions and 1,534 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
 		"pear/archive_tar": "1.4.3",
 		"pear/pear-core-minimal": "^v1.10",
 		"phpseclib/phpseclib": "2.0.4",
-		"php-opencloud/openstack": "3.0.4",
+		"php-opencloud/openstack": "3.0.5",
 		"pimple/pimple": "3.2.3",
 		"punic/punic": "^1.6",
 		"sabre/dav": "^3.2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
@@ -379,9 +379,9 @@ private function findFileWithExtension($class, $ext)
                 $subPath = substr($subPath, 0, $lastPos);
                 $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -882,21 +882,6 @@
     'Icewind\\Streams\\PathWrapper' => $vendorDir . '/icewind/streams/src/PathWrapper.php',
     'Icewind\\Streams\\RetryWrapper' => $vendorDir . '/icewind/streams/src/RetryWrapper.php',
     'Icewind\\Streams\\SeekableWrapper' => $vendorDir . '/icewind/streams/src/SeekableWrapper.php',
-    'Icewind\\Streams\\Tests\\CallbackWrapperTest' => $vendorDir . '/icewind/streams/tests/CallbackWrapperTest.php',
-    'Icewind\\Streams\\Tests\\CountWrapperTest' => $vendorDir . '/icewind/streams/tests/CountWrapperTest.php',
-    'Icewind\\Streams\\Tests\\DirectoryFilter' => $vendorDir . '/icewind/streams/tests/DirectoryFilter.php',
-    'Icewind\\Streams\\Tests\\DirectoryWrapper' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php',
-    'Icewind\\Streams\\Tests\\DirectoryWrapperDummy' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php',
-    'Icewind\\Streams\\Tests\\DirectoryWrapperNull' => $vendorDir . '/icewind/streams/tests/DirectoryWrapper.php',
-    'Icewind\\Streams\\Tests\\FailWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php',
-    'Icewind\\Streams\\Tests\\IteratorDirectory' => $vendorDir . '/icewind/streams/tests/IteratorDirectory.php',
-    'Icewind\\Streams\\Tests\\NullWrapperTest' => $vendorDir . '/icewind/streams/tests/NullWrapperTest.php',
-    'Icewind\\Streams\\Tests\\PartialWrapper' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php',
-    'Icewind\\Streams\\Tests\\PathWrapper' => $vendorDir . '/icewind/streams/tests/PathWrapper.php',
-    'Icewind\\Streams\\Tests\\RetryWrapperTest' => $vendorDir . '/icewind/streams/tests/RetryWrapper.php',
-    'Icewind\\Streams\\Tests\\SeekableWrapper' => $vendorDir . '/icewind/streams/tests/SeekableWrapper.php',
-    'Icewind\\Streams\\Tests\\UrlCallBack' => $vendorDir . '/icewind/streams/tests/UrlCallBack.php',
-    'Icewind\\Streams\\Tests\\WrapperTest' => $vendorDir . '/icewind/streams/tests/WrapperTest.php',
     'Icewind\\Streams\\Url' => $vendorDir . '/icewind/streams/src/Url.php',
     'Icewind\\Streams\\UrlCallback' => $vendorDir . '/icewind/streams/src/UrlCallBack.php',
     'Icewind\\Streams\\Wrapper' => $vendorDir . '/icewind/streams/src/Wrapper.php',
@@ -1589,10 +1574,6 @@
     'SearchDAV\\Query\\Order' => $vendorDir . '/icewind/searchdav/src/Query/Order.php',
     'SearchDAV\\Query\\Query' => $vendorDir . '/icewind/searchdav/src/Query/Query.php',
     'SearchDAV\\Query\\Scope' => $vendorDir . '/icewind/searchdav/src/Query/Scope.php',
-    'SearchDAV\\Test\\DummyBackend' => $vendorDir . '/icewind/searchdav/tests/DummyBackend.php',
-    'SearchDAV\\Test\\PathHelperTest' => $vendorDir . '/icewind/searchdav/tests/PathHelperTest.php',
-    'SearchDAV\\Test\\QueryParserTest' => $vendorDir . '/icewind/searchdav/tests/QueryParserTest.php',
-    'SearchDAV\\Test\\SearchPluginTest' => $vendorDir . '/icewind/searchdav/tests/SearchPluginTest.php',
     'SearchDAV\\XML\\BasicSearch' => $vendorDir . '/icewind/searchdav/src/XML/BasicSearch.php',
     'SearchDAV\\XML\\BasicSearchSchema' => $vendorDir . '/icewind/searchdav/src/XML/BasicSearchSchema.php',
     'SearchDAV\\XML\\Limit' => $vendorDir . '/icewind/searchdav/src/XML/Limit.php',

diff --git a/composer/autoload_real.php b/composer/autoload_real.php
@@ -24,7 +24,7 @@ public static function getLoader()
         spl_autoload_unregister(array('ComposerAutoloaderInit2f23f73bc0cc116b4b1eee1521aa8652', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
-        $includePaths[] = get_include_path();
+        array_push($includePaths, get_include_path());
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());

diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -1243,21 +1243,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Icewind\\Streams\\PathWrapper' => __DIR__ . '/..' . '/icewind/streams/src/PathWrapper.php',
         'Icewind\\Streams\\RetryWrapper' => __DIR__ . '/..' . '/icewind/streams/src/RetryWrapper.php',
         'Icewind\\Streams\\SeekableWrapper' => __DIR__ . '/..' . '/icewind/streams/src/SeekableWrapper.php',
-        'Icewind\\Streams\\Tests\\CallbackWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/CallbackWrapperTest.php',
-        'Icewind\\Streams\\Tests\\CountWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/CountWrapperTest.php',
-        'Icewind\\Streams\\Tests\\DirectoryFilter' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryFilter.php',
-        'Icewind\\Streams\\Tests\\DirectoryWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php',
-        'Icewind\\Streams\\Tests\\DirectoryWrapperDummy' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php',
-        'Icewind\\Streams\\Tests\\DirectoryWrapperNull' => __DIR__ . '/..' . '/icewind/streams/tests/DirectoryWrapper.php',
-        'Icewind\\Streams\\Tests\\FailWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php',
-        'Icewind\\Streams\\Tests\\IteratorDirectory' => __DIR__ . '/..' . '/icewind/streams/tests/IteratorDirectory.php',
-        'Icewind\\Streams\\Tests\\NullWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/NullWrapperTest.php',
-        'Icewind\\Streams\\Tests\\PartialWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php',
-        'Icewind\\Streams\\Tests\\PathWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/PathWrapper.php',
-        'Icewind\\Streams\\Tests\\RetryWrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/RetryWrapper.php',
-        'Icewind\\Streams\\Tests\\SeekableWrapper' => __DIR__ . '/..' . '/icewind/streams/tests/SeekableWrapper.php',
-        'Icewind\\Streams\\Tests\\UrlCallBack' => __DIR__ . '/..' . '/icewind/streams/tests/UrlCallBack.php',
-        'Icewind\\Streams\\Tests\\WrapperTest' => __DIR__ . '/..' . '/icewind/streams/tests/WrapperTest.php',
         'Icewind\\Streams\\Url' => __DIR__ . '/..' . '/icewind/streams/src/Url.php',
         'Icewind\\Streams\\UrlCallback' => __DIR__ . '/..' . '/icewind/streams/src/UrlCallBack.php',
         'Icewind\\Streams\\Wrapper' => __DIR__ . '/..' . '/icewind/streams/src/Wrapper.php',
@@ -1950,10 +1935,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'SearchDAV\\Query\\Order' => __DIR__ . '/..' . '/icewind/searchdav/src/Query/Order.php',
         'SearchDAV\\Query\\Query' => __DIR__ . '/..' . '/icewind/searchdav/src/Query/Query.php',
         'SearchDAV\\Query\\Scope' => __DIR__ . '/..' . '/icewind/searchdav/src/Query/Scope.php',
-        'SearchDAV\\Test\\DummyBackend' => __DIR__ . '/..' . '/icewind/searchdav/tests/DummyBackend.php',
-        'SearchDAV\\Test\\PathHelperTest' => __DIR__ . '/..' . '/icewind/searchdav/tests/PathHelperTest.php',
-        'SearchDAV\\Test\\QueryParserTest' => __DIR__ . '/..' . '/icewind/searchdav/tests/QueryParserTest.php',
-        'SearchDAV\\Test\\SearchPluginTest' => __DIR__ . '/..' . '/icewind/searchdav/tests/SearchPluginTest.php',
         'SearchDAV\\XML\\BasicSearch' => __DIR__ . '/..' . '/icewind/searchdav/src/XML/BasicSearch.php',
         'SearchDAV\\XML\\BasicSearchSchema' => __DIR__ . '/..' . '/icewind/searchdav/src/XML/BasicSearchSchema.php',
         'SearchDAV\\XML\\Limit' => __DIR__ . '/..' . '/icewind/searchdav/src/XML/Limit.php',

diff --git a/composer/installed.json b/composer/installed.json
@@ -1972,72 +1972,6 @@
             "exception"
         ]
     },
-    {
-        "name": "php-opencloud/openstack",
-        "version": "v3.0.4",
-        "version_normalized": "3.0.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-opencloud/openstack.git",
-            "reference": "92109146fb6f4168afc5a27dfdc6f2c8317a0e29"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/92109146fb6f4168afc5a27dfdc6f2c8317a0e29",
-            "reference": "92109146fb6f4168afc5a27dfdc6f2c8317a0e29",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": "~6.1",
-            "justinrainbow/json-schema": "~5.2",
-            "php": "~7.0"
-        },
-        "require-dev": {
-            "friendsofphp/php-cs-fixer": "^2.9",
-            "jakub-onderka/php-parallel-lint": "0.*",
-            "phpunit/phpunit": "^6.5",
-            "psr/log": "~1.0",
-            "sami/sami": "dev-master",
-            "satooshi/php-coveralls": "~1.0"
-        },
-        "time": "2018-02-16T08:28:10+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "OpenStack\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "Apache-2.0"
-        ],
-        "authors": [
-            {
-                "name": "Jamie Hannaford",
-                "email": "jamie.hannaford@rackspace.com",
-                "homepage": "https://github.com/jamiehannaford"
-            },
-            {
-                "name": "Ha Phan",
-                "email": "thanhha.work@gmail.com",
-                "homepage": "https://github.com/haphan"
-            }
-        ],
-        "description": "PHP SDK for OpenStack APIs. Supports BlockStorage, Compute, Identity, Images, Networking and Metric Gnocchi",
-        "homepage": "https://github.com/php-opencloud/openstack",
-        "keywords": [
-            "Openstack",
-            "api",
-            "php",
-            "sdk"
-        ]
-    },
     {
         "name": "phpseclib/phpseclib",
         "version": "2.0.4",
@@ -3423,5 +3357,71 @@
         ],
         "description": "Symfony Translation Component",
         "homepage": "https://symfony.com"
+    },
+    {
+        "name": "php-opencloud/openstack",
+        "version": "v3.0.5",
+        "version_normalized": "3.0.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-opencloud/openstack.git",
+            "reference": "2883c92cdfe05d4a11533497c2b74cc018c7cf0b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/2883c92cdfe05d4a11533497c2b74cc018c7cf0b",
+            "reference": "2883c92cdfe05d4a11533497c2b74cc018c7cf0b",
+            "shasum": ""
+        },
+        "require": {
+            "guzzlehttp/guzzle": "~6.1",
+            "justinrainbow/json-schema": "~5.2",
+            "php": "~7.0"
+        },
+        "require-dev": {
+            "friendsofphp/php-cs-fixer": "^2.9",
+            "jakub-onderka/php-parallel-lint": "^1.0",
+            "phpunit/phpunit": "^6.5",
+            "psr/log": "^1.0",
+            "sami/sami": "dev-master",
+            "satooshi/php-coveralls": "^2.0"
+        },
+        "time": "2018-03-13T10:03:02+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "OpenStack\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "Apache-2.0"
+        ],
+        "authors": [
+            {
+                "name": "Jamie Hannaford",
+                "email": "jamie.hannaford@rackspace.com",
+                "homepage": "https://github.com/jamiehannaford"
+            },
+            {
+                "name": "Ha Phan",
+                "email": "thanhha.work@gmail.com",
+                "homepage": "https://github.com/haphan"
+            }
+        ],
+        "description": "PHP SDK for OpenStack APIs. Supports BlockStorage, Compute, Identity, Images, Networking and Metric Gnocchi",
+        "homepage": "https://github.com/php-opencloud/openstack",
+        "keywords": [
+            "Openstack",
+            "api",
+            "php",
+            "sdk"
+        ]
     }
 ]
diff --git a/php-opencloud/openstack/.php_cs.dist b/php-opencloud/openstack/.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)

diff --git a/php-opencloud/openstack/README.md b/php-opencloud/openstack/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
 
@@ -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!
diff --git a/php-opencloud/openstack/composer.json b/php-opencloud/openstack/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/php-opencloud/openstack/phpunit.xml.dist b/php-opencloud/openstack/phpunit.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>