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
4 changes: 2 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
matrix:
include:
- php-version: '8.4'
docker-image: 'anzusystems/php:5.0.1-php84-cli'
docker-image: 'anzusystems/php:5.1.0-php84-cli'
- php-version: '8.5'
docker-image: 'anzusystems/php:5.0.1-php85-cli'
docker-image: 'anzusystems/php:5.1.0-php85-cli'

services:
mysql:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM anzusystems/php:5.0.1-php84-cli
FROM anzusystems/php:5.1.0-php84-cli
#
### Basic arguments and variables
ARG DOCKER_USER_ID
Expand Down
3 changes: 3 additions & 0 deletions src/ApiFilter/ApiParams.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ public function __construct()
$this->bigTable = self::DEFAULTS[self::BIG_TABLE];
}

/**
* @return Generator<int, QueryParameter>
*/
public static function generateAllAvailableOAQueryParams(): Generator
{
foreach (self::AVAILABLE_FILTERS as $filterName) {
Expand Down
2 changes: 1 addition & 1 deletion src/Model/OpenApi/Get/OAGetInfiniteList.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class OAGetInfiniteList extends Get
public function __construct(string $type)
{
parent::__construct(
parameters: iterator_to_array(ApiParams::generateAllAvailableOAQueryParams()),
parameters: array_values(iterator_to_array(ApiParams::generateAllAvailableOAQueryParams())),
responses: [
new OAResponseInfiniteList(type: $type),
]
Expand Down
2 changes: 1 addition & 1 deletion src/Model/OpenApi/Get/OAGetList.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ final class OAGetList extends Get
public function __construct(string $type, array $customFilters = [])
{
parent::__construct(
parameters: iterator_to_array(ApiParams::generateAllAvailableOAQueryParams()),
parameters: array_values(iterator_to_array(ApiParams::generateAllAvailableOAQueryParams())),
responses: [new OAResponseList($type)]
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/Model/OpenApi/Parameter/OAEnumParameterPath.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ final class OAEnumParameterPath extends PathParameter
public function __construct(string $name, string $class, ?string $description = null)
{
if (is_a($class, EnumInterface::class, true)) {
/** @var list<scalar> $enum */
$enum = array_values($class::values());
parent::__construct(
name: $name,
description: $description,
schema: new Schema(
type: 'string',
default: $class::Default,
enum: $class::values(),
enum: $enum,
)
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/Model/OpenApi/Property/OAEnumProperty.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ final class OAEnumProperty extends Property
public function __construct(string $class, ?string $description = null)
{
if (is_a($class, EnumInterface::class, true)) {
/** @var list<scalar> $enum */
$enum = array_values($class::values());
parent::__construct(
description: $description,
type: 'string',
default: $class::Default,
enum: $class::values(),
enum: $enum,
);
}
}
Expand Down
Loading