Update interfaces to be I prefixed

packaged · Oct 7, 2014 · f43ceea · f43ceea
1 parent 75d0118
commit f43ceea
Show file tree

Hide file tree

Showing 37 changed files with 103 additions and 103 deletions.
diff --git a/src/Builder/Traits/FromTrait.php b/src/Builder/Traits/FromTrait.php
@@ -2,14 +2,14 @@
 namespace Packaged\QueryBuilder\Builder\Traits;
 
 use Packaged\QueryBuilder\Clause\FromClause;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait FromTrait
 {
   public function from($table)
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
 
     $from = new FromClause();

diff --git a/src/Builder/Traits/GroupByTrait.php b/src/Builder/Traits/GroupByTrait.php
@@ -3,14 +3,14 @@
 
 use Packaged\QueryBuilder\Clause\GroupByClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait GroupByTrait
 {
   public function groupBy($fields)
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
 
     $groupClause = new GroupByClause();

diff --git a/src/Builder/Traits/HavingTrait.php b/src/Builder/Traits/HavingTrait.php
@@ -2,14 +2,14 @@
 namespace Packaged\QueryBuilder\Builder\Traits;
 
 use Packaged\QueryBuilder\Clause\HavingClause;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait HavingTrait
 {
   public function having()
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
     $where = HavingClause::create(func_get_args());
     $this->addClause($where);

diff --git a/src/Builder/Traits/JoinTrait.php b/src/Builder/Traits/JoinTrait.php
@@ -4,14 +4,14 @@
 use Packaged\QueryBuilder\Clause\FromClause;
 use Packaged\QueryBuilder\Clause\JoinClause;
 use Packaged\QueryBuilder\Clause\WhereClause;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait JoinTrait
 {
   public function join($table, $sourceField, $destField = null, $where = null)
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
     if($destField === null)
     {

diff --git a/src/Builder/Traits/LimitTrait.php b/src/Builder/Traits/LimitTrait.php
@@ -2,14 +2,14 @@
 namespace Packaged\QueryBuilder\Builder\Traits;
 
 use Packaged\QueryBuilder\Clause\LimitClause;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait LimitTrait
 {
   public function limit($limit)
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
 
     $limitClause = new LimitClause();
@@ -21,7 +21,7 @@ public function limit($limit)
   public function limitWithOffset($offset, $limit)
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
 
     $limitClause = new LimitClause();

diff --git a/src/Builder/Traits/OrderByTrait.php b/src/Builder/Traits/OrderByTrait.php
@@ -3,14 +3,14 @@
 
 use Packaged\QueryBuilder\Clause\OrderByClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait OrderByTrait
 {
   public function orderBy($fields)
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
 
     $orderClause = new OrderByClause();

diff --git a/src/Builder/Traits/WhereTrait.php b/src/Builder/Traits/WhereTrait.php
@@ -4,14 +4,14 @@
 use Packaged\QueryBuilder\Clause\WhereClause;
 use Packaged\QueryBuilder\Predicate\OrPredicateSet;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
-use Packaged\QueryBuilder\Statement\StatementInterface;
+use Packaged\QueryBuilder\Statement\IStatement;
 
 trait WhereTrait
 {
   public function where()
   {
     /**
-     * @var $this StatementInterface
+     * @var $this IStatement
      */
     $where = WhereClause::create(func_get_args());
     $this->addClause($where);
@@ -21,7 +21,7 @@ public function where()
   public function orWhere()
   {
     /**
-     * @var $this  StatementInterface
+     * @var $this  IStatement
      * @var $where WhereClause
      */
     $where = $this->getClause('WHERE');

diff --git a/src/Clause/AbstractFieldClause.php b/src/Clause/AbstractFieldClause.php
@@ -3,7 +3,7 @@
 
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-abstract class AbstractFieldClause implements ClauseInterface
+abstract class AbstractFieldClause implements IClause
 {
   /**
    * @var FieldExpression[]

diff --git a/src/Clause/AbstractPredicateClause.php b/src/Clause/AbstractPredicateClause.php
@@ -1,14 +1,14 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
-use Packaged\QueryBuilder\Predicate\PredicateInterface;
+use Packaged\QueryBuilder\Predicate\IPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
 
-abstract class AbstractPredicateClause implements ClauseInterface
+abstract class AbstractPredicateClause implements IClause
 {
   protected $_predicates = [];
 
-  public function addPredicate(PredicateInterface $predicate)
+  public function addPredicate(IPredicate $predicate)
   {
     $this->_predicates[] = $predicate;
   }
@@ -17,7 +17,7 @@ public function setPredicates(array $predicates)
   {
     $this->_predicates = assert_instances_of(
       $predicates,
-      '\Packaged\QueryBuilder\Predicate\PredicateInterface'
+      '\Packaged\QueryBuilder\Predicate\IPredicate'
     );
   }
 

diff --git a/src/Clause/AbstractTableClause.php b/src/Clause/AbstractTableClause.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
-abstract class AbstractTableClause implements ClauseInterface
+abstract class AbstractTableClause implements IClause
 {
   protected $_table;
 

diff --git a/src/Clause/ClauseInterface.php → src/Clause/IClause.php b/src/Clause/ClauseInterface.php → src/Clause/IClause.php
@@ -1,9 +1,9 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
-use Packaged\QueryBuilder\Statement\StatementSegmentInterface;
+use Packaged\QueryBuilder\Statement\IStatementSegment;
 
-interface ClauseInterface extends StatementSegmentInterface
+interface IClause extends IStatementSegment
 {
   /**
    * @return string

diff --git a/src/Clause/LimitClause.php b/src/Clause/LimitClause.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
-class LimitClause implements ClauseInterface
+class LimitClause implements IClause
 {
   protected $_limit;
   protected $_offset;

diff --git a/src/Clause/SelectClause.php b/src/Clause/SelectClause.php
@@ -3,13 +3,13 @@
 
 use Packaged\QueryBuilder\SelectExpression\ConcatSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
-use Packaged\QueryBuilder\SelectExpression\SelectExpressionInterface;
+use Packaged\QueryBuilder\SelectExpression\ISelectExpression;
 
-class SelectClause implements ClauseInterface
+class SelectClause implements IClause
 {
   protected $_expressions = [];
 
-  public function addExpression(SelectExpressionInterface $expression)
+  public function addExpression(ISelectExpression $expression)
   {
     $this->_expressions[] = $expression;
     return $this;
@@ -19,7 +19,7 @@ public function setExpressions(array $expressions)
   {
     $this->_expressions = assert_instances_of(
       $expressions,
-      '\Packaged\QueryBuilder\SelectExpression\SelectExpressionInterface'
+      '\Packaged\QueryBuilder\SelectExpression\ISelectExpression'
     );
     return $this;
   }
@@ -72,7 +72,7 @@ public function addFields($fields)
 
   public function addField($field, $alias = null)
   {
-    if($field instanceof SelectExpressionInterface)
+    if($field instanceof ISelectExpression)
     {
       $this->addExpression($field);
     }

diff --git a/src/Clause/ValuesClause.php b/src/Clause/ValuesClause.php
@@ -1,13 +1,13 @@
 <?php
 namespace Packaged\QueryBuilder\Clause;
 
-use Packaged\QueryBuilder\Expression\ExpressionInterface;
+use Packaged\QueryBuilder\Expression\IExpression;
 
-class ValuesClause implements ClauseInterface
+class ValuesClause implements IClause
 {
   protected $_expressions = [];
 
-  public function addExpression(ExpressionInterface $expression)
+  public function addExpression(IExpression $expression)
   {
     $this->_expressions[] = $expression;
     return $this;
@@ -17,7 +17,7 @@ public function setExpressions(array $expressions)
   {
     $this->_expressions = assert_instances_of(
       $expressions,
-      '\Packaged\QueryBuilder\Expression\ExpressionInterface'
+      '\Packaged\QueryBuilder\Expression\IExpression'
     );
     return $this;
   }

diff --git a/src/Clause/WhereClause.php b/src/Clause/WhereClause.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 use Packaged\QueryBuilder\Predicate\NotInPredicate;
 use Packaged\QueryBuilder\Predicate\OrPredicateSet;
-use Packaged\QueryBuilder\Predicate\PredicateInterface;
+use Packaged\QueryBuilder\Predicate\IPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
 
 class WhereClause extends AbstractPredicateClause
@@ -43,7 +43,7 @@ public static function buildPredicates(
         $pred->setExpression(ValueExpression::create($value));
         $predicates[] = $pred;
       }
-      else if($value instanceof PredicateInterface)
+      else if($value instanceof IPredicate)
       {
         $predicates[] = $value;
       }

diff --git a/src/Expression/AbstractArithmeticExpression.php b/src/Expression/AbstractArithmeticExpression.php
@@ -4,7 +4,7 @@
 abstract class AbstractArithmeticExpression extends FieldExpression
 {
   /**
-   * @var ExpressionInterface
+   * @var IExpression
    */
   protected $_value;
 
@@ -16,7 +16,7 @@ abstract class AbstractArithmeticExpression extends FieldExpression
    */
   abstract public function getOperator();
 
-  public function setExpression(ExpressionInterface $value)
+  public function setExpression(IExpression $value)
   {
     $this->_value = $value;
     return $this;
@@ -45,7 +45,7 @@ public static function create($field, $value = null)
     /**
      * @var $expression static
      */
-    if($value instanceof ExpressionInterface)
+    if($value instanceof IExpression)
     {
       $expression->setExpression($value);
     }
@@ -69,7 +69,7 @@ public static function createWithTable($field, $table, $value = null)
     /**
      * @var $expression static
      */
-    if($value instanceof ExpressionInterface)
+    if($value instanceof IExpression)
     {
       $expression->setExpression($value);
     }

diff --git a/src/Expression/ExpressionInterface.php b/src/Expression/ExpressionInterface.php
diff --git a/src/Expression/FieldExpression.php b/src/Expression/FieldExpression.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Expression;
 
-class FieldExpression implements ExpressionInterface
+class FieldExpression implements IExpression
 {
   protected $_field;
   protected $_table;

diff --git a/src/Expression/IExpression.php b/src/Expression/IExpression.php
@@ -0,0 +1,8 @@
+<?php
+namespace Packaged\QueryBuilder\Expression;
+
+use Packaged\QueryBuilder\Statement\IStatementSegment;
+
+interface IExpression extends IStatementSegment
+{
+}
diff --git a/src/Expression/NowExpression.php b/src/Expression/NowExpression.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Expression;
 
-class NowExpression implements ExpressionInterface
+class NowExpression implements IExpression
 {
   /**
    * Assemble the segment into a usable part of a query

diff --git a/src/Expression/UnixTimestampExpression.php b/src/Expression/UnixTimestampExpression.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Expression;
 
-class UnixTimestampExpression implements ExpressionInterface
+class UnixTimestampExpression implements IExpression
 {
   /**
    * Assemble the segment into a usable part of a query

diff --git a/src/Expression/ValueExpression.php b/src/Expression/ValueExpression.php
@@ -1,7 +1,7 @@
 <?php
 namespace Packaged\QueryBuilder\Expression;
 
-class ValueExpression implements ExpressionInterface
+class ValueExpression implements IExpression
 {
   protected $_value;