Use Symfony Validator service (OpenAPITools#2143)

ihsmarkitoss · Feb 14, 2019 · 1f0c003 · 1f0c003
1 parent da08c72
commit 1f0c003
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/services.mustache b/modules/openapi-generator/src/main/resources/php-symfony/services.mustache
@@ -18,6 +18,8 @@ services:
 
     {{bundleAlias}}.service.validator:
         class: '%{{bundleAlias}}.validator%'
+        arguments:
+            - '@validator'
 
 {{#apiInfo}}
 {{#apis}}

diff --git a/...les/openapi-generator/src/main/resources/php-symfony/validation/SymfonyValidator.mustache b/...les/openapi-generator/src/main/resources/php-symfony/validation/SymfonyValidator.mustache
@@ -2,15 +2,15 @@
 
 namespace {{servicePackage}};
 
-use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\Validator\ValidatorInterface as SymfonyValidatorInterface;
 
 class SymfonyValidator implements ValidatorInterface
 {
     protected $validator;
 
-    public function __construct()
+    public function __construct(SymfonyValidatorInterface $validator)
     {
-        $this->validator = Validation::createValidator();
+        $this->validator = $validator;
     }
 
     public function validate($value, $constraints = null, $groups = null)

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
@@ -18,6 +18,8 @@ services:
 
     open_apiserver.service.validator:
         class: '%open_apiserver.validator%'
+        arguments:
+            - '@validator'
 
     open_apiserver.controller.pet:
         class: OpenAPI\Server\Controller\PetController

diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Service/SymfonyValidator.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Service/SymfonyValidator.php
@@ -2,15 +2,15 @@
 
 namespace OpenAPI\Server\Service;
 
-use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\Validator\ValidatorInterface as SymfonyValidatorInterface;
 
 class SymfonyValidator implements ValidatorInterface
 {
     protected $validator;
 
-    public function __construct()
+    public function __construct(SymfonyValidatorInterface $validator)
     {
-        $this->validator = Validation::createValidator();
+        $this->validator = $validator;
     }
 
     public function validate($value, $constraints = null, $groups = null)