Merge pull request #13 from fusioned/fix-validator-step-line-counting

Fix the line counter tracking when validation exception are thrown

CONTRIBUTING.md

@@ -39,6 +39,7 @@ Write your code and add tests. Then run the tests:
 
 ```bash
 $ vendor/bin/phpunit
+$ vendor/bin/phpspec run
 ```
 
 Commit your changes and push them to GitHub:

spec/Step/ValidatorStepSpec.php

@@ -127,4 +127,52 @@ function it_validates_an_item_from_metadata(
 
         $this->getViolations()->shouldReturn([1 => $list]);
     }
+
+    function it_validates_multiple_items_from_metadata(
+        ValidatorInterface $validator,
+        ConstraintViolationListInterface $list
+    )
+    {
+        $numberOfCalls = 3;
+        $next = function() {};
+        $list->count()->willReturn(1);
+        $item = new \stdClass();
+        $validator->validate($item)->willReturn($list);
+
+        for ($i = 0; $i < $numberOfCalls; $i++) {
+            $this->process($item, $next);
+        }
+
+        $this->getViolations()->shouldReturn(array_fill(1, $numberOfCalls, $list));
+    }    
+
+    function it_tracks_lines_when_exceptions_are_thrown_during_process(
+        Step $step,
+        ValidatorInterface $validator,
+        Constraint $constraint,
+        ConstraintViolation $violation
+    )
+    {
+        $numberOfCalls = 3;
+        $next = function() {};
+        $errorList = new ConstraintViolationList([$violation->getWrappedObject()]);
+        $stepFunc = function($item) use ($step, $next) {
+            return $step->process($item, $next);
+        };
+        $item = ['foo' => 10];
+
+        $validator->validate($item, Argument::type('Symfony\Component\Validator\Constraints\Collection'))
+            ->willReturn($errorList);
+
+        $step->process($item, $next)->shouldNotBeCalled();
+
+        $this->throwExceptions();
+        $this->add('foo', $constraint)->shouldReturn($this);
+
+        for ($i = 0; $i < $numberOfCalls; $i++) {
+            $this->shouldThrow('Port\Exception\ValidationException')->duringProcess($item, $stepFunc);
+        }
+
+        $this->getViolations()->shouldReturn(array_fill(1, $numberOfCalls, $errorList));
+    }
 }

src/Step/ValidatorStep.php

@@ -30,7 +30,7 @@ class ValidatorStep implements PriorityStep
     /**
      * @var integer
      */
-    private $line = 1;
+    private $line = 0;
 
     /**
      * @var ValidatorInterface
@@ -98,6 +98,8 @@ public function addOption($option, $optionValue)
      */
     public function process($item, callable $next)
     {
+        $this->line++;
+
         if (count($this->constraints) > 0) {
             $constraints = new Constraints\Collection($this->constraints);
             $list = $this->validator->validate($item, $constraints);
@@ -113,8 +115,6 @@ public function process($item, callable $next)
             }
         }
 
-        $this->line++;
-
         if (0 === count($list)) {
             return $next($item);
         }