From dcc622d374c7e897d232965133a49cd3780726ad Mon Sep 17 00:00:00 2001 From: Matiss Date: Mon, 20 Aug 2018 06:11:33 +0200 Subject: [PATCH] Improve Symfony 4.1 compatibility (#830) --- .../src/main/resources/php-symfony/composer.mustache | 2 +- .../src/main/resources/php-symfony/services.mustache | 4 ++-- .../SymfonyBundle-php/Resources/config/services.yml | 4 ++-- .../petstore/php-symfony/SymfonyBundle-php/composer.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index 69ac276f6c1e..3c623d307b53 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -25,7 +25,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", diff --git a/modules/openapi-generator/src/main/resources/php-symfony/services.mustache b/modules/openapi-generator/src/main/resources/php-symfony/services.mustache index 6d61563c32d6..f28cde4d73f8 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/services.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/services.mustache @@ -14,10 +14,10 @@ services: class: {{modelPackage}}\ModelSerializer {{bundleAlias}}.service.serializer: - class: %{{bundleAlias}}.serializer% + class: '%{{bundleAlias}}.serializer%' {{bundleAlias}}.service.validator: - class: %{{bundleAlias}}.validator% + class: '%{{bundleAlias}}.validator%' {{#apiInfo}} {{#apis}} diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml index f40b2d5104d3..9e514b20a046 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml @@ -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 diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json index c8d0976f8454..51c7a53bbc32 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json @@ -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",