Merge pull request #25 from dschoenbauer/develop

v1.1.1
dschoenbauer · May 24, 2017 · 394f654 · 394f654
2 parents 373451c + 08cee3f
commit 394f654
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/src/Sql/Command/ErrorTrait.php → src/Sql/Command/AbstractCommand.php b/src/Sql/Command/ErrorTrait.php → src/Sql/Command/AbstractCommand.php
@@ -14,7 +14,7 @@
  *
  * @author David Schoenbauer
  */
-trait ErrorTrait
+abstract class AbstractCommand implements CommandInterface
 {
 
     private $isStrict = false;

diff --git a/src/Sql/Command/Create.php b/src/Sql/Command/Create.php
@@ -35,10 +35,9 @@
  * @author David Schoenbauer <[email protected]>
  * @since v1.0.0
  */
-class Create implements CommandInterface
+class Create extends AbstractCommand
 {
 
-    use ErrorTrait;
 
     private $table;
     private $data;

diff --git a/src/Sql/Command/Delete.php b/src/Sql/Command/Delete.php
@@ -35,12 +35,11 @@
  *
  * @author David Schoenbauer <[email protected]>
  */
-class Delete implements CommandInterface
+class Delete extends AbstractCommand
 {
 
     private $table;
 
-    use ErrorTrait;
     use WhereTrait;
 
     /**

diff --git a/src/Sql/Command/Select.php b/src/Sql/Command/Select.php
@@ -35,7 +35,7 @@
  * retrieves data from a PDO connected resource
  * @author David Schoenbauer <[email protected]>
  */
-class Select implements CommandInterface
+class Select extends AbstractCommand
 {
 
     private $table;
@@ -45,7 +45,6 @@ class Select implements CommandInterface
     private $fetchFlat = false;
     private $defaultValue = [];
 
-    use ErrorTrait;
     use WhereTrait;
 
     /**
@@ -73,6 +72,7 @@ public function __construct(
     ) {
 
 
+
         $this->setTable($table)
             ->setFields($fields)
             ->setFetchStyle($fetchStyle)

diff --git a/src/Sql/Command/Update.php b/src/Sql/Command/Update.php
@@ -36,13 +36,12 @@
  * @author David Schoenbauer <[email protected]>
  * @since v1.0.0
  */
-class Update implements CommandInterface
+class Update extends AbstractCommand
 {
 
     private $table;
     private $data = [];
 
-    use ErrorTrait;
     use WhereTrait;
 
     /**

diff --git a/tests/src/Sql/Command/ErrorTraitTest.php → ...s/src/Sql/Command/AbstractCommandTest.php b/tests/src/Sql/Command/ErrorTraitTest.php → ...s/src/Sql/Command/AbstractCommandTest.php
@@ -15,7 +15,7 @@
  *
  * @author David Schoenbauer
  */
-class ErrorTraitTest extends TestCase
+class AbstractCommandTest extends TestCase
 {
 
     /**
@@ -26,7 +26,7 @@ class ErrorTraitTest extends TestCase
 
     protected function setUp()
     {
-        $this->object = $this->getMockForTrait(ErrorTrait::class);
+        $this->object = $this->getMockForAbstractClass(AbstractCommand::class);
     }
 
     public function testIsStrict()