Merge pull request #170 from localheinz/fix/capital

bighappyface · bighappyface · commit fafdbcd253df · 2015-07-13T15:12:08.000-05:00
Fix: Start all messages with a capital letter
diff --git a/src/JsonSchema/Constraints/EnumConstraint.php b/src/JsonSchema/Constraints/EnumConstraint.php
@@ -41,6 +41,6 @@ public function check($element, $schema = null, $path = null, $i = null)
             }
         }
 
-        $this->addError($path, "does not have a value in the enumeration " . print_r($schema->enum, true));
+        $this->addError($path, "Does not have a value in the enumeration " . print_r($schema->enum, true));
     }
 }
diff --git a/src/JsonSchema/Constraints/NumberConstraint.php b/src/JsonSchema/Constraints/NumberConstraint.php
@@ -26,40 +26,40 @@ public function check($element, $schema = null, $path = null, $i = null)
         if (isset($schema->exclusiveMinimum)) {
             if (isset($schema->minimum)) {
                 if ($schema->exclusiveMinimum && $element === $schema->minimum) {
-                    $this->addError($path, "must have a minimum value greater than boundary value of " . $schema->minimum);
+                    $this->addError($path, "Must have a minimum value greater than boundary value of " . $schema->minimum);
                 } else if ($element < $schema->minimum) {
-                    $this->addError($path, "must have a minimum value of " . $schema->minimum);
+                    $this->addError($path, "Must have a minimum value of " . $schema->minimum);
                 }
             } else {
-                $this->addError($path, "use of exclusiveMinimum requires presence of minimum");
+                $this->addError($path, "Use of exclusiveMinimum requires presence of minimum");
             }
         } else if (isset($schema->minimum) && $element < $schema->minimum) {
-            $this->addError($path, "must have a minimum value of " . $schema->minimum);
+            $this->addError($path, "Must have a minimum value of " . $schema->minimum);
         }
 
         // Verify maximum
         if (isset($schema->exclusiveMaximum)) {
             if (isset($schema->maximum)) {
                 if ($schema->exclusiveMaximum && $element === $schema->maximum) {
-                    $this->addError($path, "must have a maximum value less than boundary value of " . $schema->maximum);
+                    $this->addError($path, "Must have a maximum value less than boundary value of " . $schema->maximum);
                 } else if ($element > $schema->maximum) {
-                    $this->addError($path, "must have a maximum value of " . $schema->maximum);
+                    $this->addError($path, "Must have a maximum value of " . $schema->maximum);
                 }
             } else {
-                $this->addError($path, "use of exclusiveMaximum requires presence of maximum");
+                $this->addError($path, "Use of exclusiveMaximum requires presence of maximum");
             }
         } else if (isset($schema->maximum) && $element > $schema->maximum) {
-            $this->addError($path, "must have a maximum value of " . $schema->maximum);
+            $this->addError($path, "Must have a maximum value of " . $schema->maximum);
         }
 
         // Verify divisibleBy - Draft v3
         if (isset($schema->divisibleBy) && $this->fmod($element, $schema->divisibleBy) != 0) {
-            $this->addError($path, "is not divisible by " . $schema->divisibleBy);
+            $this->addError($path, "Is not divisible by " . $schema->divisibleBy);
         }
 
         // Verify multipleOf - Draft v4
         if (isset($schema->multipleOf) && $this->fmod($element, $schema->multipleOf) != 0) {
-            $this->addError($path, "must be a multiple of " . $schema->multipleOf);
+            $this->addError($path, "Must be a multiple of " . $schema->multipleOf);
         }
 
         $this->checkFormat($element, $schema, $path, $i);
