Merge remote-tracking branch 'origin/3.3.x' into 4.0.x

This commit is contained in:
William Cheng
2018-08-23 18:39:54 +08:00
759 changed files with 20424 additions and 17065 deletions

View File

@@ -0,0 +1,54 @@
# 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

@@ -14,10 +14,10 @@ services:
class: OpenAPI\Server\Model\ModelSerializer
open_apiserver.service.serializer:
class: %open_apiserver.serializer%
class: '%open_apiserver.serializer%'
open_apiserver.service.validator:
class: %open_apiserver.validator%
class: '%open_apiserver.validator%'
open_apiserver.controller.pet:
class: OpenAPI\Server\Controller\PetController

View File

@@ -22,7 +22,7 @@
"ext-mbstring": "*",
"symfony/validator": "*",
"jms/serializer-bundle": "*",
"symfony/framework-bundle": "^2.3|^3.0"
"symfony/framework-bundle": "^2.3|^3.0|^4.1"
},
"require-dev": {
"phpunit/phpunit": "~4.8",