Changes for beta10 (#5)
- Add In/InArray support - Add ORDER BY support for `Find` functions - Update dependencies - Implement fixes identified via static analysis Reviewed-on: #5
This commit was merged in pull request #5.
This commit is contained in:
@@ -19,19 +19,19 @@ class Parameters
|
||||
* Create an ID parameter (name ":id", key will be treated as a string)
|
||||
*
|
||||
* @param mixed $key The key representing the ID of the document
|
||||
* @return array|string[] An associative array with an "@id" parameter/value pair
|
||||
* @return array<string, mixed> An associative array with an "@id" parameter/value pair
|
||||
*/
|
||||
public static function id(mixed $key): array
|
||||
{
|
||||
return [':id' => is_int($key) || is_string($key) ? $key : "$key"];
|
||||
return [':id' => ((is_int($key) || is_string($key)) ? $key : "$key")];
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a parameter with a JSON value
|
||||
*
|
||||
* @param string $name The name of the JSON parameter
|
||||
* @param object|array $document The value that should be passed as a JSON string
|
||||
* @return array An associative array with the named parameter/value pair
|
||||
* @param mixed[]|object $document The value that should be passed as a JSON string
|
||||
* @return array<string, string> An associative array with the named parameter/value pair
|
||||
*/
|
||||
public static function json(string $name, object|array $document): array
|
||||
{
|
||||
@@ -59,23 +59,21 @@ class Parameters
|
||||
/**
|
||||
* Fill in parameter names for any fields missing one
|
||||
*
|
||||
* @param Field[] $fields The fields for the query
|
||||
* @return Field[] The fields, all with non-blank parameter names
|
||||
* @param Field[] $fields The fields for the query (entries with no names will be modified)
|
||||
*/
|
||||
public static function nameFields(array $fields): array
|
||||
public static function nameFields(array &$fields): void
|
||||
{
|
||||
array_walk($fields, function (Field $field, int $idx) {
|
||||
if (empty($field->paramName)) $field->paramName =":field$idx";
|
||||
});
|
||||
return $fields;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add field parameters to the given set of parameters
|
||||
*
|
||||
* @param Field[] $fields The fields being compared in the query
|
||||
* @param array $parameters An associative array of parameters to which the fields should be added
|
||||
* @return array An associative array of parameter names and values with the fields added
|
||||
* @param array<string, mixed> $parameters An associative array of parameters to which the fields should be added
|
||||
* @return array<string, mixed> An associative array of parameter names and values with the fields added
|
||||
*/
|
||||
public static function addFields(array $fields, array $parameters): array
|
||||
{
|
||||
@@ -87,7 +85,7 @@ class Parameters
|
||||
*
|
||||
* @param string $paramName The name of the parameter for the field names
|
||||
* @param string[] $fieldNames The names of the fields for the parameter
|
||||
* @return array An associative array of parameter/value pairs for the field names
|
||||
* @return array<string, string> An associative array of parameter/value pairs for the field names
|
||||
* @throws Exception If the database mode has not been set
|
||||
*/
|
||||
public static function fieldNames(string $paramName, array $fieldNames): array
|
||||
|
||||
Reference in New Issue
Block a user