Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/Driver/OpenSearch/OpenSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,21 @@ protected function buildUrl(string ...$path): string
return "/" . implode("/", array_map(rawurlencode(...), $path));
}

/**
* Build a URL with query parameters
* @param string[] $path
* @param string[] $parameters
* @return string
*/
protected function buildParameterizedUrl(array $path, array $parameters = []): string
{
$url = $this->buildUrl(...$path);
if (!empty($parameters)) {
$url .= "?" . http_build_query($parameters);
}
return $url;
}

/**
* Save the model
*
Expand Down Expand Up @@ -212,7 +227,7 @@ public function search(Search $search): SearchResult

$response = $this->request(
"GET",
$this->buildUrl($modelClassName::getName(), "_search"),
$this->buildParameterizedUrl([$modelClassName::getName(), "_search"], $search->getParameters()),
$search->getSearchQuery()
);
if (!isset($response->hits) || !is_object($response->hits) || !isset($response->hits->hits) || !is_array($response->hits->hits)) {
Expand Down
29 changes: 25 additions & 4 deletions src/Search/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,35 @@
class Search
{
/**
* @var string|null
* The class name of the model to search
* @var class-string<ModelInterface>|null
*/
protected ?string $modelClassName = null;

/**
* The search query
* @var array
*/
protected array $searchQuery = [];

/**
* Additional parameters for the search
* @var string[]
*/
protected array $parameters = [];

/**
* Search constructor.
* @param array $searchQuery
* @param array $parameters
*/
public function __construct(array $searchQuery = [])
public function __construct(
array $searchQuery = [],
array $parameters = [],
)
{
$this->searchQuery = $searchQuery;
$this->parameters = $parameters;
}

/**
Expand All @@ -38,7 +51,15 @@ public function getSearchQuery(): array
}

/**
* @param string|null $modelClassName
* @return string[]
*/
public function getParameters(): array
{
return $this->parameters;
}

/**
* @param class-string<ModelInterface>|null $modelClassName
* @return Search
*/
public function setModelClassName(?string $modelClassName): Search
Expand All @@ -54,4 +75,4 @@ public function getModelClassName(): ?string
{
return $this->modelClassName;
}
}
}
Loading