Various fix

clagiordano · Sep 10, 2016 · 8109e38 · 8109e38
1 parent 4ec189f
commit 8109e38
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/Validator.php b/src/Validator.php
@@ -2,7 +2,7 @@
 
 namespace clagiordano\weblibs\validator;
 
-use ErrorHandler;
+use clagiordano\weblibs\validator\ErrorHandler;
 
 /**
  *
@@ -53,8 +53,8 @@ protected function doValidate($field, $value, $rules)
         foreach ($rules as $rule => $satisfier) {
             $validatorFunction = 'validate' . $this->allowedValidator[$rule];
 
-            if (!is_callable($this->{$validatorFunction}) {
-                call_user_func()
+            if (!is_callable($this->{$validatorFunction})) {
+                //call_user_func()
             }
         }
     }

diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -2,13 +2,17 @@
 
 namespace clagiordano\weblibs\validator\tests;
 
+use clagiordano\weblibs\validator\ErrorHandler;
+use clagiordano\weblibs\validator\Validator;
 
 /**
  * Class ValidatorTest
  * @package clagiordano\weblibs\validator\tests
  */
 class ValidatorTest extends \PHPUnit_Framework_TestCase
 {
+    /** @var ErrorHandler $errorhandler */
+    private $errorHandler = null;
     /** @var Validator $validator */
     private $validator = null;
 
@@ -38,10 +42,27 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
 
+        /**
+         * Create a new errorhandler object
+         **/
+         $this->errorHandler = new ErrorHandler();
+         $this->assertInstanceOf(
+             'clagiordano\weblibs\validator\ErrorHandler', 
+             $this->errorHandler
+         );
 
         /**
          * Create a new validator object
          **/
-        $this->validator = new Application();
+        $this->validator = new Validator($this->errorHandler);
+        $this->assertInstanceOf(
+             'clagiordano\weblibs\validator\Validator', 
+             $this->validator
+         );
+    }
+
+    public function testTest()
+    {
+
     }
 }