Adds WriterTemplate trait instead of AbstractWriter

src/Writer/AbstractStreamWriter.php

@@ -9,6 +9,8 @@
  */
 abstract class AbstractStreamWriter implements WriterInterface
 {
+    use WriterTemplate;
+
     /**
      * @var resource
      */
@@ -65,14 +67,6 @@ public function getStream()
         return $this->stream;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function prepare()
-    {
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */

src/Writer/ArrayWriter.php

@@ -9,6 +9,8 @@
  */
 class ArrayWriter implements WriterInterface
 {
+    use WriterTemplate;
+
     /**
      * @var array
      */
@@ -28,6 +30,8 @@ public function __construct(array &$data)
     public function prepare()
     {
         $this->data = [];
+
+        return $this;
     }
 
     /**
@@ -37,12 +41,4 @@ public function writeItem(array $item)
     {
         $this->data[] = $item;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function finish()
-    {
-
-    }
 }

src/Writer/CallbackWriter.php

@@ -9,6 +9,8 @@
  */
 class CallbackWriter implements WriterInterface
 {
+    use WriterTemplate;
+
     /**
      * @var callable
      */
@@ -22,14 +24,6 @@ public function __construct(callable $callback)
         $this->callback = $callback;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function prepare()
-    {
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -39,12 +33,4 @@ public function writeItem(array $item)
 
         return $this;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function finish()
-    {
-        return $this;
-    }
 }

src/Writer/ConsoleProgressWriter.php

@@ -11,7 +11,7 @@
  *
  * @author David de Boer <david@ddeboer.nl>
  */
-class ConsoleProgressWriter extends AbstractWriter
+class ConsoleProgressWriter implements WriterInterface
 {
     /**
      * @var OutputInterface

src/Writer/ConsoleTableWriter.php

@@ -10,6 +10,8 @@
  */
 class ConsoleTableWriter implements WriterInterface
 {
+    use WriterTemplate;
+
     /**
      * @var OutputInterface
      */
@@ -34,13 +36,6 @@ public function __construct(OutputInterface $output, Table $table) {
         $this->table = $table;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function prepare() {
-
-    }
-
     /**
      * {@inheritdoc}
      */

src/Writer/DoctrineWriter.php

@@ -15,7 +15,7 @@
  *
  * @author David de Boer <david@ddeboer.nl>
  */
-class DoctrineWriter extends AbstractWriter
+class DoctrineWriter implements WriterInterface
 {
     /**
      * @var EntityManagerInterface

src/Writer/ExcelWriter.php

@@ -10,7 +10,7 @@
  *
  * @author David de Boer <david@ddeboer.nl>
  */
-class ExcelWriter extends AbstractWriter
+class ExcelWriter implements WriterInterface
 {
     /**
      * @var string

src/Writer/PdoWriter.php

@@ -16,6 +16,8 @@
  */
 class PdoWriter implements WriterInterface
 {
+    use WriterTemplate;
+
     /**
      * @var \PDO
      */
@@ -44,14 +46,6 @@ public function __construct(\PDO $pdo, $tableName)
         $this->tableName = $tableName;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function prepare()
-    {
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -86,12 +80,4 @@ public function writeItem(array $item)
 
         return $this;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function finish()
-    {
-        return $this;
-    }
 }

src/Writer/WriterTemplate.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Ddeboer\DataImport\Writer;
+
+/**
+ * This template can be overridden in concrete implementations
+ *
+ * @author David de Boer <david@ddeboer.nl>
+ */
+trait WriterTemplate
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare()
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function finish()
+    {
+        return $this;
+    }
+}