Wiring up service.

thoufek · thoufek · commit ff55988388c0 · 2013-12-26T16:12:49.000-06:00
diff --git a/FileReader/CsvFileReader.php b/FileReader/CsvFileReader.php
@@ -7,12 +7,14 @@
  */
 namespace Nerdery\CsvBundle\FileReader;
 
+use Nerdery\CsvBundle\Event\CsvParseErrorEvent;
 use Nerdery\CsvBundle\Exception\FileInvalidException;
 use Nerdery\CsvBundle\Exception\NoHeaderForDataColumnException;
 use Nerdery\CsvBundle\FileReader\CsvFileReaderInterface;
 use Nerdery\CsvBundle\FileReader\Options\CsvFileReaderOptions;
 use Nerdery\CsvBundle\FileReader\Options\CsvFileReaderOptionsInterface;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 
@@ -30,6 +32,13 @@ class CsvFileReader implements CsvFileReaderInterface
      */
     private $options;
 
+    /**
+     * Event Dispatcher
+     *
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
+
     /**
      * File handle.
      *
@@ -63,9 +72,12 @@ class CsvFileReader implements CsvFileReaderInterface
      *
      * @param CsvFileReaderOptionsInterface $options
      */
-    public function __construct(CsvFileReaderOptionsInterface $options)
-    {
+    public function __construct(
+        CsvFileReaderOptionsInterface $options,
+        EventDispatcherInterface $eventDispatcher
+    ) {
         $this->options           = $options;
+        $this->eventDispatcher   = $eventDispatcher;
         $this->waitingForHeader  = $this->options->isHeaderExpected();
         $this->currentLineNumber = 0;
     }
@@ -140,15 +152,15 @@ private function parseLine()
     {
         $data = false;
         try {
-            $data = $this->fileReader->getRowData();
-            return $data;
+            $data = $this->getRowData();
         } catch (\Exception $e) {
 
-            $this->errorReporter->addErrorForLine(
-                $e->getMessage(),
-                $this->fileReader->getCurrentLineNumber()
+            $event = new CsvParseErrorEvent($e, $this->getCurrentLineNumber());
+            $this->eventDispatcher->dispatch(
+                CsvParseErrorEvent::EVENT_KEY,
+                $event
             );
-            return $data;
+
         }
         return $data;
     }
diff --git a/FileReader/Factory/CsvFileReaderFactory.php b/FileReader/Factory/CsvFileReaderFactory.php
@@ -12,6 +12,8 @@
 use Nerdery\CsvBundle\FileReader\Factory\CsvFileReaderFactoryInterface;
 use Nerdery\CsvBundle\FileReader\Options\CsvFileReaderOptions;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
 /**
  * FileReaderFactory
  *
@@ -21,6 +23,22 @@
  */
 class CsvFileReaderFactory implements CsvFileReaderFactoryInterface
 {
+    /**
+     * Event Dispatcher
+     *
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
+
+    /**
+     * Constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(EventDispatcherInterface $eventDispatcher)
+    {
+        $this->eventDispacher = $eventDispatcher;
+    }
 
     /**
      * Create
@@ -32,7 +50,10 @@ public function create(array $options = [])
     {
         $csvFileReaderOptions = new CsvFileReaderOptions($options);
 
-        $reader =  new CsvFileReader($csvFileReaderOptions);
+        $reader =  new CsvFileReader(
+            $csvFileReaderOptions,
+            $this->eventDispatcher
+        );
         return $reader;
     }
 }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -4,15 +4,16 @@ parameters:
 services:
     nerdery_csv.factory.file_reader:
         class: %nerdery_csv.factory.file_reader.class%
-        arguments: []
+        arguments:
+            - @event_dispatcher
 
     nerdery_csv.error_reporter:
         class: Nerdery\CsvBundle\Error\Reporter.php
         arguments: []
 
     nerdery_csv.subscriber.broker_modification:
         class: Nerdery\CsvBundle\Subscriber\ParseErrorSubscriber
-    arguments:
-        - @nerdery_csv.error_reporter
-    tags:
-        - { name: kernel.event_subscriber }
+        arguments:
+            - @nerdery_csv.error_reporter
+        tags:
+            - { name: kernel.event_subscriber }
