From 1ce67c5558d210963e02cbe48f4c3d4f1bea93b0 Mon Sep 17 00:00:00 2001
From: Walter Dal Mut <walter.dalmut@gmail.com>
Date: Sat, 19 Sep 2015 17:59:26 +0200
Subject: [PATCH] Use trait insted of WriterAbstract

In order to separate completely Http\Writer and Udp\Writer we could use
`WriterTrait` instead of `WriterAbstract` and inheritance.

This solution is more decoupled than the inheritance based solution.
---
 src/Adapter/Http/Writer.php                                | 7 +++++--
 src/Adapter/Udp/Writer.php                                 | 7 +++++--
 src/Adapter/{WriterAbstract.php => WriterTrait.php}        | 7 ++-----
 .../{WriterAbstractTest.php => WriterTraitTest.php}        | 6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)
 rename src/Adapter/{WriterAbstract.php => WriterTrait.php} (91%)
 rename tests/unit/Adapter/{WriterAbstractTest.php => WriterTraitTest.php} (94%)

diff --git a/src/Adapter/Http/Writer.php b/src/Adapter/Http/Writer.php
index 9c1e518..8863c47 100644
--- a/src/Adapter/Http/Writer.php
+++ b/src/Adapter/Http/Writer.php
@@ -2,11 +2,14 @@
 namespace InfluxDB\Adapter\Http;
 
 use GuzzleHttp\Client;
+use InfluxDB\Adapter\WriterTrait;
 use InfluxDB\Adapter\Http\Options;
-use InfluxDB\Adapter\WriterAbstract;
+use InfluxDB\Adapter\WritableInterface;
 
-class Writer extends WriterAbstract
+class Writer implements WritableInterface
 {
+    use WriterTrait;
+
     private $httpClient;
     private $options;
 
diff --git a/src/Adapter/Udp/Writer.php b/src/Adapter/Udp/Writer.php
index dbe49aa..7f19d77 100644
--- a/src/Adapter/Udp/Writer.php
+++ b/src/Adapter/Udp/Writer.php
@@ -1,11 +1,14 @@
 <?php
 namespace InfluxDB\Adapter\Udp;
 
-use InfluxDB\Adapter\WriterAbstract;
+use InfluxDB\Adapter\WriterTrait;
 use InfluxDB\Adapter\Udp\Options;
+use InfluxDB\Adapter\WritableInterface;
 
-class Writer extends WriterAbstract
+class Writer implements WritableInterface
 {
+    use WriterTrait;
+
     private $options;
 
     public function __construct(Options $options)
diff --git a/src/Adapter/WriterAbstract.php b/src/Adapter/WriterTrait.php
similarity index 91%
rename from src/Adapter/WriterAbstract.php
rename to src/Adapter/WriterTrait.php
index 46b9c09..f96ce65 100644
--- a/src/Adapter/WriterAbstract.php
+++ b/src/Adapter/WriterTrait.php
@@ -2,13 +2,10 @@
 namespace InfluxDB\Adapter;
 
 use DateTime;
-use InfluxDB\Adapter\WritableInterface;
 
-abstract class WriterAbstract implements WritableInterface
+trait WriterTrait
 {
-    abstract public function send(array $message);
-
-    protected function messageToLineProtocol(array $message, array $tags = [])
+    public function messageToLineProtocol(array $message, array $tags = [])
     {
         if (!array_key_exists("points", $message)) {
             return;
diff --git a/tests/unit/Adapter/WriterAbstractTest.php b/tests/unit/Adapter/WriterTraitTest.php
similarity index 94%
rename from tests/unit/Adapter/WriterAbstractTest.php
rename to tests/unit/Adapter/WriterTraitTest.php
index addb36d..54516ac 100644
--- a/tests/unit/Adapter/WriterAbstractTest.php
+++ b/tests/unit/Adapter/WriterTraitTest.php
@@ -5,15 +5,15 @@
 use InfluxDB\Type\IntType;
 use InfluxDB\Type\FloatType;
 
-class WriterAbstractTest extends \PHPUnit_Framework_TestCase
+class WriterTraitTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider getElements
      */
     public function testListToLineValues($message, $result)
     {
-        $helper = $this->getMockBuilder("InfluxDB\\Adapter\\WriterAbstract")
-            ->getMockForAbstractClass();
+        $helper = $this->getMockBuilder("InfluxDB\\Adapter\\WriterTrait")
+            ->getMockForTrait();
 
         $method = new ReflectionMethod(get_class($helper), "pointsToString");
         $method->setAccessible(true);