From 80963f89976a33c9fb4f5fc2c97cd50a589f6e45 Mon Sep 17 00:00:00 2001
From: Jan Tvrdik <jan.tvrdik@gmail.com>
Date: Wed, 11 Jan 2017 14:47:31 +0100
Subject: [PATCH] Allow coercion to boolean from '0' and '1'

---
 src/JsonSchema/Constraints/TypeConstraint.php |  4 +--
 tests/Constraints/CoerciveTest.php            | 32 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/JsonSchema/Constraints/TypeConstraint.php b/src/JsonSchema/Constraints/TypeConstraint.php
index 37c3d791..d6c0b28a 100644
--- a/src/JsonSchema/Constraints/TypeConstraint.php
+++ b/src/JsonSchema/Constraints/TypeConstraint.php
@@ -225,11 +225,11 @@ protected function validateType(&$value, $type, $coerce = false)
      */
     protected function toBoolean($value)
     {
-        if($value === "true"){
+        if ($value === 'true' || $value === '1') {
             return true;
         }
 
-        if($value === "false"){
+        if ($value === 'false' || $value === '0') {
             return false;
         }
 
diff --git a/tests/Constraints/CoerciveTest.php b/tests/Constraints/CoerciveTest.php
index 90b54a05..b72e25c8 100644
--- a/tests/Constraints/CoerciveTest.php
+++ b/tests/Constraints/CoerciveTest.php
@@ -50,29 +50,33 @@ public function testValidCoerceCases($input, $schema, $errors = array())
 
         $this->assertTrue(gettype($value->number) == "string");
         $this->assertTrue(gettype($value->integer) == "string");
-        $this->assertTrue(gettype($value->boolean) == "string");
+        $this->assertTrue(gettype($value->boolean1) == "string");
+        $this->assertTrue(gettype($value->boolean2) == "string");
+        $this->assertTrue(gettype($value->boolean3) == "string");
+        $this->assertTrue(gettype($value->boolean4) == "string");
 
         $validator->coerce($value, $schema);
 
         $this->assertTrue(gettype($value->number) == "double");
         $this->assertTrue(gettype($value->integer) == "integer");
         $this->assertTrue(gettype($value->negativeInteger) == "integer");
-        $this->assertTrue(gettype($value->boolean) == "boolean");
+        $this->assertTrue(gettype($value->boolean1) == "boolean");
+        $this->assertTrue(gettype($value->boolean2) == "boolean");
+        $this->assertTrue(gettype($value->boolean3) == "boolean");
+        $this->assertTrue(gettype($value->boolean4) == "boolean");
 
         $this->assertTrue($value->number === 1.5);
         $this->assertTrue($value->integer === 1);
         $this->assertTrue($value->negativeInteger === -2);
-        $this->assertTrue($value->boolean === true);
+        $this->assertTrue($value->boolean1 === true);
+        $this->assertTrue($value->boolean2 === false);
+        $this->assertTrue($value->boolean3 === true);
+        $this->assertTrue($value->boolean4 === false);
 
         $this->assertTrue(gettype($value->multitype1) == "boolean");
         $this->assertTrue(gettype($value->multitype2) == "double");
         $this->assertTrue(gettype($value->multitype3) == "integer");
 
-        $this->assertTrue($value->number === 1.5);
-        $this->assertTrue($value->integer === 1);
-        $this->assertTrue($value->negativeInteger === -2);
-        $this->assertTrue($value->boolean === true);
-
         $this->assertTrue($validator->isValid(), print_r($validator->getErrors(), true));
     }
 
@@ -125,7 +129,10 @@ public function getValidCoerceTests()
                   "number":"1.5",
                   "integer":"1",
                   "negativeInteger":"-2",
-                  "boolean":"true",
+                  "boolean1":"true",
+                  "boolean2":"false",
+                  "boolean3":"1",
+                  "boolean4":"0",
                   "object":{},
                   "array":[],
                   "null":null,
@@ -150,7 +157,10 @@ public function getValidCoerceTests()
                     "number":{"type":"number"},
                     "integer":{"type":"integer"},
                     "negativeInteger":{"type":"integer"},
-                    "boolean":{"type":"boolean"},
+                    "boolean1":{"type":"boolean"},
+                    "boolean2":{"type":"boolean"},
+                    "boolean3":{"type":"boolean"},
+                    "boolean4":{"type":"boolean"},
                     "object":{"type":"object"},
                     "array":{"type":"array"},
                     "null":{"type":"null"},
@@ -231,7 +241,7 @@ public function getInvalidCoerceTests()
             ),
             array(
                 '{
-                  "boolean":"0"
+                  "boolean":"3"
                 }',
                 '{
                   "type":"object",