Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add oneOf schema support #103

Merged
merged 12 commits into from
Jan 2, 2024
Merged

Add oneOf schema support #103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2ea37bb
feat(makefile): add build target
dmolnar-byborgenterprises Nov 22, 2023
6827b08
feat: add `oneOf` schema support
dmolnar-byborgenterprises Dec 4, 2023
052e66a
oneOf support
Dec 5, 2023
cb338bc
discriminator support
Dec 8, 2023
d8fa4ed
Merge remote-tracking branch 'origin/master' into fork-master
Dec 21, 2023
2af3b3e
make discriminator optional
Dec 22, 2023
cd67a66
import UnexpectedResponseBodyException
Dec 22, 2023
b162168
fix oneOf and anyOf support
Dec 22, 2023
e7d0e8c
anyOf test
Dec 22, 2023
cb77c34
using $matches
Dec 22, 2023
c3b5d2d
using php 8
Dec 22, 2023
55ec4a9
new tests
Dec 25, 2023
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
8 changes: 1 addition & 7 deletions test/suite/functional/Generator/SchemaMapper/AnyOfResponseBodyMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,8 @@

class GetExampleResponseBodyMapper implements SchemaMapperInterface
{
private AnimalMapper $animalMapper;

private MachineMapper $machineMapper;

public function __construct(AnimalMapper $animalMapper, MachineMapper $machineMapper)
public function __construct(private AnimalMapper $animalMapper, private MachineMapper $machineMapper)
{
$this->animalMapper = $animalMapper;
$this->machineMapper = $machineMapper;
}

/**
Expand Down
8 changes: 1 addition & 7 deletions test/suite/functional/Generator/SchemaMapper/OneOfResponseBodyMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,8 @@

class GetExampleResponseBodyMapper implements SchemaMapperInterface
{
private AnimalMapper $animalMapper;

private MachineMapper $machineMapper;

public function __construct(AnimalMapper $animalMapper, MachineMapper $machineMapper)
public function __construct(private AnimalMapper $animalMapper, private MachineMapper $machineMapper)
{
$this->animalMapper = $animalMapper;
$this->machineMapper = $machineMapper;
}

public function toSchema(array $payload): GetExampleResponseBody
Expand Down
8 changes: 1 addition & 7 deletions test/suite/functional/Generator/SchemaMapper/OneOfResponseBodyMapperWithoutDiscriminator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,8 @@

class GetExampleResponseBodyMapper implements SchemaMapperInterface
{
private AnimalMapper $animalMapper;

private MachineMapper $machineMapper;

public function __construct(AnimalMapper $animalMapper, MachineMapper $machineMapper)
public function __construct(private AnimalMapper $animalMapper, private MachineMapper $machineMapper)
{
$this->animalMapper = $animalMapper;
$this->machineMapper = $machineMapper;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions test/suite/functional/Generator/SchemaMapperGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ public function exampleProvider(): array
'/SchemaMapper/oneOf.yaml',
'/SchemaMapper/OneOfResponseBodyMapper.php',
self::BASE_NAMESPACE . SchemaMapperGenerator::NAMESPACE_SUBPATH . '\\GetExampleResponseBodyMapper',
ConfigurationBuilder::fake()->build(),
ConfigurationBuilder::fake()->withPhpVersion(PhpVersion::VERSION_PHP80)->build(),
],
'OneOf response without discriminator' => [
'/SchemaMapper/oneOfWithoutDiscriminator.yaml',
'/SchemaMapper/OneOfResponseBodyMapperWithoutDiscriminator.php',
self::BASE_NAMESPACE . SchemaMapperGenerator::NAMESPACE_SUBPATH . '\\GetExampleResponseBodyMapper',
ConfigurationBuilder::fake()->build(),
ConfigurationBuilder::fake()->withPhpVersion(PhpVersion::VERSION_PHP80)->build(),
vsouz4 marked this conversation as resolved.
Show resolved Hide resolved
],
'AnyOf response' => [
'/SchemaMapper/anyOf.yaml',
'/SchemaMapper/AnyOfResponseBodyMapper.php',
self::BASE_NAMESPACE . SchemaMapperGenerator::NAMESPACE_SUBPATH . '\\GetExampleResponseBodyMapper',
ConfigurationBuilder::fake()->build(),
ConfigurationBuilder::fake()->withPhpVersion(PhpVersion::VERSION_PHP80)->build(),
],
];
}
Expand Down
Loading