Merge pull request #403 from nextcloud/dependabot/composer/php-opencl…

…oud/openstack-3.0.7
nextcloud · Feb 27, 2020 · 7f4a8f5 · 7f4a8f5
2 parents 94e6a62 + 7b734f0
commit 7f4a8f5
Show file tree

Hide file tree

Showing 79 changed files with 109 additions and 716 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
 		"pear/archive_tar": "1.4.8",
 		"pear/pear-core-minimal": "^v1.10",
 		"phpseclib/phpseclib": "2.0.23",
-		"php-opencloud/openstack": "3.0.6",
+		"php-opencloud/openstack": "3.0.7",
 		"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/installed.json b/composer/installed.json
@@ -1583,28 +1583,28 @@
     },
     {
         "name": "justinrainbow/json-schema",
-        "version": "5.2.8",
-        "version_normalized": "5.2.8.0",
+        "version": "5.2.9",
+        "version_normalized": "5.2.9.0",
         "source": {
             "type": "git",
             "url": "https://github.com/justinrainbow/json-schema.git",
-            "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
+            "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-            "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+            "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
+            "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
         "require-dev": {
-            "friendsofphp/php-cs-fixer": "~2.2.20",
+            "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
             "json-schema/json-schema-test-suite": "1.2.0",
             "phpunit/phpunit": "^4.8.35"
         },
-        "time": "2019-01-14T23:55:14+00:00",
+        "time": "2019-09-25T14:49:45+00:00",
         "bin": [
             "bin/validate-json"
         ],
@@ -2445,17 +2445,17 @@
     },
     {
         "name": "php-opencloud/openstack",
-        "version": "v3.0.6",
-        "version_normalized": "3.0.6.0",
+        "version": "v3.0.7",
+        "version_normalized": "3.0.7.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-opencloud/openstack.git",
-            "reference": "3eba351cd04cf73a54984334e5da2fe4cf6efe1a"
+            "reference": "5d73ff577731fc473448c489acfca9730aa39c88"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/3eba351cd04cf73a54984334e5da2fe4cf6efe1a",
-            "reference": "3eba351cd04cf73a54984334e5da2fe4cf6efe1a",
+            "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/5d73ff577731fc473448c489acfca9730aa39c88",
+            "reference": "5d73ff577731fc473448c489acfca9730aa39c88",
             "shasum": ""
         },
         "require": {
@@ -2470,7 +2470,7 @@
             "phpunit/phpunit": "^6.5",
             "psr/log": "^1.0"
         },
-        "time": "2018-09-14T06:58:32+00:00",
+        "time": "2020-01-07T08:46:53+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {

diff --git a/justinrainbow/json-schema/.php_cs.dist b/justinrainbow/json-schema/.php_cs.dist
@@ -21,8 +21,11 @@ $config
         'phpdoc_order' => true,
         'phpdoc_summary' => false,
         'pre_increment' => false,
+        'increment_style' => false,
         'simplified_null_return' => false,
         'trailing_comma_in_multiline_array' => false,
+        'yoda_style' => false,
+        'phpdoc_types_order' => array('null_adjustment' => 'none', 'sort_algorithm' => 'none'),
     ))
     ->setFinder($finder)
 ;

diff --git a/justinrainbow/json-schema/composer.json b/justinrainbow/json-schema/composer.json
@@ -30,7 +30,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.2.20",
+        "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
         "json-schema/JSON-Schema-Test-Suite": "1.2.0",
         "phpunit/phpunit": "^4.8.35"
     },

diff --git a/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php b/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -150,6 +150,12 @@ protected function validateCommonProperties(&$value, $schema = null, JsonPointer
                         'required'
                     );
                 }
+            } else {
+                // If the value is both undefined and not required, skip remaining checks
+                // in this method which assume an actual, defined instance when validating.
+                if ($value instanceof self) {
+                    return;
+                }
             }
         }
 

diff --git a/justinrainbow/json-schema/src/JsonSchema/Validator.php b/justinrainbow/json-schema/src/JsonSchema/Validator.php
@@ -34,9 +34,7 @@ class Validator extends BaseConstraint
      * Both the php object and the schema are supposed to be a result of a json_decode call.
      * The validation works as defined by the schema proposal in http://json-schema.org.
      *
