Use the separate guzzlehttp/uri-template for templating URLs.

Author: jbeales

composer.json

@@ -35,6 +35,7 @@
     "require": {
         "php": "~7.0",
         "guzzlehttp/guzzle": "^7.0",
+        "guzzlehttp/uri-template": "0.2",
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {

src/Common/Api/OperatorTrait.php

@@ -11,6 +11,7 @@
 use OpenStack\Common\Resource\ResourceInterface;
 use OpenStack\Common\Transport\RequestSerializer;
 use Psr\Http\Message\ResponseInterface;
+use OpenStack\Common\Transport\Utils;
 
 trait OperatorTrait
 {
@@ -109,8 +110,7 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
 
         $options = (new RequestSerializer())->serializeOptions($operation, $userValues);
         $method  = $async ? 'requestAsync' : 'request';
-        $uri     = uri_template($operation->getPath(), $userValues);
-
+        $uri     = Utils::uri_template($operation->getPath(), $userValues);
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }
 

src/Common/Transport/Utils.php

@@ -7,6 +7,7 @@
 use function GuzzleHttp\Psr7\uri_for;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
+use GuzzleHttp\UriTemplate\UriTemplate;
 
 class Utils
 {
@@ -80,4 +81,22 @@ public static function appendPath(UriInterface $uri, $path): UriInterface
     {
         return uri_for(rtrim((string) $uri, '/').'/'.$path);
     }
+
+     /**
+     * Expands a URI template
+     *
+     * @param string $template  URI template
+     * @param array  $variables Template variables
+     *
+     * @return string
+     */
+    public static function uri_template($template, array $variables): string
+    {
+        if (extension_loaded('uri_template')) {
+            // @codeCoverageIgnoreStart
+            return \uri_template($template, $variables);
+            // @codeCoverageIgnoreEnd
+        }
+        return UriTemplate::expand($template, $variables);
+    }
 }