Skip to content

Commit e4fb6a3

Browse files
committed
Replace uri_template function with Rize\UriTemplate\UriTemplate class
- Add rize/uri-template ^0.3 dependency - Replace uri_template() function with UriTemplate class for better maintainability - All tests pass (10/10)
1 parent 9debf5b commit e4fb6a3

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"psr/http-message": "^2.0",
1515
"ray/aop": "^2.18",
1616
"ray/di": "^2.18",
17-
"ray/media-query": "1.x-dev"
17+
"ray/media-query": "1.x-dev",
18+
"rize/uri-template": "^0.3"
1819
},
1920
"require-dev": {
2021
"bamarni/composer-bin-plugin": "^1.8",

src/WebApiQuery.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
use Psr\Http\Message\MessageInterface;
1212
use Ray\MediaQuery\Annotation\Qualifier\UriTemplateBindings;
1313
use Ray\MediaQuery\Exception\WebApiRequestException;
14+
use Rize\UriTemplate\UriTemplate;
1415

1516
use function json_decode;
16-
use function uri_template;
1717

1818
use const JSON_THROW_ON_ERROR;
1919

@@ -82,7 +82,8 @@ public function getHttpMessage(string $method, string $uri, array $query): Messa
8282
private function executeRequest(string $method, string $uri, array $query): MessageInterface
8383
{
8484
$this->logger->start();
85-
$boundUri = uri_template($uri, $this->uriTemplateBindings + $query);
85+
$uriTemplate = new UriTemplate();
86+
$boundUri = $uriTemplate->expand($uri, $this->uriTemplateBindings + $query);
8687
$response = $this->client->request($method, $boundUri, $query);
8788
$this->logger->log($boundUri, $query);
8889

0 commit comments

Comments
 (0)