-     * Note that the first argument is passwd by reference, so you must pass in a variable.
-     *
-     * {@inheritdoc}
+     * Note that the first argument is passed by reference, so you must pass in a variable.
      */
     public function validate(&$value, $schema = null, $checkMode = null)
     {

diff --git a/php-opencloud/openstack/src/BlockStorage/v2/Models/Snapshot.php b/php-opencloud/openstack/src/BlockStorage/v2/Models/Snapshot.php
@@ -5,12 +5,12 @@
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
 use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 use OpenStack\Common\Transport\Utils;
@@ -85,8 +85,6 @@ public function retrieve()
 
     /**
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postSnapshots}
-     *
-     * @return Creatable
      */
     public function create(array $userOptions): Creatable
     {

diff --git a/php-opencloud/openstack/src/BlockStorage/v2/Models/Volume.php b/php-opencloud/openstack/src/BlockStorage/v2/Models/Volume.php
@@ -5,12 +5,12 @@
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
 use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 use OpenStack\Common\Transport\Utils;
@@ -111,8 +111,6 @@ public function retrieve()
 
     /**
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postVolumes}
-     *
-     * @return Creatable
      */
     public function create(array $userOptions): Creatable
     {
@@ -162,8 +160,6 @@ public function parseMetadata(ResponseInterface $response): array
 
     /**
      * Update the bootable status for a volume, mark it as a bootable volume.
-     *
-     * @param bool $bootable
      */
     public function setBootable(bool $bootable = true)
     {
@@ -172,8 +168,6 @@ public function setBootable(bool $bootable = true)
 
     /**
      * Sets the image metadata for a volume.
-     *
-     * @param array $metadata
      */
     public function setImageMetadata(array $metadata)
     {

diff --git a/php-opencloud/openstack/src/BlockStorage/v2/Models/VolumeType.php b/php-opencloud/openstack/src/BlockStorage/v2/Models/VolumeType.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\BlockStorage\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Updateable;
 
 /**
@@ -26,8 +26,6 @@ class VolumeType extends OperatorResource implements Listable, Creatable, Update
 
     /**
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postTypes}
-     *
-     * @return Creatable
      */
     public function create(array $userOptions): Creatable
     {

diff --git a/php-opencloud/openstack/src/BlockStorage/v2/Service.php b/php-opencloud/openstack/src/BlockStorage/v2/Service.php
@@ -20,8 +20,6 @@ class Service extends AbstractService
      * You must have enough volume storage quota remaining to create a volume of size requested.
      *
      * @param array $userOptions {@see Api::postVolumes}
-     *
-     * @return Volume
      */
     public function createVolume(array $userOptions): Volume
     {
@@ -33,8 +31,6 @@ public function createVolume(array $userOptions): Volume
      *
      * @param bool  $detail      if set to TRUE, more information will be returned
      * @param array $userOptions {@see Api::getVolumes}
-     *
-     * @return \Generator
      */
     public function listVolumes(bool $detail = false, array $userOptions = []): \Generator
     {
@@ -45,8 +41,6 @@ public function listVolumes(bool $detail = false, array $userOptions = []): \Gen
 
     /**
      * @param string $volumeId the UUID of the volume being retrieved
-     *
-     * @return Volume
      */
     public function getVolume(string $volumeId): Volume
     {
@@ -58,27 +52,17 @@ public function getVolume(string $volumeId): Volume
 
     /**
      * @param array $userOptions {@see Api::postTypes}
-     *
-     * @return VolumeType
      */
     public function createVolumeType(array $userOptions): VolumeType
     {
         return $this->model(VolumeType::class)->create($userOptions);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listVolumeTypes(): \Generator
     {
         return $this->model(VolumeType::class)->enumerate($this->api->getTypes(), []);
     }
 
-    /**
-     * @param string $typeId
-     *
-     * @return VolumeType
-     */
     public function getVolumeType(string $typeId): VolumeType
     {
         $type = $this->model(VolumeType::class);
@@ -89,29 +73,19 @@ public function getVolumeType(string $typeId): VolumeType
 
     /**
      * @param array $userOptions {@see Api::postSnapshots}
-     *
-     * @return Snapshot
      */
     public function createSnapshot(array $userOptions): Snapshot
     {
         return $this->model(Snapshot::class)->create($userOptions);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listSnapshots(bool $detail = false, array $userOptions = []): \Generator
     {
         $def = (true === $detail) ? $this->api->getSnapshotsDetail() : $this->api->getSnapshots();
 
         return $this->model(Snapshot::class)->enumerate($def, $userOptions);
     }
 
-    /**
-     * @param string $snapshotId
-     *
-     * @return Snapshot
-     */
     public function getSnapshot(string $snapshotId): Snapshot
     {
         $snapshot = $this->model(Snapshot::class);
@@ -122,10 +96,6 @@ public function getSnapshot(string $snapshotId): Snapshot
 
     /**
      * Shows A Quota for a tenant.
-     *
-     * @param string $tenantId
-     *
-     * @return QuotaSet
      */
     public function getQuotaSet(string $tenantId): QuotaSet
     {