Fix Format validator

Author: Nicofuma

src/DependencyInjection/Compiler/FormatValidatorPass.php

@@ -13,12 +13,14 @@ class FormatValidatorPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
+        $constraintFactoryDefinition = $container->getDefinition('swagger.json_schema.constraints.factory');
         $formatConstraintDefinition = $container->getDefinition('swagger.json_schema.constraints.format');
 
         $services = $container->findTaggedServiceIds('swagger.format_validator');
         foreach ($services as $serviceId => $tags) {
             foreach ($tags as $attributes) {
                 $formatConstraintDefinition->addMethodCall('addFormatValidator', [$attributes['format'], new Reference($serviceId)]);
+                $constraintFactoryDefinition->addMethodCall('setFormatValidator', [$attributes['format'], new Reference($serviceId)]);
             }
         }
     }

src/JsonSchema/Constraints/Factory.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Nicofuma\SwaggerBundle\JsonSchema\Constraints;
+
+class Factory extends \JsonSchema\Constraints\Factory
+{
+    /** @var Format\FormatValidatorInterface[] */
+    private $formatValidators;
+
+    /**
+     * Add a format validator.
+     *
+     * @param string $format
+     * @param Format\FormatValidatorInterface $validator
+     */
+    public function setFormatValidator($format, Format\FormatValidatorInterface $validator)
+    {
+        $this->formatValidators[$format] = $validator;
+    }
+
+    /**
+     * @return Format\FormatValidatorInterface[]
+     */
+    public function getFormatValidators()
+    {
+        return $this->formatValidators;
+    }
+}

src/JsonSchema/Constraints/FormatConstraint.php

@@ -2,7 +2,9 @@
 
 namespace Nicofuma\SwaggerBundle\JsonSchema\Constraints;
 
+use JsonSchema\Constraints\Factory;
 use JsonSchema\Constraints\FormatConstraint as FormatConstraintBase;
+use JsonSchema\Uri\UriRetriever;
 use Nicofuma\SwaggerBundle\Exception\FormatConstraintException;
 use Nicofuma\SwaggerBundle\JsonSchema\Constraints\Format\FormatValidatorInterface;
 
@@ -11,6 +13,15 @@ class FormatConstraint extends FormatConstraintBase
     /** @var FormatValidatorInterface[] */
     private $formatMap = [];
 
+    public function __construct($checkMode, UriRetriever $uriRetriever, Factory $factory)
+    {
+        parent::__construct($checkMode, $uriRetriever, $factory);
+
+        if ($factory instanceof \Nicofuma\SwaggerBundle\JsonSchema\Constraints\Factory) {
+            $this->formatMap = $factory->getFormatValidators();
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

src/NicofumaSwaggerBundle.php

@@ -2,7 +2,9 @@
 
 namespace Nicofuma\SwaggerBundle;
 
+use Nicofuma\SwaggerBundle\DependencyInjection\Compiler\FormatValidatorPass;
 use Nicofuma\SwaggerBundle\DependencyInjection\Compiler\FOSRestPass;
+use Nicofuma\SwaggerBundle\DependencyInjection\Compiler\JsonSchemaConstraintPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -11,5 +13,7 @@ class NicofumaSwaggerBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         $container->addCompilerPass(new FOSRestPass());
+        $container->addCompilerPass(new FormatValidatorPass());
+        $container->addCompilerPass(new JsonSchemaConstraintPass());
     }
 }

src/Resources/config/services.yml

@@ -40,7 +40,7 @@ services:
           - '@request_stack'
 
     swagger.json_schema.constraints.factory:
-        class: JsonSchema\Constraints\Factory
+        class: Nicofuma\SwaggerBundle\JsonSchema\Constraints\Factory
 
     # Override the JsonSchema's format constraint
     swagger.json_schema.constraints.format:

src/Validator/Validator.php

@@ -51,6 +51,6 @@ public function getSchemaManager()
      */
     protected function getValidator()
     {
-        return new \JsonSchema\Validator($this->constraintsFactory);
+        return new \JsonSchema\Validator(\JsonSchema\Validator::CHECK_MODE_NORMAL, null, $this->constraintsFactory);
     }
 }