diff --git a/src/JsonSchema/Constraints/ObjectConstraint.php b/src/JsonSchema/Constraints/ObjectConstraint.php
@@ -92,7 +92,7 @@ public function validateElement($element, $matches, $objectDefinition = null, $p
             // property requires presence of another
             $require = $this->getProperty($definition, 'requires');
             if ($require && !$this->getProperty($element, $require)) {
-                $this->addError($path, "the presence of the property " . $i . " requires that " . $require . " also be present");
+                $this->addError($path, "The presence of the property " . $i . " requires that " . $require . " also be present");
             }
 
             if (!$definition) {
@@ -137,4 +137,4 @@ protected function getProperty($element, $property, $fallback = null)
 
         return $fallback;
     }
-}
+}
diff --git a/src/JsonSchema/Constraints/StringConstraint.php b/src/JsonSchema/Constraints/StringConstraint.php
@@ -24,17 +24,17 @@ public function check($element, $schema = null, $path = null, $i = null)
     {
         // Verify maxLength
         if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {
-            $this->addError($path, "must be at most " . $schema->maxLength . " characters long");
+            $this->addError($path, "Must be at most " . $schema->maxLength . " characters long");
         }
 
         //verify minLength
         if (isset($schema->minLength) && $this->strlen($element) < $schema->minLength) {
-            $this->addError($path, "must be at least " . $schema->minLength . " characters long");
+            $this->addError($path, "Must be at least " . $schema->minLength . " characters long");
         }
 
         // Verify a regex pattern
         if (isset($schema->pattern) && !preg_match('#' . str_replace('#', '\\#', $schema->pattern) . '#', $element)) {
-            $this->addError($path, "does not match the regex pattern " . $schema->pattern);
+            $this->addError($path, "Does not match the regex pattern " . $schema->pattern);
         }
 
         $this->checkFormat($element, $schema, $path, $i);
diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -122,13 +122,13 @@ protected function validateCommonProperties($value, $schema = null, $path = null
                 // Draft 4 - Required is an array of strings - e.g. "required": ["foo", ...]
                 foreach ($schema->required as $required) {
                     if (!property_exists($value, $required)) {
-                        $this->addError($required, "the property " . $required . " is required");
+                        $this->addError($required, "The property " . $required . " is required");
                     }
                 }
             } else if (isset($schema->required) && !is_array($schema->required)) {
                 // Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}
                 if ( $schema->required && $value instanceof UndefinedConstraint) {
-                    $this->addError($path, "is missing and it is required");
+                    $this->addError($path, "Is missing and it is required");
                 }
             }
         }
@@ -148,7 +148,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null
 
             // if no new errors were raised it must be a disallowed value
             if (count($this->getErrors()) == count($initErrors)) {
-                $this->addError($path, "disallowed value was matched");
+                $this->addError($path, "Disallowed value was matched");
             } else {
                 $this->errors = $initErrors;
             }
@@ -160,7 +160,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null
 
             // if no new errors were raised then the instance validated against the "not" schema
             if (count($this->getErrors()) == count($initErrors)) {
-                $this->addError($path, "matched a schema which it should not");
+                $this->addError($path, "Matched a schema which it should not");
             } else {
                 $this->errors = $initErrors;
             }
@@ -170,12 +170,12 @@ protected function validateCommonProperties($value, $schema = null, $path = null
         if (is_object($value)) {
             if (isset($schema->minProperties)) {
                 if (count(get_object_vars($value)) < $schema->minProperties) {
-                    $this->addError($path, "must contain a minimum of " . $schema->minProperties . " properties");
+                    $this->addError($path, "Must contain a minimum of " . $schema->minProperties . " properties");
                 }
             }
             if (isset($schema->maxProperties)) {
                 if (count(get_object_vars($value)) > $schema->maxProperties) {
-                    $this->addError($path, "must contain no more than " . $schema->maxProperties . " properties");
+                    $this->addError($path, "Must contain no more than " . $schema->maxProperties . " properties");
                 }
             }
         }
@@ -209,7 +209,7 @@ protected function validateOfProperties($value, $schema, $path, $i = "")
                 $isValid = $isValid && (count($this->getErrors()) == count($initErrors));
             }
             if (!$isValid) {
-                $this->addError($path, "failed to match all schemas");
+                $this->addError($path, "Failed to match all schemas");
             }
         }
 
@@ -224,7 +224,7 @@ protected function validateOfProperties($value, $schema, $path, $i = "")
                 }
             }
             if (!$isValid) {
-                $this->addError($path, "failed to match at least one schema");
+                $this->addError($path, "Failed to match at least one schema");
             } else {
                 $this->errors = $startErrors;
             }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public function check($element, $schema = null, $path = null, $i = null)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- $this->addError($path, "does not have a value in the enumeration " . print_r($schema->enum, true));`
	`44`	`+ $this->addError($path, "Does not have a value in the enumeration " . print_r($schema->enum, true));`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function validateElement($element, $matches, $objectDefinition = null, $p`
`92`	`92`	`// property requires presence of another`
`93`	`93`	`$require = $this->getProperty($definition, 'requires');`
`94`	`94`	`if ($require && !$this->getProperty($element, $require)) {`
`95`		`- $this->addError($path, "the presence of the property " . $i . " requires that " . $require . " also be present");`
	`95`	`+ $this->addError($path, "The presence of the property " . $i . " requires that " . $require . " also be present");`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (!$definition) {`
`@@ -137,4 +137,4 @@ protected function getProperty($element, $property, $fallback = null)`
`137`	`137`
`138`	`138`	`return $fallback;`
`139`	`139`	`}`
`140`		`-}`
	`140`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,17 @@ public function check($element, $schema = null, $path = null, $i = null)`
