Skip to content

[Slim4] Add ref support to Data Mocker #4932

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

Merged
wing328 merged 11 commits into from
Jan 10, 2020
Merged

[Slim4] Add ref support to Data Mocker #4932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aa0bfe8
[Slim4] Add new method to Mocker interface
ybelenko Jan 4, 2020
5240505
[Slim4] Add implementation and tests for new method
ybelenko Jan 4, 2020
5398dd7
[Slim4] Add test fixture to encrease code coverage
ybelenko Jan 4, 2020
3beaef2
[Slim4] Add ref support to mockArray method
ybelenko Jan 5, 2020
cba5c34
[Slim4] Add mockFromRef method
ybelenko Jan 6, 2020
07bfc2d
[Slim4] Add ref support to mockObject method
ybelenko Jan 6, 2020
8283a69
[Slim4] Add ModelInterface
ybelenko Jan 6, 2020
629b9ee
[Slim4] Refresh samples
ybelenko Jan 6, 2020
110dc96
[Slim4] Add ref support to mockFromSchema method
ybelenko Jan 7, 2020
90e283b
[Slim4] Run all test suites by default test command
ybelenko Jan 7, 2020
8fa10fd
[Slim4] Fix enum option of string mocking
ybelenko Jan 7, 2020
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
Prev Previous commit
Next Next commit
[Slim4] Add ref support to mockFromSchema method
  • Loading branch information
@ybelenko
ybelenko committed Jan 8, 2020
commit 110dc9674fee66f1d164bd01114f7fb9e421da67
4 changes: 3 additions & 1 deletion modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,9 @@ final class OpenApiDataMocker implements IMocker
public function mockFromSchema($schema)
{
$props = $this->extractSchemaProperties($schema);
if ($props['type'] === null) {
if (array_key_exists('$ref', $props) && !empty($props['$ref'])) {
return $this->mockFromRef($props['$ref']);
} elseif ($props['type'] === null) {
throw new InvalidArgumentException('"schema" must be object or assoc array with "type" property');
}
return $this->mock($props['type'], $props['format'], $props);
Expand Down
4 changes: 4 additions & 0 deletions ...s/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,10 @@ class OpenApiDataMockerTest extends TestCase
],
IsType::TYPE_OBJECT,
],
'referenced class' => [
['$ref' => '#/components/schemas/CatRefTestClass'],
IsType::TYPE_OBJECT,
],
];
}

Expand Down
4 changes: 3 additions & 1 deletion samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,9 @@ public function mockObject(
public function mockFromSchema($schema)
{
$props = $this->extractSchemaProperties($schema);
if ($props['type'] === null) {
if (array_key_exists('$ref', $props) && !empty($props['$ref'])) {
return $this->mockFromRef($props['$ref']);
} elseif ($props['type'] === null) {
throw new InvalidArgumentException('"schema" must be object or assoc array with "type" property');
}
return $this->mock($props['type'], $props['format'], $props);
Expand Down
4 changes: 4 additions & 0 deletions samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,10 @@ public function provideMockFromSchemaCorrectArguments()
],
IsType::TYPE_OBJECT,
],
'referenced class' => [
['$ref' => '#/components/schemas/CatRefTestClass'],
IsType::TYPE_OBJECT,
],
];
}

Expand Down