Replace deprecated Controller with new one

OpenAPITools · Feb 13, 2019 · b45453e · b45453e
1 parent b6c2266
commit b45453e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache
@@ -19,7 +19,7 @@
 
 namespace {{controllerPackage}};
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller as BaseController;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use {{servicePackage}}\SerializerInterface;
@@ -33,7 +33,7 @@ use {{servicePackage}}\ValidatorInterface;
  * @author   OpenAPI Generator team
  * @link     https://github.com/openapitools/openapi-generator
  */
-class Controller extends BaseController
+class Controller extends AbstractController
 {
     protected $validator;
     protected $serializer;

diff --git 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": "^2.0",
-        "symfony/framework-bundle": "^2.3|^3.0|^4.1"
+        "symfony/framework-bundle": "^3.3|^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
@@ -29,6 +29,7 @@ services:
          - [setValidator,  ['@{{bundleAlias}}.service.validator']]
          - [setApiServer,  ['@{{bundleAlias}}.api.api_server']]
         tags: ['controller.service_arguments']
+        autowire: true
 
 {{/operations}}
 {{/apis}}

diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/Controller.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/Controller.php
@@ -29,7 +29,7 @@
 
 namespace OpenAPI\Server\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller as BaseController;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use OpenAPI\Server\Service\SerializerInterface;
@@ -43,7 +43,7 @@
  * @author   OpenAPI Generator team
  * @link     https://github.com/openapitools/openapi-generator
  */
-class Controller extends BaseController
+class Controller extends AbstractController
 {
     protected $validator;
     protected $serializer;

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
@@ -26,6 +26,7 @@ services:
          - [setValidator,  ['@open_apiserver.service.validator']]
          - [setApiServer,  ['@open_apiserver.api.api_server']]
         tags: ['controller.service_arguments']
+        autowire: true
 
     open_apiserver.controller.store:
         class: OpenAPI\Server\Controller\StoreController
@@ -34,6 +35,7 @@ services:
          - [setValidator,  ['@open_apiserver.service.validator']]
          - [setApiServer,  ['@open_apiserver.api.api_server']]
         tags: ['controller.service_arguments']
+        autowire: true
 
     open_apiserver.controller.user:
         class: OpenAPI\Server\Controller\UserController
@@ -42,4 +44,5 @@ services:
          - [setValidator,  ['@open_apiserver.service.validator']]
          - [setApiServer,  ['@open_apiserver.api.api_server']]
         tags: ['controller.service_arguments']
+        autowire: true
 
diff --git 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": "^2.0",
-        "symfony/framework-bundle": "^2.3|^3.0|^4.1"
+        "symfony/framework-bundle": "^3.3|^4.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8",