diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-02-26 10:44:12 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-02-27 15:19:44 +0300 |
| commit | 7b734f0af57eb33c2884edc298234a49b67576dd (patch) | |
| tree | 1b386ab11cd3a2a94b93b5c9cf02dbb897e15731 /php-opencloud | |
| parent | 94e6a62bb98d6bab68206e4624a62064f4f15a8c (diff) | |
Bump php-opencloud/openstack from 3.0.6 to 3.0.7
Bumps [php-opencloud/openstack](https://github.com/php-opencloud/openstack) from 3.0.6 to 3.0.7.
- [Release notes](https://github.com/php-opencloud/openstack/releases)
- [Commits](https://github.com/php-opencloud/openstack/compare/v3.0.6...v3.0.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'php-opencloud')
72 files changed, 72 insertions, 686 deletions
diff --git a/php-opencloud/openstack/src/BlockStorage/v2/Models/Snapshot.php b/php-opencloud/openstack/src/BlockStorage/v2/Models/Snapshot.php index f87c93d4..f36dbeba 100644 --- a/php-opencloud/openstack/src/BlockStorage/v2/Models/Snapshot.php +++ b/php-opencloud/openstack/src/BlockStorage/v2/Models/Snapshot.php @@ -5,12 +5,12 @@ declare(strict_types=1); 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 @@ class Snapshot extends OperatorResource implements Listable, Creatable, Updateab /** * @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 index 01e8a1df..55e886b6 100644 --- a/php-opencloud/openstack/src/BlockStorage/v2/Models/Volume.php +++ b/php-opencloud/openstack/src/BlockStorage/v2/Models/Volume.php @@ -5,12 +5,12 @@ declare(strict_types=1); 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 @@ class Volume extends OperatorResource implements Creatable, Listable, Updateable /** * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postVolumes} - * - * @return Creatable */ public function create(array $userOptions): Creatable { @@ -162,8 +160,6 @@ class Volume extends OperatorResource implements Creatable, Listable, Updateable /** * 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 @@ class Volume extends OperatorResource implements Creatable, Listable, Updateable /** * 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 index ba6fffd1..c54425e2 100644 --- a/php-opencloud/openstack/src/BlockStorage/v2/Models/VolumeType.php +++ b/php-opencloud/openstack/src/BlockStorage/v2/Models/VolumeType.php @@ -4,10 +4,10 @@ declare(strict_types=1); 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 index 084594dc..5df79b55 100644 --- 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 @@ class Service extends AbstractService * * @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 @@ class Service extends AbstractService /** * @param string $volumeId the UUID of the volume being retrieved - * - * @return Volume */ public function getVolume(string $volumeId): Volume { @@ -58,27 +52,17 @@ class Service extends AbstractService /** * @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,17 +73,12 @@ class Service extends AbstractService /** * @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(); @@ -107,11 +86,6 @@ class Service extends AbstractService 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 @@ class Service extends AbstractService /** * Shows A Quota for a tenant. - * - * @param string $tenantId - * - * @return QuotaSet */ public function getQuotaSet(string $tenantId): QuotaSet { diff --git a/php-opencloud/openstack/src/Common/Api/Operation.php b/php-opencloud/openstack/src/Common/Api/Operation.php index e200b259..26278927 100644 --- a/php-opencloud/openstack/src/Common/Api/Operation.php +++ b/php-opencloud/openstack/src/Common/Api/Operation.php @@ -44,17 +44,11 @@ class Operation $this->params = self::toParamArray($definition['params']); } - /** - * @return string - */ public function getPath(): string { return $this->path; } - /** - * @return string - */ public function getMethod(): string { return $this->method; @@ -64,8 +58,6 @@ class Operation * Indicates whether this operation supports a parameter. * * @param $key The name of a parameter - * - * @return bool */ public function hasParam(string $key): bool { @@ -82,9 +74,6 @@ class Operation return isset($this->params[$name]) ? $this->params[$name] : null; } - /** - * @return string - */ public function getJsonKey(): string { return $this->jsonKey ?: ''; @@ -95,8 +84,6 @@ class Operation * {@see Parameter} objects. * * @param array $data A generic data array - * - * @return array */ public static function toParamArray(array $data): array { diff --git a/php-opencloud/openstack/src/Common/Api/OperatorInterface.php b/php-opencloud/openstack/src/Common/Api/OperatorInterface.php index 7bb10059..56219f49 100644 --- a/php-opencloud/openstack/src/Common/Api/OperatorInterface.php +++ b/php-opencloud/openstack/src/Common/Api/OperatorInterface.php @@ -28,8 +28,6 @@ interface OperatorInterface * * @param array $definition The data that dictates how the operation works * @param array $userValues The user-defined values that populate the request - * - * @return \Psr\Http\Message\ResponseInterface */ public function execute(array $definition, array $userValues = []): ResponseInterface; @@ -38,8 +36,6 @@ interface OperatorInterface * * @param array $definition The data that dictates how the operation works * @param array $userValues The user-defined values that populate the request - * - * @return \GuzzleHttp\Promise\PromiseInterface */ public function executeAsync(array $definition, array $userValues = []): PromiseInterface; @@ -48,8 +44,6 @@ interface OperatorInterface * HTTP client is also injected into the object to allow it to communicate with the remote API. * * @param array $definition The data that dictates how the operation works - * - * @return Operation */ public function getOperation(array $definition): Operation; @@ -57,8 +51,6 @@ interface OperatorInterface * @param string $class the name of the model class * @param mixed $data either a {@see ResponseInterface} or data array that will populate the newly * created model class - * - * @return \OpenStack\Common\Resource\ResourceInterface */ public function model(string $class, $data = null): ResourceInterface; } diff --git a/php-opencloud/openstack/src/Common/Api/OperatorTrait.php b/php-opencloud/openstack/src/Common/Api/OperatorTrait.php index 909acdf9..ccbe34ab 100644 --- a/php-opencloud/openstack/src/Common/Api/OperatorTrait.php +++ b/php-opencloud/openstack/src/Common/Api/OperatorTrait.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace OpenStack\Common\Api; -use GuzzleHttp\Promise\PromiseInterface; -use function GuzzleHttp\uri_template; use GuzzleHttp\ClientInterface; use GuzzleHttp\Promise\Promise; +use GuzzleHttp\Promise\PromiseInterface; +use function GuzzleHttp\uri_template; use OpenStack\Common\Resource\ResourceInterface; use OpenStack\Common\Transport\RequestSerializer; use Psr\Http\Message\ResponseInterface; @@ -99,10 +99,6 @@ trait OperatorTrait } /** - * @param Operation $operation - * @param array $userValues - * @param bool $async - * * @return mixed * * @throws \Exception diff --git a/php-opencloud/openstack/src/Common/Api/Parameter.php b/php-opencloud/openstack/src/Common/Api/Parameter.php index 389c626f..5d46d7e3 100644 --- a/php-opencloud/openstack/src/Common/Api/Parameter.php +++ b/php-opencloud/openstack/src/Common/Api/Parameter.php @@ -118,9 +118,6 @@ class Parameter */ private $enum; - /** - * @param array $data - */ public function __construct(array $data) { $this->hydrate($data); @@ -163,8 +160,6 @@ class Parameter /** * Retrieve the name that will be used over the wire. - * - * @return string */ public function getName(): string { @@ -173,8 +168,6 @@ class Parameter /** * Indicates whether the user must provide a value for this parameter. - * - * @return bool */ public function isRequired(): bool { @@ -207,24 +200,14 @@ class Parameter private function validateEnums($userValues) { if (!empty($this->enum) && 'string' == $this->type && !in_array($userValues, $this->enum)) { - throw new \Exception(sprintf( - 'The only permitted values are %s. You provided %s', - implode(', ', $this->enum), - print_r($userValues, true) - )); + throw new \Exception(sprintf('The only permitted values are %s. You provided %s', implode(', ', $this->enum), print_r($userValues, true))); } } private function validateType($userValues) { if (!$this->hasCorrectType($userValues)) { - throw new \Exception(sprintf( - 'The key provided "%s" has the wrong value type. You provided %s (%s) but was expecting %s', - $this->name, - print_r($userValues, true), - gettype($userValues), - $this->type - )); + throw new \Exception(sprintf('The key provided "%s" has the wrong value type. You provided %s (%s) but was expecting %s', $this->name, print_r($userValues, true), gettype($userValues), $this->type)); } } @@ -268,8 +251,6 @@ class Parameter * by this parameter. * * @param $userValue The value being checked - * - * @return bool */ private function hasCorrectType($userValue): bool { @@ -302,8 +283,6 @@ class Parameter /** * Indicates whether this parameter represents an array type. - * - * @return bool */ public function isArray(): bool { @@ -312,8 +291,6 @@ class Parameter /** * Indicates whether this parameter represents an object type. - * - * @return bool */ public function isObject(): bool { @@ -329,8 +306,6 @@ class Parameter * Verifies whether the given location matches the parameter's location. * * @param $value - * - * @return bool */ public function hasLocation($value): bool { @@ -359,8 +334,6 @@ class Parameter /** * Sets the name of the parameter to a new value. - * - * @param string $name */ public function setName(string $name) { @@ -372,7 +345,7 @@ class Parameter * * @param string $name The name of the child property * - * @return null|Parameter + * @return Parameter|null */ public function getProperty(string $name) { diff --git a/php-opencloud/openstack/src/Common/ArrayAccessTrait.php b/php-opencloud/openstack/src/Common/ArrayAccessTrait.php index beecc1d0..cbd709df 100644 --- a/php-opencloud/openstack/src/Common/ArrayAccessTrait.php +++ b/php-opencloud/openstack/src/Common/ArrayAccessTrait.php @@ -33,10 +33,6 @@ trait ArrayAccessTrait /** * Checks whether an internal key exists. - * - * @param string $offset - * - * @return bool */ public function offsetExists(string $offset): bool { @@ -45,8 +41,6 @@ trait ArrayAccessTrait /** * Unsets an internal key. - * - * @param string $offset */ public function offsetUnset(string $offset) { @@ -56,8 +50,6 @@ trait ArrayAccessTrait /** * Retrieves an internal key. * - * @param string $offset - * * @return mixed|null */ public function offsetGet(string $offset) diff --git a/php-opencloud/openstack/src/Common/Auth/AuthHandler.php b/php-opencloud/openstack/src/Common/Auth/AuthHandler.php index 19c9beda..e5a4e286 100644 --- a/php-opencloud/openstack/src/Common/Auth/AuthHandler.php +++ b/php-opencloud/openstack/src/Common/Auth/AuthHandler.php @@ -25,10 +25,6 @@ class AuthHandler /** @var Token */ private $token; - /** - * @param callable $nextHandler - * @param callable $tokenGenerator - */ public function __construct(callable $nextHandler, callable $tokenGenerator, Token $token = null) { $this->nextHandler = $nextHandler; @@ -41,9 +37,6 @@ class AuthHandler * checks to see whether a token is set and valid, and then sets the ``X-Auth-Token`` header * for the HTTP request before letting it continue on its merry way. * - * @param RequestInterface $request - * @param array $options - * * @return mixed|void */ public function __invoke(RequestInterface $request, array $options) @@ -66,10 +59,6 @@ class AuthHandler /** * Internal method which prevents infinite recursion. For certain requests, like the initial * auth call itself, we do NOT want to send a token. - * - * @param RequestInterface $request - * - * @return bool */ private function shouldIgnore(RequestInterface $request): bool { diff --git a/php-opencloud/openstack/src/Common/Error/Builder.php b/php-opencloud/openstack/src/Common/Error/Builder.php index 0a262e4a..f7ba9615 100644 --- a/php-opencloud/openstack/src/Common/Error/Builder.php +++ b/php-opencloud/openstack/src/Common/Error/Builder.php @@ -45,8 +45,6 @@ class Builder * Internal method used when outputting headers in the error description. * * @param $name - * - * @return string */ private function header(string $name): string { @@ -58,8 +56,6 @@ class Builder * directed off to a broken link. If a 404 is detected, it is hidden. * * @param $link The proposed link - * - * @return bool */ private function linkIsValid(string $link): bool { @@ -73,11 +69,7 @@ class Builder } /** - * @param MessageInterface $message - * * @codeCoverageIgnore - * - * @return string */ public function str(MessageInterface $message): string { @@ -110,8 +102,6 @@ class Builder * * @param RequestInterface $request The faulty request * @param ResponseInterface $response The error-filled response - * - * @return BadResponseError */ public function httpError(RequestInterface $request, ResponseInterface $response): BadResponseError { @@ -160,8 +150,6 @@ class Builder * @param string $expectedType The type that was expected from the user * @param mixed $userValue The incorrect value the user actually provided * @param string|null $furtherLink a link to further information if necessary (optional) - * - * @return UserInputError */ public function userInputError(string $expectedType, $userValue, string $furtherLink = null): UserInputError { diff --git a/php-opencloud/openstack/src/Common/Resource/AbstractResource.php b/php-opencloud/openstack/src/Common/Resource/AbstractResource.php index bfa1ef89..2dcf5632 100644 --- a/php-opencloud/openstack/src/Common/Resource/AbstractResource.php +++ b/php-opencloud/openstack/src/Common/Resource/AbstractResource.php @@ -38,8 +38,6 @@ abstract class AbstractResource implements ResourceInterface, Serializable /** * Populates the current resource from a response object. * - * @param ResponseInterface $response - * * @return AbstractResource */ public function populateFromResponse(ResponseInterface $response) @@ -57,8 +55,6 @@ abstract class AbstractResource implements ResourceInterface, Serializable /** * Populates the current resource from a data array. * - * @param array $array - * * @return mixed|void */ public function populateFromArray(array $array) @@ -100,8 +96,6 @@ abstract class AbstractResource implements ResourceInterface, Serializable /** * Internal method which retrieves the values of provided keys. * - * @param array $keys - * * @return array */ protected function getAttrs(array $keys) diff --git a/php-opencloud/openstack/src/Common/Resource/Alias.php b/php-opencloud/openstack/src/Common/Resource/Alias.php index 400339aa..69746f22 100644 --- a/php-opencloud/openstack/src/Common/Resource/Alias.php +++ b/php-opencloud/openstack/src/Common/Resource/Alias.php @@ -34,8 +34,7 @@ class Alias } /** - * @param ResourceInterface $resource - * @param mixed $value + * @param mixed $value * * @return mixed */ diff --git a/php-opencloud/openstack/src/Common/Resource/Creatable.php b/php-opencloud/openstack/src/Common/Resource/Creatable.php index 797f3cd4..80ac7570 100644 --- a/php-opencloud/openstack/src/Common/Resource/Creatable.php +++ b/php-opencloud/openstack/src/Common/Resource/Creatable.php @@ -12,8 +12,6 @@ interface Creatable /** * Create a new resource according to the configuration set in the options. * - * @param array $userOptions - * * @return self */ public function create(array $userOptions): Creatable; diff --git a/php-opencloud/openstack/src/Common/Resource/HasMetadata.php b/php-opencloud/openstack/src/Common/Resource/HasMetadata.php index 5bb3a265..8587fc17 100644 --- a/php-opencloud/openstack/src/Common/Resource/HasMetadata.php +++ b/php-opencloud/openstack/src/Common/Resource/HasMetadata.php @@ -11,8 +11,6 @@ interface HasMetadata /** * Retrieves the metadata for the resource in the form of an associative array or hash. Each key represents the * metadata item's name, and each value represents the metadata item's remote value. - * - * @return array */ public function getMetadata(): array; @@ -56,10 +54,6 @@ interface HasMetadata /** * Extracts metadata from a response object and returns it in the form of an associative array. - * - * @param ResponseInterface $response - * - * @return array */ public function parseMetadata(ResponseInterface $response): array; } diff --git a/php-opencloud/openstack/src/Common/Resource/HasWaiterTrait.php b/php-opencloud/openstack/src/Common/Resource/HasWaiterTrait.php index 44fe3075..7747fdbf 100644 --- a/php-opencloud/openstack/src/Common/Resource/HasWaiterTrait.php +++ b/php-opencloud/openstack/src/Common/Resource/HasWaiterTrait.php @@ -74,7 +74,6 @@ trait HasWaiterTrait * Internal method used to identify whether a timeout has been exceeded. * * @param bool|int $timeout - * @param int $startTime * * @return bool */ diff --git a/php-opencloud/openstack/src/Common/Resource/OperatorResource.php b/php-opencloud/openstack/src/Common/Resource/OperatorResource.php index ebd15074..35cf3186 100644 --- a/php-opencloud/openstack/src/Common/Resource/OperatorResource.php +++ b/php-opencloud/openstack/src/Common/Resource/OperatorResource.php @@ -33,8 +33,6 @@ abstract class OperatorResource extends AbstractResource implements OperatorInte * Will create a new instance of this class with the current HTTP client and API injected in. This * is useful when enumerating over a collection since multiple copies of the same resource class * are needed. - * - * @return OperatorResource */ public function newInstance(): OperatorResource { @@ -50,8 +48,6 @@ abstract class OperatorResource extends AbstractResource implements OperatorInte } /** - * @param array $definition - * * @return mixed */ public function executeWithState(array $definition) diff --git a/php-opencloud/openstack/src/Common/Resource/ResourceInterface.php b/php-opencloud/openstack/src/Common/Resource/ResourceInterface.php index 60420593..ae3249dd 100644 --- a/php-opencloud/openstack/src/Common/Resource/ResourceInterface.php +++ b/php-opencloud/openstack/src/Common/Resource/ResourceInterface.php @@ -15,15 +15,11 @@ interface ResourceInterface * All models which represent an API resource should be able to be populated * from a {@see ResponseInterface} object. * - * @param ResponseInterface $response - * * @return self */ public function populateFromResponse(ResponseInterface $response); /** - * @param array $data - * * @return mixed */ public function populateFromArray(array $data); diff --git a/php-opencloud/openstack/src/Common/Service/Builder.php b/php-opencloud/openstack/src/Common/Service/Builder.php index c687e064..8103aca7 100644 --- a/php-opencloud/openstack/src/Common/Service/Builder.php +++ b/php-opencloud/openstack/src/Common/Service/Builder.php @@ -119,8 +119,6 @@ class Builder } /** - * @param array $options - * * @codeCoverageIgnore */ private function stockAuthHandler(array &$options) @@ -167,10 +165,7 @@ class Builder } if (!isset($options['identityService']) || !($options['identityService'] instanceof IdentityService)) { - throw new \InvalidArgumentException(sprintf( - '"identityService" must be specified and implement %s', - IdentityService::class - )); + throw new \InvalidArgumentException(sprintf('"identityService" must be specified and implement %s', IdentityService::class)); } return $options; diff --git a/php-opencloud/openstack/src/Common/Transport/JsonSerializer.php b/php-opencloud/openstack/src/Common/Transport/JsonSerializer.php index db8255c9..5cd2e25b 100644 --- a/php-opencloud/openstack/src/Common/Transport/JsonSerializer.php +++ b/php-opencloud/openstack/src/Common/Transport/JsonSerializer.php @@ -61,8 +61,6 @@ class JsonSerializer * * @param Parameter $param The schema that defines how the JSON field is being populated * @param mixed $userValue The user value that is populating a JSON field - * - * @return array */ private function stockObjectJson(Parameter $param, \stdClass $userValue): array { @@ -81,8 +79,6 @@ class JsonSerializer * @param Parameter $param The schema that defines how the JSON field is being populated * @param mixed $userValue The user value that is populating a JSON field * @param array $json The existing JSON structure that will be populated - * - * @return array */ public function stockJson(Parameter $param, $userValue, array $json): array { @@ -101,11 +97,7 @@ class JsonSerializer if ($value instanceof Serializable) { $value = $value->serialize(); } elseif (!($value instanceof \stdClass)) { - throw new \InvalidArgumentException(sprintf( - 'When an object value is provided, it must either be \stdClass or implement the Serializable ' - .'interface, you provided %s', - print_r($value, true) - )); + throw new \InvalidArgumentException(sprintf('When an object value is provided, it must either be \stdClass or implement the Serializable '.'interface, you provided %s', print_r($value, true))); } } diff --git a/php-opencloud/openstack/src/Common/Transport/Middleware.php b/php-opencloud/openstack/src/Common/Transport/Middleware.php index e344b4fb..a601741f 100644 --- a/php-opencloud/openstack/src/Common/Transport/Middleware.php +++ b/php-opencloud/openstack/src/Common/Transport/Middleware.php @@ -15,9 +15,6 @@ use Psr\Log\LogLevel; final class Middleware { - /** - * @return callable - */ public static function httpErrors(): callable { return function (callable $handler) { @@ -35,10 +32,7 @@ final class Middleware } /** - * @param callable $tokenGenerator - * @param Token $token - * - * @return callable + * @param Token $token */ public static function authHandler(callable $tokenGenerator, Token $token = null): callable { diff --git a/php-opencloud/openstack/src/Common/Transport/Utils.php b/php-opencloud/openstack/src/Common/Transport/Utils.php index 88155f39..3b5a2681 100644 --- a/php-opencloud/openstack/src/Common/Transport/Utils.php +++ b/php-opencloud/openstack/src/Common/Transport/Utils.php @@ -30,9 +30,7 @@ class Utils if (JSON_ERROR_NONE !== json_last_error()) { $last = json_last_error(); - throw new \InvalidArgumentException( - 'Unable to parse JSON data: '.(isset($jsonErrors[$last]) ? $jsonErrors[$last] : 'Unknown error') - ); + throw new \InvalidArgumentException('Unable to parse JSON data: '.(isset($jsonErrors[$last]) ? $jsonErrors[$last] : 'Unknown error')); } return $data; @@ -58,8 +56,6 @@ class Utils * closing url separator when missing. * * @param string $url the url representation - * - * @return string */ public static function normalizeUrl(string $url): string { @@ -73,10 +69,7 @@ class Utils /** * Add an unlimited list of paths to a given URI. * - * @param UriInterface $uri - * @param ...$paths - * - * @return UriInterface + * @param ...$paths */ public static function addPaths(UriInterface $uri, ...$paths): UriInterface { diff --git a/php-opencloud/openstack/src/Compute/v2/Models/AvailabilityZone.php b/php-opencloud/openstack/src/Compute/v2/Models/AvailabilityZone.php index 095d7bbf..0d763099 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/AvailabilityZone.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/AvailabilityZone.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace OpenStack\Compute\v2\Models; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; /** * Represents a Compute v2 AvailabilityZone. diff --git a/php-opencloud/openstack/src/Compute/v2/Models/Flavor.php b/php-opencloud/openstack/src/Compute/v2/Models/Flavor.php index 2ba03fcf..1000aad4 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/Flavor.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/Flavor.php @@ -6,8 +6,8 @@ namespace OpenStack\Compute\v2\Models; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; /** diff --git a/php-opencloud/openstack/src/Compute/v2/Models/Host.php b/php-opencloud/openstack/src/Compute/v2/Models/Host.php index e9092116..ad6bbc0f 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/Host.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/Host.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace OpenStack\Compute\v2\Models; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; /** diff --git a/php-opencloud/openstack/src/Compute/v2/Models/Hypervisor.php b/php-opencloud/openstack/src/Compute/v2/Models/Hypervisor.php index e18cd5df..6710f949 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/Hypervisor.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/Hypervisor.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace OpenStack\Compute\v2\Models; use OpenStack\Common\Resource\Listable; -use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Resource\OperatorResource; +use OpenStack\Common\Resource\Retrievable; /** * @property \OpenStack\Compute\v2\Api $api diff --git a/php-opencloud/openstack/src/Compute/v2/Models/Image.php b/php-opencloud/openstack/src/Compute/v2/Models/Image.php index 4631460d..5bd88134 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/Image.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/Image.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Compute\v2\Models; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Deletable; use OpenStack\Common\Resource\HasMetadata; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Transport\Utils; use Psr\Http\Message\ResponseInterface; @@ -83,8 +83,6 @@ class Image extends OperatorResource implements Listable, Retrievable, Deletable /** * Retrieves metadata from the API. - * - * @return array */ public function getMetadata(): array { diff --git a/php-opencloud/openstack/src/Compute/v2/Models/Keypair.php b/php-opencloud/openstack/src/Compute/v2/Models/Keypair.php index 7efd6b21..065052e2 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/Keypair.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/Keypair.php @@ -6,9 +6,9 @@ namespace OpenStack\Compute\v2\Models; use OpenStack\Common\Resource\Alias; use OpenStack\Common\Resource\Creatable; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Deletable; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Transport\Utils; diff --git a/php-opencloud/openstack/src/Compute/v2/Models/Server.php b/php-opencloud/openstack/src/Compute/v2/Models/Server.php index 9e9b4b0d..e2390fd4 100644 --- a/php-opencloud/openstack/src/Compute/v2/Models/Server.php +++ b/php-opencloud/openstack/src/Compute/v2/Models/Server.php @@ -4,19 +4,19 @@ declare(strict_types=1); namespace OpenStack\Compute\v2\Models; +use OpenStack\BlockStorage\v2\Models\VolumeAttachment; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Resource\HasWaiterTrait; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; +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\Resource\OperatorResource; use OpenStack\Common\Transport\Utils; -use OpenStack\BlockStorage\v2\Models\VolumeAttachment; -use OpenStack\Networking\v2\Models\InterfaceAttachment; use OpenStack\Compute\v2\Enum; use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup; +use OpenStack\Networking\v2\Models\InterfaceAttachment; use Psr\Http\Message\ResponseInterface; /** @@ -248,8 +248,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Rescues the server. * * @param array $options {@see \OpenStack\Compute\v2\Api::rescueServer} - * - * @return string */ public function rescue(array $options): string { @@ -303,8 +301,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Gets the console output of the server. * * @param int $length the number of lines, by default all lines will be returned - * - * @return string */ public function getConsoleOutput(int $length = -1): string { @@ -324,8 +320,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * * @param string $type the type of VNC console: novnc|xvpvnc. * Defaults to novnc - * - * @return array */ public function getVncConsole($type = Enum::CONSOLE_NOVNC): array { @@ -338,8 +332,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Gets a RDP console for a server. * * @param string $type the type of VNC console: rdp-html5 (default) - * - * @return array */ public function getRDPConsole($type = Enum::CONSOLE_RDP_HTML5): array { @@ -352,8 +344,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Gets a Spice console for a server. * * @param string $type the type of VNC console: spice-html5 - * - * @return array */ public function getSpiceConsole($type = Enum::CONSOLE_SPICE_HTML5): array { @@ -366,8 +356,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Gets a serial console for a server. * * @param string $type the type of VNC console: serial - * - * @return array */ public function getSerialConsole($type = Enum::CONSOLE_SERIAL): array { @@ -406,8 +394,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl /** * Returns Generator for InterfaceAttachment. - * - * @return \Generator */ public function listInterfaceAttachments(array $options = []): \Generator { @@ -418,8 +404,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Gets an interface attachment. * * @param string $portId the unique ID of the port - * - * @return InterfaceAttachment */ public function getInterfaceAttachment(string $portId): InterfaceAttachment { @@ -435,8 +419,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Creates an interface attachment. * * @param array $userOptions {@see \OpenStack\Compute\v2\Api::postInterfaceAttachment} - * - * @return InterfaceAttachment */ public function createInterfaceAttachment(array $userOptions): InterfaceAttachment { @@ -451,8 +433,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl /** * Detaches an interface attachment. - * - * @param string $portId */ public function detachInterface(string $portId) { @@ -464,8 +444,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl /** * Retrieves metadata from the API. - * - * @return array */ public function getMetadata(): array { @@ -535,8 +513,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Add security group to a server (addSecurityGroup action). * * @param array $options {@see \OpenStack\Compute\v2\Api::postSecurityGroup} - * - * @return SecurityGroup */ public function addSecurityGroup(array $options): SecurityGroup { @@ -565,8 +541,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl /** * Returns Generator for SecurityGroups. - * - * @return \Generator */ public function listSecurityGroups(): \Generator { @@ -575,8 +549,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl /** * Returns Generator for VolumeAttachment. - * - * @return \Generator */ public function listVolumeAttachments(): \Generator { @@ -587,8 +559,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl * Attach a volume and returns volume that was attached. * * @param $volumeId - * - * @return VolumeAttachment */ public function attachVolume(string $volumeId): VolumeAttachment { diff --git a/php-opencloud/openstack/src/Compute/v2/Service.php b/php-opencloud/openstack/src/Compute/v2/Service.php index b2c8c9b5..a67e33eb 100644 --- a/php-opencloud/openstack/src/Compute/v2/Service.php +++ b/php-opencloud/openstack/src/Compute/v2/Service.php @@ -5,16 +5,16 @@ declare(strict_types=1); namespace OpenStack\Compute\v2; use OpenStack\Common\Service\AbstractService; +use OpenStack\Compute\v2\Models\AvailabilityZone; use OpenStack\Compute\v2\Models\Flavor; +use OpenStack\Compute\v2\Models\Host; +use OpenStack\Compute\v2\Models\Hypervisor; use OpenStack\Compute\v2\Models\HypervisorStatistic; use OpenStack\Compute\v2\Models\Image; use OpenStack\Compute\v2\Models\Keypair; use OpenStack\Compute\v2\Models\Limit; -use OpenStack\Compute\v2\Models\Server; -use OpenStack\Compute\v2\Models\Host; -use OpenStack\Compute\v2\Models\Hypervisor; -use OpenStack\Compute\v2\Models\AvailabilityZone; use OpenStack\Compute\v2\Models\QuotaSet; +use OpenStack\Compute\v2\Models\Server; /** * Compute v2 service for OpenStack. @@ -28,8 +28,6 @@ class Service extends AbstractService * service API. * * @param array $options {@see \OpenStack\Compute\v2\Api::postServer} - * - * @return \OpenStack\Compute\v2\Models\Server */ public function createServer(array $options): Server { @@ -43,8 +41,6 @@ class Service extends AbstractService * the ID, name and links attributes are returned, saving bandwidth. * @param array $options {@see \OpenStack\Compute\v2\Api::getServers} * @param callable $mapFn a callable function that will be invoked on every iteration of the list - * - * @return \Generator */ public function listServers(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator { @@ -62,8 +58,6 @@ class Service extends AbstractService * * @param array $options An array of attributes that will be set on the {@see Server} object. The array keys need to * correspond to the class public properties. - * - * @return \OpenStack\Compute\v2\Models\Server */ public function getServer(array $options = []): Server { @@ -79,8 +73,6 @@ class Service extends AbstractService * @param array $options {@see \OpenStack\Compute\v2\Api::getFlavors} * @param callable $mapFn a callable function that will be invoked on every iteration of the list * @param bool $detailed set to true to fetch flavors' details - * - * @return \Generator */ public function listFlavors(array $options = [], callable $mapFn = null, bool $detailed = false): \Generator { @@ -96,8 +88,6 @@ class Service extends AbstractService * * @param array $options An array of attributes that will be set on the {@see Flavor} object. The array keys need to * correspond to the class public properties. - * - * @return \OpenStack\Compute\v2\Models\Flavor */ public function getFlavor(array $options = []): Flavor { @@ -111,8 +101,6 @@ class Service extends AbstractService * Create a new flavor resource. * * @param array $options {@see \OpenStack\Compute\v2\Api::postFlavors} - * - * @return Flavor */ public function createFlavor(array $options = []): Flavor { @@ -124,8 +112,6 @@ class Service extends AbstractService * * @param array $options {@see \OpenStack\Compute\v2\Api::getImages} * @param callable $mapFn a callable function that will be invoked on every iteration of the list - * - * @return \Generator */ public function listImages(array $options = [], callable $mapFn = null): \Generator { @@ -139,8 +125,6 @@ class Service extends AbstractService * * @param array $options An array of attributes that will be set on the {@see Image} object. The array keys need to * correspond to the class public properties. - * - * @return \OpenStack\Compute\v2\Models\Image */ public function getImage(array $options = []): Image { @@ -155,8 +139,6 @@ class Service extends AbstractService * * @param array $options {@see \OpenStack\Compute\v2\Api::getKeyPairs} * @param callable $mapFn a callable function that will be invoked on every iteration of the list - * - * @return \Generator */ public function listKeypairs(array $options = [], callable $mapFn = null): \Generator { @@ -165,10 +147,6 @@ class Service extends AbstractService /** * Create or import keypair. - * - * @param array $options - * - * @return Keypair */ public function createKeypair(array $options): Keypair { @@ -177,10 +155,6 @@ class Service extends AbstractService /** * Get keypair. - * - * @param array $options - * - * @return Keypair */ public function getKeypair(array $options = []): Keypair { @@ -192,8 +166,6 @@ class Service extends AbstractService /** * Shows rate and absolute limits for the tenant. - * - * @return Limit */ public function getLimits(): Limit { @@ -205,8 +177,6 @@ class Service extends AbstractService /** * Shows summary statistics for all hypervisors over all compute nodes. - * - * @return HypervisorStatistic */ public function getHypervisorStatistics(): HypervisorStatistic { @@ -223,8 +193,6 @@ class Service extends AbstractService * the ID, name and links attributes are returned, saving bandwidth. * @param array $options {@see \OpenStack\Compute\v2\Api::getHypervisors} * @param callable $mapFn a callable function that will be invoked on every iteration of the list - * - * @return \Generator */ public function listHypervisors(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator { @@ -235,10 +203,6 @@ class Service extends AbstractService /** * Shows details for a given hypervisor. - * - * @param array $options - * - * @return Hypervisor */ public function getHypervisor(array $options = []): Hypervisor { @@ -252,8 +216,6 @@ class Service extends AbstractService * * @param array $options {@see \OpenStack\Compute\v2\Api::getHosts} * @param callable $mapFn a callable function that will be invoked on every iteration of the list - * - * @return \Generator */ public function listHosts(array $options = [], callable $mapFn = null): \Generator { @@ -269,8 +231,6 @@ class Service extends AbstractService * * @param array $options An array of attributes that will be set on the {@see Host} object. The array keys need to * correspond to the class public properties. - * - * @return \OpenStack\Compute\v2\Models\Host */ public function getHost(array $options = []): Host { @@ -285,8 +245,6 @@ class Service extends AbstractService * * @param array $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones} * @param callable $mapFn a callable function that will be invoked on every iteration of the list - * - * @return \Generator */ public function listAvailabilityZones(array $options = [], callable $mapFn = null): \Generator { @@ -295,11 +253,6 @@ class Service extends AbstractService /** * Shows A Quota for a tenant. - * - * @param string $tenantId - * @param bool $detailed - * - * @return QuotaSet */ public function getQuotaSet(string $tenantId, bool $detailed = false): QuotaSet { diff --git a/php-opencloud/openstack/src/Identity/v2/Models/Catalog.php b/php-opencloud/openstack/src/Identity/v2/Models/Catalog.php index 161396a9..247c9faf 100644 --- a/php-opencloud/openstack/src/Identity/v2/Models/Catalog.php +++ b/php-opencloud/openstack/src/Identity/v2/Models/Catalog.php @@ -59,12 +59,6 @@ class Catalog extends OperatorResource implements \OpenStack\Common\Auth\Catalog } } - throw new \RuntimeException(sprintf( - "Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s", - $serviceName, - $serviceType, - $region, - $urlType - )); + throw new \RuntimeException(sprintf("Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s", $serviceName, $serviceType, $region, $urlType)); } } diff --git a/php-opencloud/openstack/src/Identity/v2/Models/Endpoint.php b/php-opencloud/openstack/src/Identity/v2/Models/Endpoint.php index e58f9f18..b318a58b 100644 --- a/php-opencloud/openstack/src/Identity/v2/Models/Endpoint.php +++ b/php-opencloud/openstack/src/Identity/v2/Models/Endpoint.php @@ -34,10 +34,6 @@ class Endpoint extends OperatorResource /** * Indicates whether a given region is supported. - * - * @param string $region - * - * @return bool */ public function supportsRegion(string $region): bool { @@ -46,10 +42,6 @@ class Endpoint extends OperatorResource /** * Indicates whether a given URL type is supported. - * - * @param string $urlType - * - * @return bool */ public function supportsUrlType(string $urlType): bool { diff --git a/php-opencloud/openstack/src/Identity/v2/Models/Entry.php b/php-opencloud/openstack/src/Identity/v2/Models/Entry.php index 5899aaae..65042877 100644 --- a/php-opencloud/openstack/src/Identity/v2/Models/Entry.php +++ b/php-opencloud/openstack/src/Identity/v2/Models/Entry.php @@ -34,9 +34,6 @@ class Entry extends OperatorResource /** * Indicates whether this catalog entry matches a certain name and type. * - * @param string $name - * @param string $type - * * @return bool TRUE if it's a match, FALSE if not */ public function matches(string $name, string $type): bool @@ -46,11 +43,6 @@ class Entry extends OperatorResource /** * Retrieves the catalog entry's URL according to a specific region and URL type. - * - * @param string $region - * @param string $urlType - * - * @return string */ public function getEndpointUrl(string $region, string $urlType): string { diff --git a/php-opencloud/openstack/src/Identity/v2/Models/Token.php b/php-opencloud/openstack/src/Identity/v2/Models/Token.php index a8544ae0..4599caf6 100644 --- a/php-opencloud/openstack/src/Identity/v2/Models/Token.php +++ b/php-opencloud/openstack/src/Identity/v2/Models/Token.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace OpenStack\Identity\v2\Models; use OpenStack\Common\Resource\Alias; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Transport\Utils; use Psr\Http\Message\ResponseInterface; -use OpenStack\Common\Resource\OperatorResource; /** * Represents an Identity v2 Token. diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Assignment.php b/php-opencloud/openstack/src/Identity/v3/Models/Assignment.php index 32b91c18..e4bb157c 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Assignment.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Assignment.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\Models; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; class Assignment extends OperatorResource implements Listable { diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Catalog.php b/php-opencloud/openstack/src/Identity/v3/Models/Catalog.php index cc6a1b5c..3dc78453 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Catalog.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Catalog.php @@ -56,12 +56,6 @@ class Catalog extends OperatorResource implements \OpenStack\Common\Auth\Catalog } } - throw new \RuntimeException(sprintf( - "Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s", - $name, - $type, - $region, - $urlType - )); + throw new \RuntimeException(sprintf("Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s", $name, $type, $region, $urlType)); } } diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Credential.php b/php-opencloud/openstack/src/Identity/v3/Models/Credential.php index 0c7bcdb5..ab844b3e 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Credential.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Credential.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\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\Retrievable; use OpenStack\Common\Resource\Updateable; diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Domain.php b/php-opencloud/openstack/src/Identity/v3/Models/Domain.php index 516ead1f..9118d38f 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Domain.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Domain.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\Models; use OpenStack\Common\Error\BadResponseError; -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\Retrievable; use OpenStack\Common\Resource\Updateable; @@ -75,8 +75,6 @@ class Domain extends OperatorResource implements Creatable, Listable, Retrievabl /** * @param array $options {@see \OpenStack\Identity\v3\Api::getUserRoles} - * - * @return \Generator */ public function listUserRoles(array $options = []): \Generator { @@ -95,8 +93,6 @@ class Domain extends OperatorResource implements Creatable, Listable, Retrievabl /** * @param array $options {@see \OpenStack\Identity\v3\Api::headUserRole} - * - * @return bool */ public function checkUserRole(array $options = []): bool { @@ -119,8 +115,6 @@ class Domain extends OperatorResource implements Creatable, Listable, Retrievabl /** * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupRoles} - * - * @return \Generator */ public function listGroupRoles(array $options = []): \Generator { @@ -139,8 +133,6 @@ class Domain extends OperatorResource implements Creatable, Listable, Retrievabl /** * @param array $options {@see \OpenStack\Identity\v3\Api::headGroupRole} - * - * @return bool */ public function checkGroupRole(array $options = []): bool { diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Endpoint.php b/php-opencloud/openstack/src/Identity/v3/Models/Endpoint.php index 775768a4..5fe0a5bc 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Endpoint.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Endpoint.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\Models; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; -use OpenStack\Common\Resource\Updateable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; +use OpenStack\Common\Resource\Updateable; /** * @property \OpenStack\Identity\v3\Api $api @@ -80,7 +80,7 @@ class Endpoint extends OperatorResource implements Creatable, Updateable, Deleta public function regionMatches(string $value): bool { - return $this->region && $this->region == $value; + return in_array($this->region, ['*', $value]); } public function interfaceMatches(string $value): bool diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Group.php b/php-opencloud/openstack/src/Identity/v3/Models/Group.php index 65f4658f..8bfee36b 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Group.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Group.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\Models; use OpenStack\Common\Error\BadResponseError; -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\Retrievable; use OpenStack\Common\Resource\Updateable; @@ -77,8 +77,6 @@ class Group extends OperatorResource implements Creatable, Listable, Retrievable /** * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupUsers} - * - * @return \Generator */ public function listUsers(array $options = []): \Generator { @@ -105,8 +103,6 @@ class Group extends OperatorResource implements Creatable, Listable, Retrievable /** * @param array $options {@see \OpenStack\Identity\v3\Api::headGroupUser} - * - * @return bool */ public function checkMembership(array $options): bool { diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Policy.php b/php-opencloud/openstack/src/Identity/v3/Models/Policy.php index 9d100a5e..12168829 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Policy.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Policy.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\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\Retrievable; use OpenStack\Common\Resource\Updateable; diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Project.php b/php-opencloud/openstack/src/Identity/v3/Models/Project.php index 8f323618..62041c69 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Project.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Project.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\Models; use OpenStack\Common\Error\BadResponseError; -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\Retrievable; use OpenStack\Common\Resource\Updateable; @@ -87,8 +87,6 @@ class Project extends OperatorResource implements Creatable, Retrievable, Listab /** * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectUserRoles} - * - * @return \Generator */ public function listUserRoles(array $options = []): \Generator { @@ -107,8 +105,6 @@ class Project extends OperatorResource implements Creatable, Retrievable, Listab /** * @param array $options {@see \OpenStack\Identity\v3\Api::headProjectUserRole} - * - * @return bool */ public function checkUserRole(array $options): bool { @@ -131,8 +127,6 @@ class Project extends OperatorResource implements Creatable, Retrievable, Listab /** * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectGroupRoles} - * - * @return \Generator */ public function listGroupRoles(array $options = []): \Generator { @@ -151,8 +145,6 @@ class Project extends OperatorResource implements Creatable, Retrievable, Listab /** * @param array $options {@see \OpenStack\Identity\v3\Api::headProjectGroupRole} - * - * @return bool */ public function checkGroupRole(array $options): bool { diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Role.php b/php-opencloud/openstack/src/Identity/v3/Models/Role.php index d694dccf..907b1005 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Role.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Role.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\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; /** * @property \OpenStack\Identity\v3\Api $api diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Service.php b/php-opencloud/openstack/src/Identity/v3/Models/Service.php index 6b58c088..67d0b5f7 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Service.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Service.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\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\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Resource\Updateable; @@ -93,7 +93,7 @@ class Service extends OperatorResource implements Creatable, Listable, Retrievab private function typeMatches(string $value): bool { - return $this->type && $this->type = $value; + return $this->type && $this->type == $value; } /** diff --git a/php-opencloud/openstack/src/Identity/v3/Models/Token.php b/php-opencloud/openstack/src/Identity/v3/Models/Token.php index 935f409f..b3808a54 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/Token.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/Token.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\Models; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Transport\Utils; -use Psr\Http\Message\ResponseInterface; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Creatable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; +use OpenStack\Common\Transport\Utils; +use Psr\Http\Message\ResponseInterface; /** * @property \OpenStack\Identity\v3\Api $api @@ -74,9 +74,6 @@ class Token extends OperatorResource implements Creatable, Retrievable, \OpenSta return $this; } - /** - * @return string - */ public function getId(): string { return $this->id; @@ -109,11 +106,7 @@ class Token extends OperatorResource implements Creatable, Retrievable, \OpenSta if (isset($data['user'])) { $data['methods'] = ['password']; if (!isset($data['user']['id']) && empty($data['user']['domain'])) { - throw new \InvalidArgumentException( - 'When authenticating with a username, you must also provide either the domain name or domain ID to ' - .'which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to ' - .'provide domain information.' - ); + throw new \InvalidArgumentException('When authenticating with a username, you must also provide either the domain name or domain ID to '.'which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to '.'provide domain information.'); } } elseif (isset($data['tokenId'])) { $data['methods'] = ['token']; @@ -138,8 +131,6 @@ class Token extends OperatorResource implements Creatable, Retrievable, \OpenSta * Initialize OpenStack object using $params['cachedToken'] to reduce the amount of HTTP calls. * * This array is a modified version of response from `/auth/tokens`. Do not manually modify this array. - * - * @return array */ public function export(): array { diff --git a/php-opencloud/openstack/src/Identity/v3/Models/User.php b/php-opencloud/openstack/src/Identity/v3/Models/User.php index 3645e87d..81aa561e 100644 --- a/php-opencloud/openstack/src/Identity/v3/Models/User.php +++ b/php-opencloud/openstack/src/Identity/v3/Models/User.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace OpenStack\Identity\v3\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\Retrievable; use OpenStack\Common\Resource\Updateable; @@ -86,9 +86,6 @@ class User extends OperatorResource implements Creatable, Listable, Retrievable, $this->execute($this->api->deleteUser(), ['id' => $this->id]); } - /** - * @return \Generator - */ public function listGroups(): \Generator { $options['id'] = $this->id; @@ -96,9 +93,6 @@ class User extends OperatorResource implements Creatable, Listable, Retrievable, return $this->model(Group::class)->enumerate($this->api->getUserGroups(), $options); } - /** - * @return \Generator - */ public function listProjects(): \Generator { return $this->model(Project::class)->enumerate($this->api->getUserProjects(), ['id' => $this->id]); diff --git a/php-opencloud/openstack/src/Identity/v3/Service.php b/php-opencloud/openstack/src/Identity/v3/Service.php index 6b11a0bd..ca16aac5 100644 --- a/php-opencloud/openstack/src/Identity/v3/Service.php +++ b/php-opencloud/openstack/src/Identity/v3/Service.php @@ -51,21 +51,13 @@ class Service extends AbstractService implements IdentityService return [$token, $baseUrl]; } - throw new \RuntimeException(sprintf( - 'No service found with type [%s] name [%s] region [%s] interface [%s]', - $type, - $name, - $region, - $interface - )); + throw new \RuntimeException(sprintf('No service found with type [%s] name [%s] region [%s] interface [%s]', $type, $name, $region, $interface)); } /** * Generates authentication token from cached token using `$token->export()`. * * @param array $cachedToken {@see \OpenStack\Identity\v3\Models\Token::export} - * - * @return Models\Token */ public function generateTokenFromCache(array $cachedToken): Models\Token { @@ -76,8 +68,6 @@ class Service extends AbstractService implements IdentityService * Generates a new authentication token. * * @param array $options {@see \OpenStack\Identity\v3\Api::postTokens} - * - * @return Models\Token */ public function generateToken(array $options): Models\Token { @@ -89,8 +79,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the token to retrieve - * - * @return Models\Token */ public function getToken(string $id): Models\Token { @@ -101,8 +89,6 @@ class Service extends AbstractService implements IdentityService * Validates a token, identified by its ID, and returns TRUE if its valid, FALSE if not. * * @param string $id The unique ID of the token - * - * @return bool */ public function validateToken(string $id): bool { @@ -130,8 +116,6 @@ class Service extends AbstractService implements IdentityService * Creates a new service according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postServices} - * - * @return Models\Service */ public function createService(array $options): Models\Service { @@ -144,8 +128,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getServices} - * - * @return \Generator */ public function listServices(array $options = []): \Generator { @@ -157,8 +139,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the service - * - * @return Models\Service */ public function getService(string $id): Models\Service { @@ -169,8 +149,6 @@ class Service extends AbstractService implements IdentityService * Creates a new endpoint according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postEndpoints} - * - * @return Models\Endpoint */ public function createEndpoint(array $options): Models\Endpoint { @@ -182,8 +160,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the service - * - * @return Models\Endpoint */ public function getEndpoint(string $id): Models\Endpoint { @@ -196,8 +172,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getEndpoints} - * - * @return \Generator */ public function listEndpoints(array $options = []): \Generator { @@ -208,8 +182,6 @@ class Service extends AbstractService implements IdentityService * Creates a new domain according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postDomains} - * - * @return Models\Domain */ public function createDomain(array $options): Models\Domain { @@ -222,8 +194,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getDomains} - * - * @return \Generator */ public function listDomains(array $options = []): \Generator { @@ -235,8 +205,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the domain - * - * @return Models\Domain */ public function getDomain(string $id): Models\Domain { @@ -247,8 +215,6 @@ class Service extends AbstractService implements IdentityService * Creates a new project according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postProjects} - * - * @return Models\Project */ public function createProject(array $options): Models\Project { @@ -261,8 +227,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getProjects} - * - * @return \Generator */ public function listProjects(array $options = []): \Generator { @@ -274,8 +238,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the project - * - * @return Models\Project */ public function getProject(string $id): Models\Project { @@ -286,8 +248,6 @@ class Service extends AbstractService implements IdentityService * Creates a new user according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postUsers} - * - * @return Models\User */ public function createUser(array $options): Models\User { @@ -300,8 +260,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getUsers} - * - * @return \Generator */ public function listUsers(array $options = []): \Generator { @@ -313,8 +271,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the user - * - * @return Models\User */ public function getUser(string $id): Models\User { @@ -325,8 +281,6 @@ class Service extends AbstractService implements IdentityService * Creates a new group according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postGroups} - * - * @return Models\Group */ public function createGroup(array $options): Models\Group { @@ -339,8 +293,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getGroups} - * - * @return \Generator */ public function listGroups(array $options = []): \Generator { @@ -352,8 +304,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the group - * - * @return Models\Group */ public function getGroup($id): Models\Group { @@ -364,8 +314,6 @@ class Service extends AbstractService implements IdentityService * Creates a new credential according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postCredentials} - * - * @return Models\Credential */ public function createCredential(array $options): Models\Credential { @@ -376,8 +324,6 @@ class Service extends AbstractService implements IdentityService * Returns a generator which will yield a collection of credential objects. The elements which generators yield can * be accessed using a foreach loop. Often the API will not return the full state of the resource in collections; * you will need to use retrieve() to pull in the full state of the remote resource from the API. - * - * @return \Generator */ public function listCredentials(): \Generator { @@ -389,8 +335,6 @@ class Service extends AbstractService implements IdentityService * or HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the credential - * - * @return Models\Credential */ public function getCredential(string $id): Models\Credential { @@ -401,8 +345,6 @@ class Service extends AbstractService implements IdentityService * Creates a new role according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postRoles} - * - * @return Models\Role */ public function createRole(array $options): Models\Role { @@ -415,8 +357,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getRoles} - * - * @return \Generator */ public function listRoles(array $options = []): \Generator { @@ -429,8 +369,6 @@ class Service extends AbstractService implements IdentityService * collections; you will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getRoleAssignments} - * - * @return \Generator */ public function listRoleAssignments(array $options = []): \Generator { @@ -441,8 +379,6 @@ class Service extends AbstractService implements IdentityService * Creates a new policy according to the provided options. * * @param array $options {@see \OpenStack\Identity\v3\Api::postPolicies} - * - * @return Models\Policy */ public function createPolicy(array $options): Models\Policy { @@ -455,8 +391,6 @@ class Service extends AbstractService implements IdentityService * will need to use retrieve() to pull in the full state of the remote resource from the API. * * @param array $options {@see \OpenStack\Identity\v3\Api::getPolicies} - * - * @return \Generator */ public function listPolicies(array $options = []): \Generator { @@ -468,8 +402,6 @@ class Service extends AbstractService implements IdentityService * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. * * @param string $id The unique ID of the policy - * - * @return Models\Policy */ public function getPolicy(string $id): Models\Policy { diff --git a/php-opencloud/openstack/src/Images/v2/Models/Image.php b/php-opencloud/openstack/src/Images/v2/Models/Image.php index 033eaa87..8c0e8862 100644 --- a/php-opencloud/openstack/src/Images/v2/Models/Image.php +++ b/php-opencloud/openstack/src/Images/v2/Models/Image.php @@ -6,10 +6,10 @@ namespace OpenStack\Images\v2\Models; use OpenStack\Common\JsonSchema\Schema; use OpenStack\Common\Resource\Alias; -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\Retrievable; use OpenStack\Common\Transport\Utils; use OpenStack\Images\v2\JsonPatch; diff --git a/php-opencloud/openstack/src/Images/v2/Models/Member.php b/php-opencloud/openstack/src/Images/v2/Models/Member.php index c9138b0e..c3cb00b7 100644 --- a/php-opencloud/openstack/src/Images/v2/Models/Member.php +++ b/php-opencloud/openstack/src/Images/v2/Models/Member.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Images\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\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; /** diff --git a/php-opencloud/openstack/src/Images/v2/Service.php b/php-opencloud/openstack/src/Images/v2/Service.php index 5e6c91bb..9c977cf2 100644 --- a/php-opencloud/openstack/src/Images/v2/Service.php +++ b/php-opencloud/openstack/src/Images/v2/Service.php @@ -24,8 +24,6 @@ class Service extends AbstractService /** * @param null $id - * - * @return Image */ public function getImage($id = null): Image { diff --git a/php-opencloud/openstack/src/Metric/v1/Gnocchi/Models/Resource.php b/php-opencloud/openstack/src/Metric/v1/Gnocchi/Models/Resource.php index fa2c93cf..e106ec10 100644 --- a/php-opencloud/openstack/src/Metric/v1/Gnocchi/Models/Resource.php +++ b/php-opencloud/openstack/src/Metric/v1/Gnocchi/Models/Resource.php @@ -102,11 +102,6 @@ class Resource extends OperatorResource implements Retrievable $this->populateFromResponse($response); } - /** - * @param string $metric - * - * @return Metric - */ public function getMetric(string $metric): Metric { $response = $this->execute( @@ -124,8 +119,6 @@ class Resource extends OperatorResource implements Retrievable /** * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetricMeasures} - * - * @return array */ public function getMetricMeasures(array $options = []): array { @@ -144,8 +137,6 @@ class Resource extends OperatorResource implements Retrievable /** * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetrics} - * - * @return \Generator */ public function listResourceMetrics(array $options = []): \Generator { diff --git a/php-opencloud/openstack/src/Metric/v1/Gnocchi/Service.php b/php-opencloud/openstack/src/Metric/v1/Gnocchi/Service.php index f70bcfba..c44dfafb 100644 --- a/php-opencloud/openstack/src/Metric/v1/Gnocchi/Service.php +++ b/php-opencloud/openstack/src/Metric/v1/Gnocchi/Service.php @@ -18,8 +18,6 @@ class Service extends AbstractService { /** * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\ResourceType type in a generator format. - * - * @return \Generator */ public function listResourceTypes(): \Generator { @@ -30,8 +28,6 @@ class Service extends AbstractService * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format. * * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResources} - * - * @return \Generator */ public function listResources(array $options = []): \Generator { @@ -43,10 +39,6 @@ class Service extends AbstractService /** * Retrieves a Resource object and populates its unique identifier object. This operation will not perform a GET or * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. - * - * @param array $options - * - * @return resource */ public function getResource(array $options = []): Resource { @@ -63,8 +55,6 @@ class Service extends AbstractService * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format. * * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::searchResources} - * - * @return \Generator */ public function searchResources(array $options = []): \Generator { @@ -90,10 +80,6 @@ class Service extends AbstractService /** * Retrieves a Metric object and populates its unique identifier object. This operation will not perform a GET or * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API. - * - * @param string $id - * - * @return Metric */ public function getMetric(string $id): Metric { @@ -108,8 +94,6 @@ class Service extends AbstractService * Retrieves a collection of Metric type in a generator format. * * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getMetrics} - * - * @return \Generator */ public function listMetrics(array $options = []): \Generator { @@ -120,8 +104,6 @@ class Service extends AbstractService * If options does not have type, this will inject $options['type'] = 'generic'. * * @internal - * - * @param array $options */ private function injectGenericType(array &$options) { diff --git a/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php b/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php index b2959e4e..07dc0ddb 100644 --- a/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php +++ b/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php @@ -2,10 +2,10 @@ namespace OpenStack\Networking\v2\Extensions\Layer3\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\Retrievable; use OpenStack\Common\Resource\Updateable; use OpenStack\Networking\v2\Extensions\Layer3\Api; diff --git a/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/Router.php b/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/Router.php index abd53e7f..f3e70175 100644 --- a/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/Router.php +++ b/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Models/Router.php @@ -3,11 +3,11 @@ namespace OpenStack\Networking\v2\Extensions\Layer3\Models; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Resource\HasWaiterTrait; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; +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\Networking\v2\Extensions\Layer3\Api; diff --git a/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Service.php b/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Service.php index 0aa9827e..9f9b04de 100644 --- a/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Service.php +++ b/php-opencloud/openstack/src/Networking/v2/Extensions/Layer3/Service.php @@ -21,55 +21,31 @@ class Service extends AbstractService return $this->model(Router::class, $info); } - /** - * @param array $options - * - * @return FloatingIp - */ public function createFloatingIp(array $options): FloatingIp { return $this->floatingIp()->create($options); } - /** - * @return FloatingIp - */ public function getFloatingIp($id): FloatingIp { return $this->floatingIp(['id' => $id]); } - /** - * @return \Generator - */ public function listFloatingIps(array $options = []): \Generator { return $this->floatingIp()->enumerate($this->api->getFloatingIps(), $options); } - /** - * @param array $options - * - * @return Router - */ public function createRouter(array $options): Router { return $this->router()->create($options); } - /** - * @return Router - */ public function getRouter($id): Router { return $this->router(['id' => $id]); } - /** - * @param array $options - * - * @return \Generator - */ public function listRouters(array $options = []): \Generator { return $this->router()->enumerate($this->api->getRouters(), $options); diff --git a/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php b/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php index 5812c6b5..20516227 100644 --- a/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php +++ b/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php @@ -5,10 +5,10 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Extensions\SecurityGroups\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\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Resource\Updateable; diff --git a/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php b/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php index 54064cd0..a7da99bd 100644 --- a/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php +++ b/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Extensions\SecurityGroups\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\Retrievable; /** diff --git a/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Service.php b/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Service.php index aeda22ab..cf10b733 100644 --- a/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Service.php +++ b/php-opencloud/openstack/src/Networking/v2/Extensions/SecurityGroups/Service.php @@ -21,59 +21,31 @@ class Service extends AbstractService return $this->model(SecurityGroupRule::class, $info); } - /** - * @param array $options - * - * @return \Generator - */ public function listSecurityGroups(array $options = []): \Generator { return $this->securityGroup()->enumerate($this->api->getSecurityGroups(), $options); } - /** - * @param array $options - * - * @return SecurityGroup - */ public function createSecurityGroup(array $options): SecurityGroup { return $this->securityGroup()->create($options); } - /** - * @param string $id - * - * @return SecurityGroup - */ public function getSecurityGroup(string $id): SecurityGroup { return $this->securityGroup(['id' => $id]); } - /** - * @return \Generator - */ public function listSecurityGroupRules(): \Generator { return $this->securityGroupRule()->enumerate($this->api->getSecurityRules()); } - /** - * @param array $options - * - * @return SecurityGroupRule - */ public function createSecurityGroupRule(array $options): SecurityGroupRule { return $this->securityGroupRule()->create($options); } - /** - * @param string $id - * - * @return SecurityGroupRule - */ public function getSecurityGroupRule(string $id): SecurityGroupRule { return $this->securityGroupRule(['id' => $id]); diff --git a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancer.php b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancer.php index bb4a4ae4..42671b3d 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancer.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancer.php @@ -129,10 +129,6 @@ class LoadBalancer extends OperatorResource implements Creatable, Retrievable, U /** * Add a listener to this load balancer. - * - * @param array $userOptions - * - * @return LoadBalancerListener */ public function addListener(array $userOptions = []): LoadBalancerListener { @@ -143,8 +139,6 @@ class LoadBalancer extends OperatorResource implements Creatable, Retrievable, U /** * Get stats for this loadbalancer. - * - * @return LoadBalancerStat */ public function getStats(): LoadBalancerStat { @@ -156,8 +150,6 @@ class LoadBalancer extends OperatorResource implements Creatable, Retrievable, U /** * Get the status tree for this loadbalancer. - * - * @return LoadBalancerStatus */ public function getStatuses(): LoadBalancerStatus { diff --git a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerPool.php b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerPool.php index 4da0be95..b1881652 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerPool.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerPool.php @@ -153,8 +153,6 @@ class LoadBalancerPool extends OperatorResource implements Creatable, Retrievabl /** * Add a member to this pool. - * - * @param array $userOptions */ public function addMember(array $userOptions = []): LoadBalancerMember { @@ -165,10 +163,6 @@ class LoadBalancerPool extends OperatorResource implements Creatable, Retrievabl /** * Get an instance of a member. - * - * @param string $memberId - * - * @return LoadBalancerMember */ public function getMember(string $memberId): LoadBalancerMember { @@ -177,8 +171,6 @@ class LoadBalancerPool extends OperatorResource implements Creatable, Retrievabl /** * Delete a member. - * - * @param string $memberId */ public function deleteMember(string $memberId) { @@ -187,10 +179,6 @@ class LoadBalancerPool extends OperatorResource implements Creatable, Retrievabl /** * Add a healthmonitor to this load balancer pool. - * - * @param array $userOptions - * - * @return LoadBalancerHealthMonitor */ public function addHealthMonitor(array $userOptions = []): LoadBalancerHealthMonitor { diff --git a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStat.php b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStat.php index eccf3f25..4b34a91f 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStat.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStat.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Models; -use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Resource\OperatorResource; +use OpenStack\Common\Resource\Retrievable; /** * Represents Neutron v2 LoadBalancer Stats. diff --git a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStatus.php b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStatus.php index dbcf1de4..367952aa 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStatus.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/LoadBalancerStatus.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Models; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Resource\OperatorResource; +use OpenStack\Common\Resource\Retrievable; use OpenStack\Common\Transport\Utils; /** diff --git a/php-opencloud/openstack/src/Networking/v2/Models/Network.php b/php-opencloud/openstack/src/Networking/v2/Models/Network.php index 7af74b2a..8bff5bc3 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/Network.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/Network.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Models; -use OpenStack\Common\Resource\OperatorResource; -use OpenStack\Common\Resource\HasWaiterTrait; -use OpenStack\Common\Resource\Listable; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; +use OpenStack\Common\Resource\HasWaiterTrait; +use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; /** diff --git a/php-opencloud/openstack/src/Networking/v2/Models/Port.php b/php-opencloud/openstack/src/Networking/v2/Models/Port.php index d3144870..8f1cf03f 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/Port.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/Port.php @@ -4,11 +4,11 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Models; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; 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; diff --git a/php-opencloud/openstack/src/Networking/v2/Models/Subnet.php b/php-opencloud/openstack/src/Networking/v2/Models/Subnet.php index 142a9ddf..bf77c5c7 100644 --- a/php-opencloud/openstack/src/Networking/v2/Models/Subnet.php +++ b/php-opencloud/openstack/src/Networking/v2/Models/Subnet.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace OpenStack\Networking\v2\Models; -use OpenStack\Common\Resource\OperatorResource; -use OpenStack\Common\Resource\Listable; use OpenStack\Common\Resource\Creatable; -use OpenStack\Common\Resource\Updateable; use OpenStack\Common\Resource\Deletable; +use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; +use OpenStack\Common\Resource\Updateable; /** * Represents a Networking v2 Network. diff --git a/php-opencloud/openstack/src/Networking/v2/Params.php b/php-opencloud/openstack/src/Networking/v2/Params.php index 50bc8828..ea093823 100644 --- a/php-opencloud/openstack/src/Networking/v2/Params.php +++ b/php-opencloud/openstack/src/Networking/v2/Params.php @@ -10,8 +10,6 @@ class Params extends AbstractParams { /** * Returns information about description parameter. - * - * @return array */ public function descriptionJson(): array { @@ -23,8 +21,6 @@ class Params extends AbstractParams /** * Returns information about name parameter. - * - * @return array */ public function nameJson(): array { diff --git a/php-opencloud/openstack/src/Networking/v2/Service.php b/php-opencloud/openstack/src/Networking/v2/Service.php index 6a1e0f93..2e1f7169 100644 --- a/php-opencloud/openstack/src/Networking/v2/Service.php +++ b/php-opencloud/openstack/src/Networking/v2/Service.php @@ -27,8 +27,6 @@ class Service extends AbstractService * Create a new network resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postNetwork} - * - * @return Network */ public function createNetwork(array $options): Network { @@ -39,8 +37,6 @@ class Service extends AbstractService * Create a new network resources. * * @param array $options {@see \OpenStack\Networking\v2\Api::postNetworks} - * - * @return array */ public function createNetworks(array $options): array { @@ -51,10 +47,6 @@ class Service extends AbstractService * Retrieve a network object without calling the remote API. Any values provided in the array will populate the * empty object, allowing you greater control without the expense of network transactions. To call the remote API * and have the response populate the object, call {@see Network::retrieve}. - * - * @param string $id - * - * @return Network */ public function getNetwork(string $id): Network { @@ -65,8 +57,6 @@ class Service extends AbstractService * List networks. * * @param array $options {@see \OpenStack\Networking\v2\Api::getNetworks} - * - * @return \Generator */ public function listNetworks(array $options = []): \Generator { @@ -77,8 +67,6 @@ class Service extends AbstractService * Create a new subnet resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postSubnet} - * - * @return Subnet */ public function createSubnet(array $options): Subnet { @@ -101,10 +89,6 @@ class Service extends AbstractService * Retrieve a subnet object without calling the remote API. Any values provided in the array will populate the * empty object, allowing you greater control without the expense of network transactions. To call the remote API * and have the response populate the object, call {@see Subnet::retrieve}. - * - * @param string $id - * - * @return Subnet */ public function getSubnet(string $id): Subnet { @@ -115,8 +99,6 @@ class Service extends AbstractService * List subnets. * * @param array $options {@see \OpenStack\Networking\v2\Api::getSubnets} - * - * @return \Generator */ public function listSubnets(array $options = []): \Generator { @@ -127,8 +109,6 @@ class Service extends AbstractService * Create a new port resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postSinglePort} - * - * @return Port */ public function createPort(array $options): Port { @@ -151,10 +131,6 @@ class Service extends AbstractService * Retrieve a subnet object without calling the remote API. Any values provided in the array will populate the * empty object, allowing you greater control without the expense of network transactions. To call the remote API * and have the response populate the object, call {@see Port::retrieve}. - * - * @param string $id - * - * @return Port */ public function getPort(string $id): Port { @@ -165,8 +141,6 @@ class Service extends AbstractService * List ports. * * @param array $options {@see \OpenStack\Networking\v2\Api::getPorts} - * - * @return \Generator */ public function listPorts(array $options = []): \Generator { @@ -175,8 +149,6 @@ class Service extends AbstractService /** * Lists quotas for projects with non-default quota values. - * - * @return \Generator */ public function listQuotas(): \Generator { @@ -189,10 +161,6 @@ class Service extends AbstractService * Retrieve a quota object without calling the remote API. Any values provided in the array will populate the * empty object, allowing you greater control without the expense of network transactions. To call the remote API * and have the response populate the object, call {@see Quota::retrieve}. - * - * @param string $tenantId - * - * @return Quota */ public function getQuota(string $tenantId): Quota { @@ -201,10 +169,6 @@ class Service extends AbstractService /** * Lists default quotas for a project. - * - * @param string $tenantId - * - * @return Quota */ public function getDefaultQuota(string $tenantId): Quota { @@ -216,8 +180,6 @@ class Service extends AbstractService /** * Lists loadbalancers for projects. - * - * @return \Generator */ public function listLoadBalancers(): \Generator { @@ -226,10 +188,6 @@ class Service extends AbstractService /** * Retrieve an instance of a LoadBalancer object. - * - * @param string $id - * - * @return LoadBalancer */ public function getLoadBalancer(string $id): LoadBalancer { @@ -240,8 +198,6 @@ class Service extends AbstractService * Create a new loadbalancer resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancer} - * - * @return LoadBalancer */ public function createLoadBalancer(array $options): LoadBalancer { @@ -250,8 +206,6 @@ class Service extends AbstractService /** * Lists loadbalancer listeners. - * - * @return \Generator */ public function listLoadBalancerListeners(): \Generator { @@ -260,10 +214,6 @@ class Service extends AbstractService /** * Retrieve an instance of a loadbalancer listener object. - * - * @param string $id - * - * @return LoadBalancerListener */ public function getLoadBalancerListener(string $id): LoadBalancerListener { @@ -274,8 +224,6 @@ class Service extends AbstractService * Create a new loadbalancer Listener resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerListener} - * - * @return LoadBalancerListener */ public function createLoadBalancerListener(array $options): LoadBalancerListener { @@ -284,8 +232,6 @@ class Service extends AbstractService /** * Lists loadbalancer pools. - * - * @return \Generator */ public function listLoadBalancerPools(): \Generator { @@ -294,10 +240,6 @@ class Service extends AbstractService /** * Retrieve an instance of a loadbalancer Pool object. - * - * @param string $id - * - * @return LoadBalancerPool */ public function getLoadBalancerPool(string $id): LoadBalancerPool { @@ -308,8 +250,6 @@ class Service extends AbstractService * Create a new loadbalancer Pool resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerPool} - * - * @return LoadBalancerPool */ public function createLoadBalancerPool(array $options): LoadBalancerPool { @@ -318,10 +258,6 @@ class Service extends AbstractService /** * Lists loadbalancer members. - * - * @param string $poolId - * - * @return \Generator */ public function listLoadBalancerMembers(string $poolId): \Generator { @@ -330,11 +266,6 @@ class Service extends AbstractService /** * Retrieve an instance of a loadbalancer Member object. - * - * @param string $poolId - * @param string $memberId - * - * @return LoadBalancerMember */ public function getLoadBalancerMember(string $poolId, string $memberId): LoadBalancerMember { @@ -345,8 +276,6 @@ class Service extends AbstractService * Create a new loadbalancer member resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerMember} - * - * @return LoadBalancerMember */ public function createLoadBalancerMember(array $options): LoadBalancerMember { @@ -355,8 +284,6 @@ class Service extends AbstractService /** * Lists loadbalancer healthmonitors. - * - * @return \Generator */ public function listLoadBalancerHealthMonitors(): \Generator { @@ -365,10 +292,6 @@ class Service extends AbstractService /** * Retrieve an instance of a loadbalancer healthmonitor object. - * - * @param string $id - * - * @return LoadBalancerHealthMonitor */ public function getLoadBalancerHealthMonitor(string $id): LoadBalancerHealthMonitor { @@ -379,8 +302,6 @@ class Service extends AbstractService * Create a new loadbalancer healthmonitor resource. * * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerHealthMonitor} - * - * @return LoadBalancerHealthMonitor */ public function createLoadBalancerHealthMonitor(array $options): LoadBalancerHealthMonitor { diff --git a/php-opencloud/openstack/src/ObjectStore/v1/Models/Account.php b/php-opencloud/openstack/src/ObjectStore/v1/Models/Account.php index 3ef03e2a..84ef1fd4 100644 --- a/php-opencloud/openstack/src/ObjectStore/v1/Models/Account.php +++ b/php-opencloud/openstack/src/ObjectStore/v1/Models/Account.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace OpenStack\ObjectStore\v1\Models; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\HasMetadata; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; use Psr\Http\Message\ResponseInterface; diff --git a/php-opencloud/openstack/src/ObjectStore/v1/Models/Container.php b/php-opencloud/openstack/src/ObjectStore/v1/Models/Container.php index 4643d6e9..b0ca8890 100644 --- a/php-opencloud/openstack/src/ObjectStore/v1/Models/Container.php +++ b/php-opencloud/openstack/src/ObjectStore/v1/Models/Container.php @@ -6,14 +6,14 @@ namespace OpenStack\ObjectStore\v1\Models; use GuzzleHttp\Promise\Promise; use GuzzleHttp\Psr7\LimitStream; -use Psr\Http\Message\ResponseInterface; use OpenStack\Common\Error\BadResponseError; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; use OpenStack\Common\Resource\HasMetadata; use OpenStack\Common\Resource\Listable; +use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Retrievable; +use Psr\Http\Message\ResponseInterface; /** * @property \OpenStack\ObjectStore\v1\Api $api @@ -57,8 +57,6 @@ class Container extends OperatorResource implements Creatable, Deletable, Retrie * * @param array $options {@see \OpenStack\ObjectStore\v1\Api::getContainer} * @param callable|null $mapFn allows a function to be mapped over each element - * - * @return \Generator */ public function listObjects(array $options = [], callable $mapFn = null): \Generator { @@ -152,8 +150,6 @@ class Container extends OperatorResource implements Creatable, Deletable, Retrie * {@see StorageObject::retrieve} or {@see StorageObject::download} on the returned StorageObject object to do that. * * @param string $name The name of the object - * - * @return StorageObject */ public function getObject($name): StorageObject { @@ -206,8 +202,6 @@ class Container extends OperatorResource implements Creatable, Deletable, Retrie * @param string $data['segmentContainer'] The container to which each segment will be uploaded * @param string $data['segmentPrefix'] The prefix that will come before each segment. If omitted, a default * is used: name/timestamp/filesize - * - * @return StorageObject */ public function createLargeObject(array $data): StorageObject { diff --git a/php-opencloud/openstack/src/ObjectStore/v1/Models/StorageObject.php b/php-opencloud/openstack/src/ObjectStore/v1/Models/StorageObject.php index a4016d2d..03df5974 100644 --- a/php-opencloud/openstack/src/ObjectStore/v1/Models/StorageObject.php +++ b/php-opencloud/openstack/src/ObjectStore/v1/Models/StorageObject.php @@ -6,13 +6,13 @@ namespace OpenStack\ObjectStore\v1\Models; use GuzzleHttp\Psr7\Uri; use OpenStack\Common\Resource\Alias; -use OpenStack\Common\Transport\Utils; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\StreamInterface; -use OpenStack\Common\Resource\OperatorResource; use OpenStack\Common\Resource\Creatable; use OpenStack\Common\Resource\Deletable; use OpenStack\Common\Resource\HasMetadata; +use OpenStack\Common\Resource\OperatorResource; +use OpenStack\Common\Transport\Utils; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\StreamInterface; /** * @property \OpenStack\ObjectStore\v1\Api $api @@ -75,8 +75,6 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha } /** - * @param ResponseInterface $response - * * @return $this */ private function populateHeaders(ResponseInterface $response): self @@ -92,8 +90,6 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha /** * Retrieves the public URI for this resource. - * - * @return \GuzzleHttp\Psr7\Uri */ public function getPublicUri(): Uri { @@ -141,8 +137,6 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha * improve performance when handling large objects. * * @param array $data {@see \OpenStack\ObjectStore\v1\Api::getObject} - * - * @return StreamInterface */ public function download(array $data = []): StreamInterface { diff --git a/php-opencloud/openstack/src/ObjectStore/v1/Service.php b/php-opencloud/openstack/src/ObjectStore/v1/Service.php index 27ba97c3..0f41da3b 100644 --- a/php-opencloud/openstack/src/ObjectStore/v1/Service.php +++ b/php-opencloud/openstack/src/ObjectStore/v1/Service.php @@ -16,8 +16,6 @@ class Service extends AbstractService { /** * Retrieves an Account object. - * - * @return Account */ public function getAccount(): Account { @@ -29,8 +27,6 @@ class Service extends AbstractService * * @param array $options {@see \OpenStack\ObjectStore\v1\Api::getAccount} * @param callable|null $mapFn allows a function to be mapped over each element in the collection - * - * @return \Generator */ public function listContainers(array $options = [], callable $mapFn = null): \Generator { @@ -44,8 +40,6 @@ class Service extends AbstractService * remote API is not contacted. * * @param string $name The unique name of the container - * - * @return Container */ public function getContainer(string $name = null): Container { @@ -56,8 +50,6 @@ class Service extends AbstractService * Creates a new container according to the values provided. * * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putContainer} - * - * @return Container */ public function createContainer(array $data): Container { diff --git a/php-opencloud/openstack/src/OpenStack.php b/php-opencloud/openstack/src/OpenStack.php index b88a7b77..ac494484 100644 --- a/php-opencloud/openstack/src/OpenStack.php +++ b/php-opencloud/openstack/src/OpenStack.php @@ -44,11 +44,6 @@ class OpenStack $this->builder = $builder ?: new Builder($options, 'OpenStack'); } - /** - * @param array $options - * - * @return Service - */ private function getDefaultIdentityService(array $options): Service { if (!isset($options['authUrl'])) { @@ -80,8 +75,6 @@ class OpenStack * Creates a new Compute v2 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Compute\v2\Service */ public function computeV2(array $options = []): \OpenStack\Compute\v2\Service { @@ -94,8 +87,6 @@ class OpenStack * Creates a new Networking v2 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Networking\v2\Service */ public function networkingV2(array $options = []): \OpenStack\Networking\v2\Service { @@ -108,8 +99,6 @@ class OpenStack * Creates a new Networking v2 Layer 3 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Networking\v2\Extensions\Layer3\Service */ public function networkingV2ExtLayer3(array $options = []): \OpenStack\Networking\v2\Extensions\Layer3\Service { @@ -122,8 +111,6 @@ class OpenStack * Creates a new Networking v2 Layer 3 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Networking\v2\Extensions\SecurityGroups\Service */ public function networkingV2ExtSecGroups(array $options = []): \OpenStack\Networking\v2\Extensions\SecurityGroups\Service { @@ -136,8 +123,6 @@ class OpenStack * Creates a new Identity v2 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Identity\v2\Service */ public function identityV2(array $options = []): \OpenStack\Identity\v2\Service { @@ -150,8 +135,6 @@ class OpenStack * Creates a new Identity v3 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Identity\v3\Service */ public function identityV3(array $options = []): \OpenStack\Identity\v3\Service { @@ -164,8 +147,6 @@ class OpenStack * Creates a new Object Store v1 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\ObjectStore\v1\Service */ public function objectStoreV1(array $options = []): \OpenStack\ObjectStore\v1\Service { @@ -178,8 +159,6 @@ class OpenStack * Creates a new Block Storage v2 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\BlockStorage\v2\Service */ public function blockStorageV2(array $options = []): \OpenStack\BlockStorage\v2\Service { @@ -192,8 +171,6 @@ class OpenStack * Creates a new Images v2 service. * * @param array $options options that will be used in configuring the service - * - * @return \OpenStack\Images\v2\Service */ public function imagesV2(array $options = []): \OpenStack\Images\v2\Service { @@ -204,10 +181,6 @@ class OpenStack /** * Creates a new Gnocchi Metric service v1. - * - * @param array $options - * - * @return \OpenStack\Metric\v1\Gnocchi\Service */ public function metricGnocchiV1(array $options = []): \OpenStack\Metric\v1\Gnocchi\Service { |