Merge pull request #6 from tyx/feature/json-schema-validation

 Add a factory to create JsonSchema class

Author: tyx

JsonSchemaTools.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rezzza\SymfonyRestApiJson;
+
+use JsonSchema\Validator;
+use JsonSchema\RefResolver;
+
+/**
+ * Used as factory because JsonSchema\Validator and JsonSchema\RefResolver are not stateless
+ */
+class JsonSchemaTools
+{
+    public function createValidator()
+    {
+        return new Validator;
+    }
+
+    public function createRefResolver()
+    {
+        return new RefResolver;
+    }
+}

PayloadValidator.php

@@ -2,19 +2,13 @@
 
 namespace Rezzza\SymfonyRestApiJson;
 
-use JsonSchema\Validator;
-use JsonSchema\RefResolver;
-
 class PayloadValidator
 {
-    private $delegateValidator;
-
-    private $refResolver;
+    private $jsonSchemaTools;
 
-    public function __construct(Validator $delegateValidator, RefResolver $refResolver)
+    public function __construct(JsonSchemaTools $jsonSchemaTools)
     {
-        $this->delegateValidator = $delegateValidator;
-        $this->refResolver = $refResolver;
+        $this->jsonSchemaTools = $jsonSchemaTools;
     }
 
     public function validate($payload, $jsonSchemaFilename)
@@ -23,13 +17,16 @@ public function validate($payload, $jsonSchemaFilename)
             throw new \UnexpectedValueException(sprintf('Cannot validate payload through "%s" json schema. File does not exist.', $jsonSchemaFilename));
         }
 
-        $this->delegateValidator->check(
+        $delegateValidator = $this->jsonSchemaTools->createValidator();
+        $refResolver = $this->jsonSchemaTools->createRefResolver();
+
+        $delegateValidator->check(
             json_decode($payload),
-            $this->refResolver->resolve('file://' . realpath($jsonSchemaFilename))
+            $refResolver->resolve('file://' . realpath($jsonSchemaFilename))
         );
 
-        if (!$this->delegateValidator->isValid()) {
-            throw InvalidPayload::withErrors($payload, $jsonSchemaFilename, $this->delegateValidator->getErrors());
+        if (!$delegateValidator->isValid()) {
+            throw InvalidPayload::withErrors($payload, $jsonSchemaFilename, $delegateValidator->getErrors());
         }
     }
 }

tests/Units/PayloadValidator.php

@@ -14,7 +14,8 @@ public function test_validation_should_be_delegated_to_internal_validator()
                 $this->calling($validator)->check = null,
                 $refResolver = $this->mockJsonSchemaRefResolver(),
                 $this->calling($refResolver)->resolve = 'resolvedJsonSchema',
-                $this->newTestedInstance($validator, $refResolver)
+                $jsonSchemaTools = $this->mockJsonSchemaTools($validator, $refResolver),
+                $this->newTestedInstance($jsonSchemaTools)
             )
             ->when(
                 $this->testedInstance->validate('"json"', __DIR__.'/../Fixtures/mySchema.json')
@@ -31,7 +32,8 @@ public function test_unknown_json_schema_lead_to_exception()
     {
         $this
             ->given(
-                $this->newTestedInstance($this->mockJsonSchemaValidator(), $this->mockJsonSchemaRefResolver())
+                $jsonSchemaTools = $this->mockJsonSchemaTools(),
+                $this->newTestedInstance($jsonSchemaTools)
             )
             ->exception(function () {
                 $this->testedInstance->validate('"json"', 'hello.json');
@@ -50,7 +52,8 @@ public function test_invalid_internal_validation_lead_to_exception()
                 $this->calling($validator)->getErrors = ['error1', 'error2'],
                 $refResolver = $this->mockJsonSchemaRefResolver(),
                 $this->calling($refResolver)->resolve = 'resolvedJsonSchema',
-                $this->newTestedInstance($validator, $refResolver)
+                $jsonSchemaTools = $this->mockJsonSchemaTools($validator, $refResolver),
+                $this->newTestedInstance($jsonSchemaTools)
             )
             ->exception(function () {
                 $this->testedInstance->validate('"json"', __DIR__.'/../Fixtures/mySchema.json');
@@ -74,4 +77,14 @@ private function mockJsonSchemaRefResolver()
 
         return new \mock\JsonSchema\RefResolver;
     }
+
+    private function mockJsonSchemaTools($validator = null, $refResolver = null)
+    {
+        $this->mockGenerator->orphanize('__construct');
+        $mock = new \mock\Rezzza\SymfonyRestApiJson\JsonSchemaTools;
+        $this->calling($mock)->createValidator = $validator;
+        $this->calling($mock)->createRefResolver = $refResolver;
+
+        return $mock;
+    }
 }