pushing legacy to the future!

Author: vearutop

src/Constraint/InvalidValue.php

@@ -3,8 +3,8 @@
 namespace Yaoi\Schema\Constraint;
 
 
-use Yaoi\Schema\Exception;
+use Yaoi\Schema\InvalidValue;
 
-class InvalidValue extends Exception
+class InvalidValue extends InvalidValue
 {
 }

src/Constraint/Properties.php

@@ -2,7 +2,7 @@
 
 namespace Yaoi\Schema\Constraint;
 
-use Yaoi\Schema\Exception;
+use Yaoi\Schema\InvalidValue;
 use Yaoi\Schema\MagicMap;
 use Yaoi\Schema\Schema;
 use Yaoi\Schema\SchemaLoader;
@@ -41,7 +41,7 @@ public static function create()
      * @param $data
      * @param ObjectItem $result
      * @param Schema|null $schema
-     * @throws Exception
+     * @throws InvalidValue
      * @throws \Exception
      * @deprecated move relevant code to Schema
      */
@@ -72,7 +72,7 @@ public function import($data, ObjectItem $result, Schema $schema = null)
                 if (!$found && null !== $additionalProperties) {
                     $traceHelper->push()->addData(SchemaLoader::ADDITIONAL_PROPERTIES);
                     if ($additionalProperties === false) {
-                        throw new Exception('Additional properties not allowed', Exception::INVALID_VALUE);
+                        throw new InvalidValue('Additional properties not allowed', InvalidValue::INVALID_VALUE);
                     }
                     $value = $additionalProperties->import($value);
                     $traceHelper->pop();

src/Constraint/Ref.php

@@ -6,7 +6,7 @@
 
 class Ref implements Constraint
 {
-    private $ref;
+    public $ref;
     public function __construct($ref, Schema $schema)
     {
         $this->ref = $ref;

src/Exception/EnumException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+use Yaoi\Schema\InvalidValue;
+
+class EnumException extends InvalidValue
+{
+
+}

src/Exception/LogicException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+use Yaoi\Schema\InvalidValue;
+
+class LogicException extends InvalidValue
+{
+
+}

src/Exception/NumericException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+
+use Yaoi\Schema\InvalidValue;
+
+class NumericException extends InvalidValue
+{
+    const MULTIPLE_OF = 1;
+    const MAXIMUM = 2;
+    const MINIMUM = 3;
+
+}

src/Exception/ObjectException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+use Yaoi\Schema\InvalidValue;
+
+class ObjectException extends InvalidValue
+{
+    const REQUIRED = 1;
+    const TOO_MANY = 2;
+    const TOO_FEW = 3;
+    const DEPENDENCY_MISSING = 4;
+
+}

src/Exception/StringException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Yaoi\Schema\Exception;
+
+
+use Yaoi\Schema\InvalidValue;
+
+class StringException extends InvalidValue
+{
+    const TOO_SHORT = 1;
+    const TOO_LONG = 2;
+    const PATTERN_MISMATCH = 3;
+
+}

src/Helper.php

@@ -18,11 +18,11 @@ public static function toPregPattern($jsonPattern)
         }
 
         if (false === $pattern) {
-            throw new Exception('Failed to prepare preg pattern');
+            throw new InvalidValue('Failed to prepare preg pattern');
         }
 
         if (@preg_match($pattern, '') === false) {
-            throw new Exception('Regex pattern is invalid: ' . $jsonPattern);
+            throw new InvalidValue('Regex pattern is invalid: ' . $jsonPattern);
         }
 
         return $pattern;

src/Exception.php renamed to src/InvalidValue.php

@@ -2,7 +2,7 @@
 
 namespace Yaoi\Schema;
 
-class Exception extends \Exception
+class InvalidValue extends \Exception
 {
     const INVALID_VALUE = 1;
     const NOT_IMPLEMENTED = 2;