Skip to content

Commit

Permalink
fix buggy ObjectSerializer map deserialization
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathaningram committed Dec 4, 2020
1 parent 4c761ba commit 9e590e8
Show file tree
Hide file tree
Showing 10 changed files with 417 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .openapi-generator-ignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.php_cs
.travis.yml
git_push.sh
phpunit.xml.dist
2 changes: 0 additions & 2 deletions .openapi-generator/FILES
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.gitignore
.php_cs
README.md
composer.json
docs/Api/CollectionsApi.md
Expand Down Expand Up @@ -125,7 +124,6 @@ lib/Model/UpsertRecordRequest.php
lib/Model/UpsertRecordRequestPipeline.php
lib/Model/UpsertRecordResponse.php
lib/ObjectSerializer.php
phpunit.xml.dist
test/Api/CollectionsApiTest.php
test/Api/PipelinesApiTest.php
test/Api/RecordsApiTest.php
Expand Down
9 changes: 2 additions & 7 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@ return PhpCsFixer\Config::create()
"strict_param" => true,
"no_trailing_whitespace" => false,
"no_trailing_whitespace_in_comment" => false,
"braces" => false,
"braces" => true,
"single_blank_line_at_eof" => false,
"blank_line_after_namespace" => false,
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude("test")
->exclude("tests")
->in(__DIR__)
);
->setFinder(PhpCsFixer\Finder::create()->in(__DIR__));
2 changes: 2 additions & 0 deletions generate/.openapi-generator-ignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.php_cs
.travis.yml
git_push.sh
phpunit.xml.dist
3 changes: 2 additions & 1 deletion generate/docker.bash
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ cp .openapi-generator-ignore $GEN_PATH/

rm -rf $GEN_PATH/docs
rm -rf $GEN_PATH/lib
rm -rf $GEN_PATH/test
rm -rf $GEN_PATH/test/Api
rm -rf $GEN_PATH/test/Model

OPENAPI_PATH=`mktemp /tmp/openapi.json.XXX`
trap "rm -f $OPENAPI_PATH" EXIT
Expand Down
4 changes: 4 additions & 0 deletions generate/post-generate.bash
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ if [ -z "$GEN_PATH" ]; then
die "GEN_PATH must be set, e.g. /path/to/sajari/sdk-php"
fi

# TODO(jingram): Prettier freezes up if the vendor folder is there, not sure why
# it's not being ignored.
rm -rf $GEN_PATH/vendor

npx prettier --write -c $GEN_PATH
Loading

0 comments on commit 9e590e8

Please sign in to comment.