`24`	`24`	`{`
`25`	`25`	`// Verify maxLength`
`26`	`26`	`if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {`
`27`		`- $this->addError($path, "must be at most " . $schema->maxLength . " characters long");`
	`27`	`+ $this->addError($path, "Must be at most " . $schema->maxLength . " characters long");`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`//verify minLength`
`31`	`31`	`if (isset($schema->minLength) && $this->strlen($element) < $schema->minLength) {`
`32`		`- $this->addError($path, "must be at least " . $schema->minLength . " characters long");`
	`32`	`+ $this->addError($path, "Must be at least " . $schema->minLength . " characters long");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// Verify a regex pattern`
`36`	`36`	`if (isset($schema->pattern) && !preg_match('#' . str_replace('#', '\\#', $schema->pattern) . '#', $element)) {`
`37`		`- $this->addError($path, "does not match the regex pattern " . $schema->pattern);`
	`37`	`+ $this->addError($path, "Does not match the regex pattern " . $schema->pattern);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`$this->checkFormat($element, $schema, $path, $i);`
Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,13 @@ protected function validateCommonProperties($value, $schema = null, $path = null`
`122`	`122`	`// Draft 4 - Required is an array of strings - e.g. "required": ["foo", ...]`
`123`	`123`	`foreach ($schema->required as $required) {`
`124`	`124`	`if (!property_exists($value, $required)) {`
`125`		`- $this->addError($required, "the property " . $required . " is required");`
	`125`	`+ $this->addError($required, "The property " . $required . " is required");`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`} else if (isset($schema->required) && !is_array($schema->required)) {`
`129`	`129`	`// Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}`
`130`	`130`	`if ( $schema->required && $value instanceof UndefinedConstraint) {`
`131`		`- $this->addError($path, "is missing and it is required");`
	`131`	`+ $this->addError($path, "Is missing and it is required");`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -148,7 +148,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null`
`148`	`148`
`149`	`149`	`// if no new errors were raised it must be a disallowed value`
`150`	`150`	`if (count($this->getErrors()) == count($initErrors)) {`
`151`		`- $this->addError($path, "disallowed value was matched");`
	`151`	`+ $this->addError($path, "Disallowed value was matched");`
`152`	`152`	`} else {`
`153`	`153`	`$this->errors = $initErrors;`
`154`	`154`	`}`
`@@ -160,7 +160,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null`
`160`	`160`
`161`	`161`	`// if no new errors were raised then the instance validated against the "not" schema`
`162`	`162`	`if (count($this->getErrors()) == count($initErrors)) {`
`163`		`- $this->addError($path, "matched a schema which it should not");`
	`163`	`+ $this->addError($path, "Matched a schema which it should not");`
`164`	`164`	`} else {`
`165`	`165`	`$this->errors = $initErrors;`
`166`	`166`	`}`
`@@ -170,12 +170,12 @@ protected function validateCommonProperties($value, $schema = null, $path = null`
`170`	`170`	`if (is_object($value)) {`
`171`	`171`	`if (isset($schema->minProperties)) {`
`172`	`172`	`if (count(get_object_vars($value)) < $schema->minProperties) {`
`173`		`- $this->addError($path, "must contain a minimum of " . $schema->minProperties . " properties");`
	`173`	`+ $this->addError($path, "Must contain a minimum of " . $schema->minProperties . " properties");`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`if (isset($schema->maxProperties)) {`
`177`	`177`	`if (count(get_object_vars($value)) > $schema->maxProperties) {`
`178`		`- $this->addError($path, "must contain no more than " . $schema->maxProperties . " properties");`
	`178`	`+ $this->addError($path, "Must contain no more than " . $schema->maxProperties . " properties");`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`}`
`@@ -209,7 +209,7 @@ protected function validateOfProperties($value, $schema, $path, $i = "")`
`209`	`209`	`$isValid = $isValid && (count($this->getErrors()) == count($initErrors));`
`210`	`210`	`}`
`211`	`211`	`if (!$isValid) {`
`212`		`- $this->addError($path, "failed to match all schemas");`
	`212`	`+ $this->addError($path, "Failed to match all schemas");`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`@@ -224,7 +224,7 @@ protected function validateOfProperties($value, $schema, $path, $i = "")`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`	`if (!$isValid) {`
`227`		`- $this->addError($path, "failed to match at least one schema");`
	`227`	`+ $this->addError($path, "Failed to match at least one schema");`
`228`	`228`	`} else {`
`229`	`229`	`$this->errors = $startErrors;`
`230`	`230`	`}`