Merge pull request #2 from ebidtech/ebf-1124-ebt-validator-performanc…

…e-issues Refactor validator to ebt-validator
ebidtech · Aug 5, 2015 · db36d23 · db36d23
2 parents 9f05655 + bffae42
commit db36d23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4",
-        "ebidtech/validator": "0.1.*",
+        "ebidtech/ebt-validator": "1.*",
         "ebidtech/collection": "2.0.*"
     },
     "require-dev": {

diff --git a/src/EBT/CommonObject/Id/Id.php b/src/EBT/CommonObject/Id/Id.php
@@ -11,7 +11,7 @@
 
 namespace EBT\CommonObject\Id;
 
-use EBT\Validator\ValidatorExtended;
+use EBT\Validator\Model\Validator\Validator;
 use EBT\CommonObject\Exception\InvalidArgumentException;
 
 /**
@@ -43,7 +43,7 @@ public function __construct($id)
      */
     protected function setId($id)
     {
-        if (!ValidatorExtended::isPositiveInteger($id)) {
+        if (!Validator::isRequiredPositiveInteger($id)) {
             throw InvalidArgumentException::notPositiveInteger('id', $id);
         }
 

diff --git a/src/EBT/CommonObject/Id/IdSetFactory.php b/src/EBT/CommonObject/Id/IdSetFactory.php
@@ -11,7 +11,7 @@
 
 namespace EBT\CommonObject\Id;
 
-use EBT\Validator\ValidatorBasicExtended;
+use EBT\Validator\Model\Validator\Validator;
 use EBT\CommonObject\Exception\InvalidArgumentException;
 
 /**
@@ -44,7 +44,7 @@ public static function fromArray(array $idsArr)
      */
     public static function fromString($idsStr)
     {
-        if (!ValidatorBasicExtended::isTypeString($idsStr)) {
+        if (!Validator::isOptionalString($idsStr)) {
             throw InvalidArgumentException::notString('ids', $idsStr);
         }