Merge remote-tracking branch 'origin/4.1.x' into sync_41x_50x

This commit is contained in:
wing328
2019-06-27 18:27:20 +08:00
1243 changed files with 38715 additions and 15082 deletions

View File

@@ -1,54 +0,0 @@
# ref: https://github.com/github/gitignore/blob/master/Symfony.gitignore
# Cache and logs (Symfony2)
/app/cache/*
/app/logs/*
!app/cache/.gitkeep
!app/logs/.gitkeep
# Email spool folder
/app/spool/*
# Cache, session files and logs (Symfony3)
/var/cache/*
/var/logs/*
/var/sessions/*
!var/cache/.gitkeep
!var/logs/.gitkeep
!var/sessions/.gitkeep
# Parameters
/app/config/parameters.yml
/app/config/parameters.ini
# Managed by Composer
/app/bootstrap.php.cache
/var/bootstrap.php.cache
/bin/*
!bin/console
!bin/symfony_requirements
/vendor/
# Assets and user uploads
/web/bundles/
/web/uploads/
# PHPUnit
/app/phpunit.xml
/phpunit.xml
# Build data
/build/
# Composer PHAR
/composer.phar
# Backup entities generated with doctrine:generate:entities command
**/Entity/*~
# Embedded web-server pid file
/.web-server-pid
# From root gitignore
/Tests/cache/
/Tests/logs/

View File

@@ -115,7 +115,7 @@ class UserApi implements UserApiInterface
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**body** | [**OpenAPI\Server\Model\User**](../Model/array.md)| List of user object |
**body** | [**OpenAPI\Server\Model\User**](../Model/User.md)| List of user object |
### Return type
@@ -167,7 +167,7 @@ class UserApi implements UserApiInterface
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**body** | [**OpenAPI\Server\Model\User**](../Model/array.md)| List of user object |
**body** | [**OpenAPI\Server\Model\User**](../Model/User.md)| List of user object |
### Return type