Adds CountableReaderInterface

src/Ddeboer/DataImport/Reader/ArrayReader.php

@@ -7,7 +7,7 @@
  *
  * @author David de Boer <david@ddeboer.nl>
  */
-class ArrayReader extends \ArrayIterator implements ReaderInterface
+class ArrayReader extends \ArrayIterator implements CountableReaderInterface
 {
     /**
      * {@inheritdoc}

src/Ddeboer/DataImport/Reader/CountableReaderInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Ddeboer\DataImport\Reader;
+
+/**
+ * Reader that provides the count of total items
+ *
+ * @author David de Boer <david@ddeboer.nl>
+ */
+interface CountableReaderInterface extends ReaderInterface, \Countable
+{
+    // Don't add count() to interface: see https://github.com/ddeboer/data-import/pull/5
+}

src/Ddeboer/DataImport/Reader/CsvReader.php

@@ -9,7 +9,7 @@
  *
  * @author David de Boer <david@ddeboer.nl>
  */
-class CsvReader implements ReaderInterface, \SeekableIterator
+class CsvReader implements CountableReaderInterface, \SeekableIterator
 {
     const DUPLICATE_HEADERS_INCREMENT = 1;
     const DUPLICATE_HEADERS_MERGE     = 2;

src/Ddeboer/DataImport/Reader/DbalReader.php

@@ -7,7 +7,7 @@
 /**
  * Reads data through the Doctrine DBAL
  */
-class DbalReader implements ReaderInterface
+class DbalReader implements CountableReaderInterface
 {
     /** @var Connection */
     private $connection;

src/Ddeboer/DataImport/Reader/DoctrineReader.php

@@ -10,7 +10,7 @@
  * Reads entities through the Doctrine ORM
  *
  */
-class DoctrineReader implements ReaderInterface
+class DoctrineReader implements CountableReaderInterface
 {
     protected $objectManager;
     protected $objectName;

src/Ddeboer/DataImport/Reader/ExcelReader.php

@@ -11,7 +11,7 @@
  * @link   http://phpexcel.codeplex.com/
  * @link   https://github.com/logiQ/PHPExcel
  */
-class ExcelReader implements ReaderInterface
+class ExcelReader implements CountableReaderInterface
 {
     protected $worksheet;
     protected $headerRowNumber;

src/Ddeboer/DataImport/Reader/OneToManyReader.php

@@ -10,7 +10,7 @@
  * @author Adam Paterson <hello@adampaterson.co.uk>
  * @author Aydin Hassan <aydin@hotmail.co.uk>
  */
-class OneToManyReader implements ReaderInterface
+class OneToManyReader implements CountableReaderInterface
 {
     /**
      * @var ReaderInterface

src/Ddeboer/DataImport/Reader/PdoReader.php

@@ -4,7 +4,7 @@
 /**
  * Reads data through PDO
  */
-class PdoReader implements ReaderInterface
+class PdoReader implements CountableReaderInterface
 {
     /**
      * @var \PDO

src/Ddeboer/DataImport/Writer/ConsoleProgressWriter.php

@@ -2,7 +2,7 @@
 
 namespace Ddeboer\DataImport\Writer;
 
-use Ddeboer\DataImport\Reader\ReaderInterface;
+use Ddeboer\DataImport\Reader\CountableReaderInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 
@@ -28,7 +28,7 @@ class ConsoleProgressWriter extends AbstractWriter
     protected $verbosity;
 
     /**
-     * @var ReaderInterface
+     * @var CountableReaderInterface
      */
     protected $reader;
 
@@ -39,13 +39,13 @@ class ConsoleProgressWriter extends AbstractWriter
 
     /**
      * @param OutputInterface $output
-     * @param ReaderInterface $reader
+     * @param CountableReaderInterface $reader
      * @param string $verbosity
      * @param int $redrawFrequency
      */
     public function __construct(
         OutputInterface $output,
-        ReaderInterface $reader,
+        CountableReaderInterface $reader,
         $verbosity = 'debug',
         $redrawFrequency = 1
     ) {