235 Commits

Author SHA1 Message Date
wing328
acd10318f7 Merge remote-tracking branch 'origin' into sync_master_230 2017-02-10 23:31:36 +08:00
Ainun Nazieb
05eea2436c [PHP] Validate parent's model first, if any (#4659)
* if model has parent, valid() & listInvalidProperties() will check the parents' first

* Run the ./bin/security/php-petstore.sh
2017-01-26 22:49:38 +08:00
Tony Tam
3476e83a36 fix for allowable values, #4645 (#4646)
* fix for allowable values, #4645

* fixed string values

* rebuilt for #4645
2017-01-25 12:11:49 +08:00
wing328
8e71dfb512 Fix model prefix/suffix with incorrect camelization (#4621)
* fix camelized name with suffix/prefix in java client

* fix php model name with prefix, suffix

* fix indentation in ts abstrat generator

* replace tab with spaces in ts abstract generator
2017-01-23 01:29:11 +08:00
wing328
9a8ede4189 update php sample 2017-01-19 21:22:20 +08:00
Pete Holiday
2e4de0ca1e Remove unnecessary call to setHost() in the constructor (#4525)
* Remove unnecessary call to setHost() in the constructor

The default host will be automatically set on the client by the ApiClient constructor.

* Updated PHP API Classes corresponding to template updates in #4525.

* Additional changes generated by the petstore update unrelated to #4525, but seem to have not been included yet.

* Add test to prevent regressions of #4525
2017-01-12 16:17:17 +08:00
Kevin Locke
df0c54d043 Support the empty string as an enumeration value (#4450)
When a string enumeration has the empty string as one of its available
values, the generated code for many languages is invalid because the
empty string can not be used as an identifier.  As with numbers and
symbols, provide a mapping to an English name which can be used as a
replacement.  In this case, "empty" for the empty string/empty value.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2017-01-06 19:30:47 +08:00
William Cheng
ce899e3776 Merge remote-tracking branch 'origin/master' into 2.3.0
Conflicts:
	appveyor.yml
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
	modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
	modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
	modules/swagger-codegen/src/main/resources/go/api.mustache
	modules/swagger-codegen/src/main/resources/objc/api-body.mustache
	modules/swagger-codegen/src/main/resources/objc/api-header.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
	samples/client/petstore-security-test/typescript-angular2/configuration.ts
	samples/client/petstore/go/go-petstore/docs/FakeApi.md
	samples/client/petstore/go/go-petstore/fake_api.go
	samples/client/petstore/go/go-petstore/pet_api.go
	samples/client/petstore/java/feign/pom.xml
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/RFC3339DateFormat.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
	samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONResponseSerializer.h
	samples/client/petstore/qt5cpp/client/SWGPetApi.h
	samples/client/petstore/qt5cpp/client/SWGStoreApi.h
	samples/client/petstore/qt5cpp/client/SWGUserApi.h
	samples/client/petstore/typescript-angular2/default/configuration.ts
	samples/client/petstore/typescript-angular2/npm/README.md
	samples/client/petstore/typescript-angular2/npm/configuration.ts
	samples/client/petstore/typescript-angular2/npm/package.json
	samples/client/petstore/typescript-angular2/npm/tsconfig.json
	samples/client/petstore/typescript-fetch/builds/default/api.ts
	samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
	samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
	samples/client/petstore/typescript-fetch/tests/default/test/PetApiFactory.ts
	samples/client/petstore/typescript-fetch/tests/default/test/StoreApiFactory.ts
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
	samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java
2017-01-05 17:44:39 +08:00
wing328
4870cf4ab1 Merge branch 'Ignore_Javatypes_On_ModelPre_and_Suffixes' of https://github.com/d0x/swagger-codegen into d0x-Ignore_Javatypes_On_ModelPre_and_Suffixes 2016-12-20 17:46:52 +08:00
wing328
7fd895b37d fix isPrimitiveType for file 2016-12-18 19:02:26 +08:00
wing328
8153f0e89b Fix test spec issue (#4334)
* fix issue with swagger spec (number => integer)

* remove space from spec
2016-12-07 16:46:41 +08:00
Robert Biehl
1ea9865a44 [PHP] Fix discriminator handling (#4246)
* [PHP] Fix discriminator handling

* [PHP] Fix discriminator handling (Update examples)
2016-11-25 16:12:41 +08:00
wing328
90512e6326 Remove Apache license from API client generators (#4197)
* remove php apache license

* remove apache license from C#

* remove apache license in objc code

* remove license from swift 3 code

* remove apache license from perl code

* remove license from scala code

* remove license from ts, go, android, cpp, scala

* remove license from java api client

* restore clojure petstore files

* remove license from travis file

* clean up apache-related terms in php, ruby, python mustache tempaltes

* remove license from JS API cilent
2016-11-16 21:44:49 +08:00
wing328
a6287bed1d Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2016-10-02 17:24:37 +08:00
Dalibor Karlović
10d3dea89e [PHP] fix PHPUnit invocation, add basic phpunit.xml.dist (#3864)
* feature(phpunit) fix PHPUnit invocation, add basic phpunit.xml.dist

* fix(phpunit) add proper paths relative to phpunit.xml.dist
2016-09-28 19:44:07 +08:00
Dalibor Karlović
70fa2fb78e [PHP] Better PSR2 compatibility (#3863)
* feature(php-cs-fixer) add php-cs-fixer support

* feature(php-cs-fixer) tweak Mustache templates to fit PSR2

* feature(php-cs-fixer) bin/php-petstore.sh output
2016-09-27 08:23:44 +08:00
Kim Sondrup
9bb097fcf5 [PHP] Correct Composer license identifier (#3848)
* [PHP] Correct Composer license identifier

* Update petstore PHP
2016-09-22 18:49:08 +08:00
Kim Sondrup
aad80b94c5 [PHP] Change APIException to expect headers as array (#3838)
* [PHP] Change APIException to expect headers as array

* Update petstore PHP
2016-09-22 18:47:07 +08:00
Xavi Aparicio
31a3436a8e Added !is_null condition in setter conditions for non-required properties 2016-09-14 13:41:05 +02:00
Ville Skyttä
735390f633 [Python, Ruby, PHP] Validate min/maxItems (#3734)
* python: Validate min/maxItems

* ruby: Validate min/maxItems

* lumen: Validate min/maxItems

* php: Validate min/maxItems
2016-09-08 17:33:59 +08:00
Ville Skyttä
91b7494e3e Spelling fixes 2016-09-06 14:45:04 +03:00
wing328
43bac10bb3 Merge pull request #3700 from scop/php
php: Fix syntax error when pattern contains a single quote
2016-09-03 16:37:40 +08:00
Kim Sondrup
1539986984 [PHP] Corrected PHPDoc type declarations (#3710)
* [PHP] Corrected PHPDoc type declarations

* Update petstore PHP
2016-09-03 16:06:07 +08:00
Ville Skyttä
2af822677f php: Fix syntax error when pattern contains a single quote 2016-09-02 10:42:08 +03:00
Ville Skyttä
e52a8e34cb Spelling fixes 2016-09-01 17:39:30 +03:00
wing328
da45cb7ff5 remove unnecessary changes for php codegen 2016-08-31 16:38:30 +08:00
Ville Skyttä
a95ade6d2a php: Update petstore 2016-08-30 08:05:04 +03:00
Arne Jørgensen
4008054209 [PHP] Regenerate petstore samples 2016-08-05 11:25:49 +02:00
wing328
1fde95f997 fix java okhttp (array of enum property) 2016-08-03 01:36:34 +08:00
wing328
25fa3e86f9 add enumName to store the enum prefix 2016-08-03 01:36:13 +08:00
wing328
0b8acb5b0c set allowablevalues of inner enum's allowablevalues 2016-08-03 01:35:58 +08:00
Arne Jørgensen
aacc235665 [PHP] Regenerate petstore samples 2016-08-01 11:48:52 +02:00
Arne Jørgensen
0f8e1f8105 [PHP] Client properties validation #3457 (#3480)
* [PHP] Avoid validation of unset, optional parameters

Fixes #3457.

* [PHP] Regenerate petstore samples
2016-08-01 15:24:47 +08:00
wing328
9489f7d3eb clear import mapping for gnereators that do not use it 2016-07-26 14:40:29 +08:00
Daniel Ge
b16eda17e8 Improve error message for connection failures
Previous ApiException message would simply print out the result of the
`curl_getinfo($curl)` call, which might be useful only if the developer
actually wanted very low-level information from curl about why a call
failed. The new message should print out a higher-level but more
informative, human-readable message. If necessary for debugging, the
ApiException's responseObject is set to the `curl_getinfo($curl)`.
2016-07-06 12:09:41 -07:00
Daniel Ge
20448dd9e3 Bump and regenerate PHP sample 2016-07-06 12:09:11 -07:00
Arne Jørgensen
a4ec29000a [PHP] Regenerate petstore samples 2016-06-30 07:12:28 +02:00
wing328
41636ae149 revert petstore-with-fake-endpoints-models-for-testing.yaml 2016-06-28 14:38:50 +08:00
wing328
ec2abe78e3 apply security fix to php lumne, silex, slim 2016-06-28 12:21:41 +08:00
wing328
f38c8373cc create new spec for security testing 2016-06-28 11:48:52 +08:00
wing328
ebd6ffaa4c better handle of single quote to avoid code injectio in php 2016-06-28 00:54:06 +08:00
wing328
1638adb79e avoid code injection in php api client 2016-06-27 21:51:27 +08:00
wing328
74239c422b add enum class support, merged test cases for php 2016-06-26 17:41:29 +08:00
Arne Jørgensen
614e98a404 [PHP] Regenerate petstore sample 2016-06-13 23:22:31 +02:00
Arne Jørgensen
f5f4adac29 [PHP] Handle empty array response correct 2016-06-13 23:22:04 +02:00
Arne Jørgensen
e41019fb2b [PHP] Regenerate petstore sample 2016-05-26 00:13:45 +02:00
Mikolaj Przybysz
6aa821d76d Rebuild php petstore sample client 2016-05-24 15:03:25 +02:00
wing328
7b1cfde891 add enum test in php api client 2016-05-23 15:38:20 +08:00
wing328
c6f03806df Replaced {{mediaType}} with {{{mediaType}} to keep the original media 2016-05-20 17:48:47 +08:00
Arne Jørgensen
d3fe0ae28a [PHP] Improve codestyle of phpunit tests 2016-05-14 13:45:41 +02:00