Rename ValidationKeywordFailed to KeywordMismatch

lezhnev74 · May 19, 2019 · 251597d · 251597d
1 parent a46066a
commit 251597d
Show file tree

Hide file tree

Showing 39 changed files with 100 additions and 100 deletions.
diff --git a/src/PSR7/Exception/Request/RequestQueryArgumentMismatch.php b/src/PSR7/Exception/Request/RequestQueryArgumentMismatch.php
@@ -6,7 +6,7 @@
 
 use OpenAPIValidation\PSR7\Exception\NoOperation;
 use OpenAPIValidation\PSR7\OperationAddress;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Throwable;
 use function implode;
 use function sprintf;
@@ -18,7 +18,7 @@ public static function fromAddrAndCauseException(OperationAddress $addr, Throwab
         $i = new self(
             sprintf(
                 "OpenAPI spec does not match the query argument '%s' of the request [%s,%s]: %s",
-                $cause instanceof ValidationKeywordFailed ? implode('->', $cause->dataBreadCrumb()->buildChain()) : '?',
+                $cause instanceof KeywordMismatch ? implode('->', $cause->dataBreadCrumb()->buildChain()) : '?',
                 $addr->path(),
                 $addr->method(),
                 $cause->getMessage()

diff --git a/src/PSR7/Validators/Path.php b/src/PSR7/Validators/Path.php
@@ -6,7 +6,7 @@
 
 use cebe\openapi\spec\Parameter;
 use OpenAPIValidation\PSR7\PathAddress;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use OpenAPIValidation\Schema\SchemaValidator;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -19,7 +19,7 @@ class Path
      * @param Parameter[] $specs       [paramName=>Parameter]
      * @param string      $pathPattern like "/users/{id}"
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate(MessageInterface $message, array $specs, string $pathPattern) : void
     {
@@ -35,7 +35,7 @@ public function validate(MessageInterface $message, array $specs, string $pathPa
     /**
      * @param Parameter[] $specs
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     private function validateServerRequest(ServerRequestInterface $message, array $specs, string $pathPattern) : void
     {

diff --git a/src/PSR7/Validators/QueryArguments.php b/src/PSR7/Validators/QueryArguments.php
@@ -6,7 +6,7 @@
 
 use cebe\openapi\spec\Parameter;
 use OpenAPIValidation\Schema\BreadCrumb;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use OpenAPIValidation\Schema\SchemaValidator;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -20,7 +20,7 @@ class QueryArguments
     /**
      * @param Parameter[] $specs [queryArgumentName=>schema]
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate(MessageInterface $message, array $specs) : void
     {
@@ -35,7 +35,7 @@ public function validate(MessageInterface $message, array $specs) : void
     /**
      * @param Parameter[] $specs
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     private function validateServerRequest(ServerRequestInterface $message, array $specs) : void
     {

diff --git a/...ema/Exception/ValidationKeywordFailed.php → src/Schema/Exception/KeywordMismatch.php b/...ema/Exception/ValidationKeywordFailed.php → src/Schema/Exception/KeywordMismatch.php
@@ -7,15 +7,15 @@
 use Throwable;
 
 // Indicates that data was not matched against a schema's keyword
-class ValidationKeywordFailed extends SchemaMismatch
+class KeywordMismatch extends SchemaMismatch
 {
     /** @var string */
     protected $keyword;
 
     /**
      * @param mixed $data
      *
-     * @return ValidationKeywordFailed
+     * @return KeywordMismatch
      */
     public static function fromKeyword(string $keyword, $data, ?string $message = null, ?Throwable $prev = null) : self
     {

diff --git a/src/Schema/Exception/TypeMismatch.php b/src/Schema/Exception/TypeMismatch.php
@@ -7,7 +7,7 @@
 use function gettype;
 use function sprintf;
 
-class TypeMismatch extends ValidationKeywordFailed
+class TypeMismatch extends KeywordMismatch
 {
     /**
      * @param mixed $value

diff --git a/src/Schema/Keywords/AnyOf.php b/src/Schema/Keywords/AnyOf.php
@@ -7,8 +7,8 @@
 use cebe\openapi\spec\Schema as CebeSchema;
 use OpenAPIValidation\Schema\BreadCrumb;
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use OpenAPIValidation\Schema\Exception\SchemaMismatch;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
 use OpenAPIValidation\Schema\SchemaValidator;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
@@ -40,7 +40,7 @@ public function __construct(CebeSchema $parentSchema, int $type, BreadCrumb $bre
      * @param mixed        $data
      * @param CebeSchema[] $anyOf
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, array $anyOf) : void
     {
@@ -59,7 +59,7 @@ public function validate($data, array $anyOf) : void
                 }
             }
 
-            throw ValidationKeywordFailed::fromKeyword('anyOf', $data, 'Data must match at least one schema');
+            throw KeywordMismatch::fromKeyword('anyOf', $data, 'Data must match at least one schema');
         } catch (ExceptionInterface $e) {
             throw InvalidSchema::becauseDefensiveSchemaValidationFailed($e);
         }

diff --git a/src/Schema/Keywords/Enum.php b/src/Schema/Keywords/Enum.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function count;
@@ -25,7 +25,7 @@ class Enum extends BaseKeyword
      * @param mixed   $data
      * @param mixed[] $enum - can be strings or numbers
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, array $enum) : void
     {
@@ -34,7 +34,7 @@ public function validate($data, array $enum) : void
             Validator::trueVal()->assert(count($enum) >= 1);
 
             if (! in_array($data, $enum, true)) {
-                throw ValidationKeywordFailed::fromKeyword('enum', $data, 'Value must be present in the enum');
+                throw KeywordMismatch::fromKeyword('enum', $data, 'Value must be present in the enum');
             }
         } catch (ExceptionInterface $e) {
             throw InvalidSchema::becauseDefensiveSchemaValidationFailed($e);

diff --git a/src/Schema/Keywords/MaxItems.php b/src/Schema/Keywords/MaxItems.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function count;
@@ -22,7 +22,7 @@ class MaxItems extends BaseKeyword
      *
      * @param mixed $data
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, int $maxItems) : void
     {
@@ -32,7 +32,7 @@ public function validate($data, int $maxItems) : void
             Validator::trueVal()->assert($maxItems >= 0);
 
             if (count($data) > $maxItems) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'maxItems',
                     $data,
                     sprintf('Size of an array must be less or equal to %d', $maxItems)

diff --git a/src/Schema/Keywords/MaxLength.php b/src/Schema/Keywords/MaxLength.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function mb_strlen;
@@ -27,7 +27,7 @@ class MaxLength extends BaseKeyword
      *
      * @param mixed $data
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, int $maxLength) : void
     {
@@ -37,7 +37,7 @@ public function validate($data, int $maxLength) : void
             Validator::trueVal()->assert($maxLength >= 0);
 
             if (mb_strlen($data) > $maxLength) {
-                throw ValidationKeywordFailed::fromKeyword('maxLength', $data, sprintf("Length of '%d' must be shorter or equal to %d", $data, $maxLength));
+                throw KeywordMismatch::fromKeyword('maxLength', $data, sprintf("Length of '%d' must be shorter or equal to %d", $data, $maxLength));
             }
         } catch (ExceptionInterface $e) {
             throw InvalidSchema::becauseDefensiveSchemaValidationFailed($e);

diff --git a/src/Schema/Keywords/MaxProperties.php b/src/Schema/Keywords/MaxProperties.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function count;
@@ -22,7 +22,7 @@ class MaxProperties extends BaseKeyword
      *
      * @param mixed $data
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, int $maxProperties) : void
     {
@@ -31,7 +31,7 @@ public function validate($data, int $maxProperties) : void
             Validator::trueVal()->assert($maxProperties >= 0);
 
             if (count($data) > $maxProperties) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'maxProperties',
                     $data,
                     sprintf("The number of object's properties must be less or equal to %d", $maxProperties)

diff --git a/src/Schema/Keywords/Maximum.php b/src/Schema/Keywords/Maximum.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function sprintf;
@@ -33,7 +33,7 @@ class Maximum extends BaseKeyword
      * @param mixed     $data
      * @param int|float $maximum
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, $maximum, bool $exclusiveMaximum = false) : void
     {
@@ -42,15 +42,15 @@ public function validate($data, $maximum, bool $exclusiveMaximum = false) : void
             Validator::numeric()->assert($maximum);
 
             if ($exclusiveMaximum && $data >= $maximum) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'maximum',
                     $data,
                     sprintf('Value %d must be less or equal to %d', $data, $maximum)
                 );
             }
 
             if (! $exclusiveMaximum && $data > $maximum) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'maximum',
                     $data,
                     sprintf('Value %d must be less than %d', $data, $maximum)

diff --git a/src/Schema/Keywords/MinItems.php b/src/Schema/Keywords/MinItems.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function count;
@@ -25,7 +25,7 @@ class MinItems extends BaseKeyword
      *
      * @param mixed $data
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, int $minItems) : void
     {
@@ -35,7 +35,7 @@ public function validate($data, int $minItems) : void
             Validator::trueVal()->assert($minItems >= 0);
 
             if (count($data) < $minItems) {
-                throw ValidationKeywordFailed::fromKeyword('minItems', $data, sprintf('Size of an array must be greater or equal to %d', $minItems));
+                throw KeywordMismatch::fromKeyword('minItems', $data, sprintf('Size of an array must be greater or equal to %d', $minItems));
             }
         } catch (ExceptionInterface $e) {
             throw InvalidSchema::becauseDefensiveSchemaValidationFailed($e);

diff --git a/src/Schema/Keywords/MinLength.php b/src/Schema/Keywords/MinLength.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function mb_strlen;
@@ -28,7 +28,7 @@ class MinLength extends BaseKeyword
      *
      * @param mixed $data
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, int $minLength) : void
     {
@@ -38,7 +38,7 @@ public function validate($data, int $minLength) : void
             Validator::trueVal()->assert($minLength >= 0);
 
             if (mb_strlen($data) < $minLength) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'minLength',
                     $data,
                     sprintf("Length of '%d' must be longer or equal to %d", $data, $minLength)

diff --git a/src/Schema/Keywords/MinProperties.php b/src/Schema/Keywords/MinProperties.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function count;
@@ -25,7 +25,7 @@ class MinProperties extends BaseKeyword
      *
      * @param mixed $data
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, int $minProperties) : void
     {
@@ -34,7 +34,7 @@ public function validate($data, int $minProperties) : void
             Validator::trueVal()->assert($minProperties >= 0);
 
             if (count($data) < $minProperties) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'minProperties',
                     $data,
                     sprintf("The number of object's properties must be greater or equal to %d", $minProperties)

diff --git a/src/Schema/Keywords/Minimum.php b/src/Schema/Keywords/Minimum.php
@@ -5,7 +5,7 @@
 namespace OpenAPIValidation\Schema\Keywords;
 
 use OpenAPIValidation\Schema\Exception\InvalidSchema;
-use OpenAPIValidation\Schema\Exception\ValidationKeywordFailed;
+use OpenAPIValidation\Schema\Exception\KeywordMismatch;
 use Respect\Validation\Exceptions\ExceptionInterface;
 use Respect\Validation\Validator;
 use function sprintf;
@@ -33,7 +33,7 @@ class Minimum extends BaseKeyword
      * @param mixed     $data
      * @param int|float $minimum
      *
-     * @throws ValidationKeywordFailed
+     * @throws KeywordMismatch
      */
     public function validate($data, $minimum, bool $exclusiveMinimum = false) : void
     {
@@ -42,15 +42,15 @@ public function validate($data, $minimum, bool $exclusiveMinimum = false) : void
             Validator::numeric()->assert($minimum);
 
             if ($exclusiveMinimum && $data <= $minimum) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'minimum',
                     $data,
                     sprintf('Value %d must be greater or equal to %d', $data, $minimum)
                 );
             }
 
             if (! $exclusiveMinimum && $data < $minimum) {
-                throw ValidationKeywordFailed::fromKeyword(
+                throw KeywordMismatch::fromKeyword(
                     'minimum',
                     $data,
                     sprintf('Value %d must be greater than %d', $data, $minimum)