Refactor EncloseNames to be a trait.

hoaproject · Aug 4, 2015 · 282a727 · 282a727
1 parent fadd07e
commit 282a727
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/Query/Delete.php b/Query/Delete.php
@@ -46,6 +46,8 @@
  */
 class Delete extends Where implements Dml
 {
+    use EncloseNames;
+
     /**
      * Table name.
      *

diff --git a/Query/EncloseNames.php b/Query/EncloseNames.php
@@ -37,14 +37,14 @@
 namespace Hoa\Database\Query;
 
 /**
- * Abstract class \Hoa\Database\Query\EncloseNames.
+ * Trait \Hoa\Database\Query\EncloseNames.
  *
  * Enclose names feature.
  *
  * @copyright  Copyright © 2007-2015 Hoa community
  * @license    New BSD License
  */
-abstract class EncloseNames
+trait EncloseNames
 {
     /**
      * State of the enclosing: Either true for enable the enclosing feature

diff --git a/Query/Insert.php b/Query/Insert.php
@@ -44,8 +44,10 @@
  * @copyright  Copyright © 2007-2015 Hoa community
  * @license    New BSD License
  */
-class Insert extends EncloseNames implements Dml
+class Insert implements Dml
 {
+    use EncloseNames;
+
     /**
      * Source.
      *

diff --git a/Query/SelectCore.php b/Query/SelectCore.php
@@ -46,6 +46,8 @@
  */
 abstract class SelectCore extends Where
 {
+    use EncloseNames;
+
     /**
      * Columns.
      *

diff --git a/Query/Update.php b/Query/Update.php
@@ -46,6 +46,8 @@
  */
 class Update extends Where implements Dml
 {
+    use EncloseNames;
+
     /**
      * Table.
      *

diff --git a/Query/Where.php b/Query/Where.php
@@ -44,7 +44,7 @@
  * @copyright  Copyright © 2007-2015 Hoa community
  * @license    New BSD License
  */
-class Where extends EncloseNames
+class Where
 {
     /**
      * Expressions.
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,8 @@ @@
      */
     class Delete extends Where implements Dml
     {
+        use EncloseNames;
         /**
          * Table name.
          *
@@ Expand Down @@