Merge branch 'new-func'

Author: Jamie Hannaford

.gitignore

@@ -1,4 +1,5 @@
 .idea/
+.test/
 coverage/
 vendor/
 

src/Common/Api/AbstractParams.php

@@ -14,10 +14,12 @@ abstract class AbstractParams
     // types
     const STRING_TYPE = "string";
     const BOOL_TYPE = "boolean";
+    const BOOLEAN_TYPE = self::BOOL_TYPE;
     const OBJECT_TYPE = "object";
     const ARRAY_TYPE = "array";
     const NULL_TYPE = "NULL";
     const INT_TYPE = 'integer';
+    const INTEGER_TYPE = self::INT_TYPE;
 
     public static function isSupportedLocation($val)
     {

src/Common/Api/Parameter.php

@@ -125,10 +125,6 @@ public function __construct(array $data)
     {
         $this->hydrate($data);
 
-        if (!$this->type) {
-            $this->type = 'string';
-        }
-
         $this->required = (bool)$this->required;
 
         $this->stockLocation($data);
@@ -272,7 +268,7 @@ private function hasCorrectType($userValue)
     {
         // Helper fn to see whether an array is associative (i.e. a JSON object)
         $isAssociative = function ($value) {
-            return is_array($value) && (bool)count(array_filter(array_keys($value), 'is_string'));
+            return is_array($value) && array_keys($value) !== range(0, count($value) - 1);
         };
 
         // For params defined as objects, we'll let the user get away with
@@ -285,6 +281,10 @@ private function hasCorrectType($userValue)
             return is_a($userValue, $this->type);
         }
 
+        if (!$this->type) {
+            return true;
+        }
+
         return gettype($userValue) == $this->type;
     }
 

src/Common/HydratorStrategyTrait.php

@@ -24,4 +24,12 @@ private function hydrate(array $data, array $aliases = [])
             }
         }
     }
+
+    private function set($key, $property, array $data, callable $fn = null)
+    {
+        if (isset($data[$key]) && property_exists($this, $property)) {
+            $value = $fn ? call_user_func($fn, $data[$key]) : $data[$key];
+            $this->$property = $value;
+        }
+    }
 }

src/Common/Resource/AbstractResource.php

@@ -116,7 +116,8 @@ private function parseDocBlockValue($type, $val)
     private function isNotNativeType($type)
     {
         return !in_array($type, [
-            'string', 'bool', 'boolean', 'null', 'array', 'object', 'int', 'integer', 'float', 'numeric', 'mixed'
+            'string', 'bool', 'boolean', 'double', 'null', 'array', 'object', 'int', 'integer', 'float', 'numeric',
+            'mixed'
         ]);
     }
 

src/Common/Resource/HasWaiterTrait.php

@@ -95,9 +95,9 @@ private function shouldHalt($timeout, $startTime)
      *                          or exceed this timeout, the blocking operation will immediately cease. If FALSE
      *                          is provided, the timeout will never be considered.
      */
-    public function waitUntilActive($timeout = 60)
+    public function waitUntilActive($timeout = false)
     {
-        $this->waitUntil('ACTIVE');
+        $this->waitUntil('ACTIVE', $timeout);
     }
 
     public function waitUntilDeleted($timeout = 60, $sleepPeriod = 1)

src/Common/Service/Builder.php

@@ -5,7 +5,6 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
-use OpenStack\Common\Auth\ServiceUrlResolver;
 use OpenStack\Common\Auth\Token;
 use OpenStack\Common\Transport\HandlerStack;
 use OpenStack\Common\Transport\Middleware;
@@ -26,6 +25,9 @@ class Builder
      */
     private $globalOptions = [];
 
+    /** @var string */
+    private $rootNamespace;
+
     /**
      * Defaults that will be applied to options if no values are provided by the user.
      *
@@ -38,9 +40,10 @@ class Builder
      *                             Eventually they will be merged (and if necessary overridden) by the
      *                             service-specific options passed in.
      */
-    public function __construct(array $globalOptions = [])
+    public function __construct(array $globalOptions = [], $rootNamespace = 'OpenStack')
     {
         $this->globalOptions = $globalOptions;
+        $this->rootNamespace = $rootNamespace;
     }
 
     /**
@@ -53,7 +56,7 @@ public function __construct(array $globalOptions = [])
      */
     private function getClasses($serviceName, $serviceVersion)
     {
-        $rootNamespace = sprintf("OpenStack\\%s\\v%d", $serviceName, $serviceVersion);
+        $rootNamespace = sprintf("%s\\%s\\v%d", $this->rootNamespace, $serviceName, $serviceVersion);
 
         return [
             sprintf("%s\\Api", $rootNamespace),
@@ -164,4 +167,4 @@ private function mergeOptions(array $serviceOptions)
 
         return $options;
     }
-}
+}

src/Compute/v2/Models/Server.php

@@ -85,12 +85,12 @@ class Server extends AbstractResource implements
 
     protected $aliases = [
         'block_device_mapping_v2' => 'blockDeviceMapping',
-        'accessIPv4' => 'ipv4',
-        'accessIPv6' => 'ipv6',
-        'tenant_id'  => 'tenantId',
-        'user_id'    => 'userId',
-        'security_groups' => 'securityGroups',
-        'OS-EXT-STS:task_state' => 'taskState',
+        'accessIPv4'              => 'ipv4',
+        'accessIPv6'              => 'ipv6',
+        'tenant_id'               => 'tenantId',
+        'user_id'                 => 'userId',
+        'security_groups'         => 'securityGroups',
+        'OS-EXT-STS:task_state'   => 'taskState',
     ];
 
     /**
@@ -141,7 +141,7 @@ public function changePassword($newPassword)
     {
         $this->execute($this->api->changeServerPassword(), [
             'id'       => $this->id,
-            'password' => $newPassword
+            'password' => $newPassword,
         ]);
     }
 
@@ -171,7 +171,7 @@ public function rebuild(array $options)
     {
         $options['id'] = $this->id;
         $response = $this->execute($this->api->rebuildServer(), $options);
-        
+
         $this->populateFromResponse($response);
     }
 
@@ -184,7 +184,7 @@ public function rebuild(array $options)
     public function resize($flavorId)
     {
         $response = $this->execute($this->api->resizeServer(), [
-            'id' => $this->id,
+            'id'       => $this->id,
             'flavorId' => $flavorId,
         ]);
 

src/Identity/v2/Api.php

@@ -7,7 +7,6 @@
 /**
  * Represents the OpenStack Identity v2 API.
  *
- * @internal
  * @package OpenStack\Identity\v2
  */
 class Api implements ApiInterface

src/Identity/v2/Service.php

@@ -2,6 +2,7 @@
 
 namespace OpenStack\Identity\v2;
 
+use GuzzleHttp\ClientInterface;
 use OpenStack\Common\Auth\IdentityService;
 use OpenStack\Common\Service\AbstractService;
 use OpenStack\Identity\v2\Models\Catalog;
@@ -14,6 +15,11 @@
  */
 class Service extends AbstractService implements IdentityService
 {
+    public static function factory(ClientInterface $client)
+    {
+        return new static($client, new Api());
+    }
+
     public function authenticate(array $options = [])
     {
         $definition = $this->api->postToken();