From 54ec6723deb44e325782afd366eeec01ee29ac55 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Wed, 23 Mar 2016 15:30:47 +0100
Subject: Maj Library

---
 .../src/Common/Resource/AbstractResource.php       | 24 ++++++++++++----------
 .../common/src/Common/Resource/Creatable.php       |  4 ++--
 .../common/src/Common/Resource/Deletable.php       |  2 +-
 .../common/src/Common/Resource/HasMetadata.php     | 10 ++++-----
 .../common/src/Common/Resource/HasWaiterTrait.php  | 10 ++++-----
 .../common/src/Common/Resource/Iterator.php        |  2 +-
 .../common/src/Common/Resource/Listable.php        |  2 +-
 .../src/Common/Resource/ResourceInterface.php      |  2 +-
 .../common/src/Common/Resource/Retrievable.php     |  2 +-
 .../common/src/Common/Resource/Updateable.php      |  2 +-
 10 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'server/vendor/php-opencloud/common/src/Common/Resource')

diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php b/server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php
index 9f79b07..989fde7 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
@@ -60,7 +60,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
      *
      * @return $this|ResourceInterface
      */
-    public function populateFromResponse(ResponseInterface $response)
+    public function populateFromResponse(ResponseInterface $response): self
     {
         if (strpos($response->getHeaderLine('Content-Type'), 'application/json') === 0) {
             $json = Utils::jsonDecode($response);
@@ -79,12 +79,12 @@ abstract class AbstractResource extends Operator implements ResourceInterface
      *
      * @return mixed|void
      */
-    public function populateFromArray(array $array)
+    public function populateFromArray(array $array): self
     {
         $reflClass = new \ReflectionClass($this);
 
         foreach ($array as $key => $val) {
-            $propertyName = isset($this->aliases[$key]) ? $this->aliases[$key] : $key;
+            $propertyName = (string) (isset($this->aliases[$key]) ? $this->aliases[$key] : $key);
 
             if (property_exists($this, $propertyName)) {
                 if ($type = $this->extractTypeFromDocBlock($reflClass, $propertyName)) {
@@ -94,9 +94,11 @@ abstract class AbstractResource extends Operator implements ResourceInterface
                 $this->$propertyName = $val;
             }
         }
+
+        return $this;
     }
 
-    private function parseDocBlockValue($type, $val)
+    private function parseDocBlockValue(string $type, $val)
     {
         if (strpos($type, '[]') === 0 && is_array($val)) {
             $array = [];
@@ -113,7 +115,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
         return $val;
     }
 
-    private function isNotNativeType($type)
+    private function isNotNativeType(string $type): bool
     {
         return !in_array($type, [
             'string', 'bool', 'boolean', 'double', 'null', 'array', 'object', 'int', 'integer', 'float', 'numeric',
@@ -121,7 +123,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
         ]);
     }
 
-    private function normalizeModelClass($class)
+    private function normalizeModelClass(string $class): string
     {
         if (strpos($class, '\\') === false) {
             $currentNamespace = (new \ReflectionClass($this))->getNamespaceName();
@@ -131,7 +133,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
         return $class;
     }
 
-    private function extractTypeFromDocBlock(\ReflectionClass $reflClass, $propertyName)
+    private function extractTypeFromDocBlock(\ReflectionClass $reflClass, string $propertyName)
     {
         $docComment = $reflClass->getProperty($propertyName)->getDocComment();
 
@@ -174,7 +176,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
         return $this->execute($definition, $this->getAttrs(array_keys($definition['params'])));
     }
 
-    private function getResourcesKey()
+    private function getResourcesKey(): string
     {
         $resourcesKey = $this->resourcesKey;
 
@@ -189,7 +191,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
     /**
      * {@inheritDoc}
      */
-    public function enumerate(array $def, array $userVals = [], callable $mapFn = null)
+    public function enumerate(array $def, array $userVals = [], callable $mapFn = null): \Generator
     {
         $operation = $this->getOperation($def);
 
@@ -217,7 +219,7 @@ abstract class AbstractResource extends Operator implements ResourceInterface
         return $iterator();
     }
 
-    public function extractMultipleInstances(ResponseInterface $response, $key = null)
+    public function extractMultipleInstances(ResponseInterface $response, string $key = null): array
     {
         $key = $key ?: $this->getResourcesKey();
         $resourcesData = Utils::jsonDecode($response)[$key];
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php
index 19579c1..5f16bfa 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
@@ -15,5 +15,5 @@ interface Creatable
      * @param array $userOptions
      * @return self
      */
-    public function create(array $userOptions);
+    public function create(array $userOptions): Creatable;
 }
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php
index eeb0602..c825861 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php b/server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php
index 53b51fc..4bdb53d 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
@@ -12,7 +12,7 @@ interface HasMetadata
      *
      * @return array
      */
-    public function getMetadata();
+    public function getMetadata(): array;
 
     /**
      * Merges a set of new values with those which already exist (on the remote API) for a resource. For example, if
@@ -32,7 +32,7 @@ interface HasMetadata
      *
      * @param array $metadata The new metadata items
      *
-     * @return mixed
+     * @return void
      */
     public function mergeMetadata(array $metadata);
 
@@ -52,7 +52,7 @@ interface HasMetadata
      *
      * @param array $metadata The new metadata items
      *
-     * @return mixed
+     * @return void
      */
     public function resetMetadata(array $metadata);
 
@@ -63,5 +63,5 @@ interface HasMetadata
      *
      * @return array
      */
-    public function parseMetadata(ResponseInterface $response);
+    public function parseMetadata(ResponseInterface $response): array;
 }
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php b/server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php
index 519be7e..ddc4bef 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
@@ -24,7 +24,7 @@ trait HasWaiterTrait
      *                            or exceed this timeout, the blocking operation will immediately cease.
      * @param int    $sleepPeriod The amount of time to pause between each HTTP request.
      */
-    public function waitUntil($status, $timeout = 60, $sleepPeriod = 1)
+    public function waitUntil(string $status, $timeout = 60, int $sleepPeriod = 1)
     {
         $startTime = time();
 
@@ -53,7 +53,7 @@ trait HasWaiterTrait
      *                              is provided, the timeout will never be considered.
      * @param int      $sleepPeriod The amount of time to pause between each HTTP request.
      */
-    public function waitWithCallback(callable $fn, $timeout = 60, $sleepPeriod = 1)
+    public function waitWithCallback(callable $fn, $timeout = 60, int $sleepPeriod = 1)
     {
         $startTime = time();
 
@@ -78,7 +78,7 @@ trait HasWaiterTrait
      *
      * @return bool
      */
-    private function shouldHalt($timeout, $startTime)
+    private function shouldHalt($timeout, int $startTime)
     {
         if ($timeout === false) {
             return false;
@@ -100,7 +100,7 @@ trait HasWaiterTrait
         $this->waitUntil('ACTIVE', $timeout);
     }
 
-    public function waitUntilDeleted($timeout = 60, $sleepPeriod = 1)
+    public function waitUntilDeleted($timeout = 60, int $sleepPeriod = 1)
     {
         $startTime = time();
 
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php b/server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php
index 63d4455..05507f0 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Listable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Listable.php
index 8e255c0..c3041d5 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/Listable.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/Listable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php b/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
index 8cf841b..ffe3d20 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php
index 333b2c2..1e3b726 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php
index a9a3f0e..228c496 100644
--- a/server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php
+++ b/server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenCloud\Common\Resource;
 
-- 
cgit v1.2.3