Throw an exception if the processor returns a null value

Author: gquemener

Step/ItemStep.php

@@ -188,7 +188,13 @@ public function doExecute(StepExecution $stepExecution)
             // Processing
             try {
                 if (null === $processedItem = $this->processor->process($item)) {
-                    continue;
+                    throw new \Exception(
+                        sprintf(
+                            'Processor %s returned unexpected value: NULL. ' .
+                            'Use Oro\Bundle\BatchBundle\Item\InvalidItemException to warn invalid value.',
+                            get_class($this->processor)
+                        )
+                    );
                 }
             } catch (InvalidItemException $e) {
                 $this->dispatchInvalidItemEvent(

Tests/Unit/Step/ItemStepTest.php

@@ -133,7 +133,7 @@ public function testExecute()
             ->with($stepExecution);
         $processor->expects($this->exactly(7))
             ->method('process')
-            ->will($this->onConsecutiveCalls(1, null, 3, 4, 5, 6, 7, null));
+            ->will($this->onConsecutiveCalls(1, 2, 3, 4, 5, 6, 7));
 
         $writer = $this->getMockBuilder('Oro\\Bundle\\BatchBundle\\Tests\\Unit\\Step\\Stub\\WriterStub')
             ->setMethods(array('setStepExecution', 'write'))
@@ -299,6 +299,47 @@ public function testDispatchWriteInvalidItemException()
         $this->itemStep->execute($stepExecution);
     }
 
+    public function testProcessShouldNotReturnNull()
+    {
+        $stepExecution = $this->getMockBuilder('Oro\\Bundle\\BatchBundle\\Entity\\StepExecution')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stepExecution->expects($this->any())
+            ->method('getStatus')
+            ->will($this->returnValue(new BatchStatus(BatchStatus::STARTING)));
+
+        $stepExecution->expects($this->once())
+            ->method('addFailureException');
+
+
+        $this->eventDispatcher
+            ->expects($this->at(1))
+            ->method('dispatch')
+            ->with(
+                EventInterface::STEP_EXECUTION_ERRORED,
+                $this->anything()
+            );
+
+
+        $reader = $this ->getMock('Oro\\Bundle\\BatchBundle\\Item\\ItemReaderInterface');
+        $reader->expects($this->any())
+            ->method('read')
+            ->will($this->returnValue(array('foo' => 'bar')));
+
+        $processor = $this ->getMock('Oro\\Bundle\\BatchBundle\\Item\\ItemProcessorInterface');
+        $processor->expects($this->any())
+            ->method('process')
+            ->will($this->returnValue(null));
+
+        $writer = $this ->getMock('Oro\\Bundle\\BatchBundle\\Item\\ItemWriterInterface');
+
+        $this->itemStep->setReader($reader);
+        $this->itemStep->setProcessor($processor);
+        $this->itemStep->setWriter($writer);
+
+        $this->itemStep->execute($stepExecution);
+    }
+
     /**
      * Assert the entity tested
      *