241 Commits

Author SHA1 Message Date
Paŭlo Ebermann
9be178b26a Merge branch 'master' into new-sync-master-to-2.3.0 2017-03-13 21:42:41 +01:00
baartosz
cffaaa027a minor improvements to Configuration php template (#4989) 2017-03-09 17:28:19 +08:00
wing328
4fe79f0078 Remove default format (JSON) from API operations (#4987)
* remove default format (json) and update ruby petstore

* update python petstore sample

* update php petstore sample

* update android petstore sample

* update java petstore sample

* update objc sample

* remove default format (json) from perl
2017-03-09 11:12:01 +08:00
baartosz
d21e156071 [PHP] error when deserializing enums #4032 (#4886)
* fixed enum template; added enum handling to ObjectSerializer

* regenerated templates

* improved InvalidArgumentException message

* regenerated sample client

* added value check of OuterEnum during sanitization

* regenerated samples
2017-03-08 19:08:42 +08:00
baartosz
26257daec3 fixed ApiException's methods return types (#4845) 2017-03-02 16:45:42 +08:00
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
Maik Kulbe
d4c96c97c1 Merge with Upstream 2017-01-19 13:53:06 +01:00
Maik Kulbe
e82f3c53b4 Added support for cURL proxy configuration to PHP client 2017-01-19 11:48:55 +01: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
Brian Voss
43ab14b200 Adding Curl connect timeout configuration to PHP generation templates (#4500) 2017-01-06 19:14:39 +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
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
0efa5cab35 Revert "[WIP] Improve PHP client emitted code quality" 2016-10-12 16:07:37 +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ć
19f1c7e095 feature(PHP QA) add initial PHP client template tweaks to improve emitted code quality 2016-09-29 08:48:24 +02: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
Ville Skyttä
ddc5b80438 [Lumen, PHP, Python, Ruby] Implement exclusiveMinimum/Maximum (#3717)
* Ignore exclusiveMinimum/Maximum in setting hasValidation

* python: Implement exclusiveMinimum/Maximum

* ruby: Implement exclusiveMinimum/Maximum

* lumen: Implement exclusiveMinimum/Maximum

* php: Implement exclusiveMinimum/Maximum
2016-09-06 14:57:35 +08: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ä
8f98a6d6f5 php: Do not HTML escape patterns 2016-08-30 08:05:04 +03:00
Arne Jørgensen
03c7e3ea0b [PHP] Fix enum validation in container setters
When the setter is taking an array as argument we cannot use
`in_array()` to validate if the values are part of the allowed enum
values. Instead we use `array_diff()` for containers now.
2016-08-05 10:53:02 +02: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
cfe8dfc112 [PHP] Fix invalid PHP syntax
Fixes 3480.
2016-08-01 11:46:57 +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
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
Arne Jørgensen
7d6ac31619 [PHP] Add path without expanded path parameters to callApi
In continuation of #3117 it could be useful to know the path of an
endpoint (without path parameters expanded) in the `callApi` method of
`ApiClient`.

This is for use cases where you would create a derived class from
`ApiClient` for manipulating responses from the server before further
processing (#3117) or add extended logging of the API calls.
2016-06-30 07:12:28 +02:00
wing328
1638adb79e avoid code injection in php api client 2016-06-27 21:51:27 +08:00
wing328
f482132c66 Merge branch 'master' of https://github.com/sdavis-r7/swagger-codegen into sdavis-r7-master
Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	modules/swagger-codegen/src/main/resources/php/model_generic.mustache
2016-06-27 16:20:44 +08:00
wing328
74239c422b add enum class support, merged test cases for php 2016-06-26 17:41:29 +08:00
Scott Davis
80666394f6 CVE-2016-5641 2016-06-23 06:06:21 -07:00
Arne Jørgensen
f5f4adac29 [PHP] Handle empty array response correct 2016-06-13 23:22:04 +02:00
Mikolaj Przybysz
47576471e2 Replaced double quotes with singles 2016-06-01 10:57:20 +02:00
Mikolaj Przybysz
4f54e5cdc7 Improved formatting 2016-06-01 10:43:22 +02:00
Mikolaj Przybysz
37264b0bcf Removed printing artifactVersion if it is not set from debug information 2016-06-01 10:35:52 +02:00
Mikolaj Przybysz
ce2e994306 Removed printing artifactVersion if it is not set 2016-06-01 10:30:55 +02:00
Arne Jørgensen
5c97d1b8f7 [PHP] Improve code style of generated code
Avoid trailing whitespace.
2016-05-25 22:53:01 +02:00