small updates

Author: bajb

src/Assembler/QueryAssembler.php

@@ -1,7 +1,6 @@
 <?php
 namespace Packaged\QueryBuilder\Assembler;
 
-use Packaged\QueryBuilder\Assembler\Segments\AbstractSegmentAssembler;
 use Packaged\QueryBuilder\Assembler\Segments\ClauseAssembler;
 use Packaged\QueryBuilder\Assembler\Segments\ExpressionAssembler;
 use Packaged\QueryBuilder\Assembler\Segments\PredicateAssembler;
@@ -86,6 +85,10 @@ public function assembleSegment($segment)
     {
       return $segment;
     }
+    else if(!($segment instanceof IStatementSegment))
+    {
+      throw new \Exception("Unsupported segment type " . get_class($segment));
+    }
     else if($segment instanceof IStatement)
     {
       $assembler = new StatementAssembler($segment);
@@ -108,7 +111,7 @@ public function assembleSegment($segment)
     }
     else
     {
-      throw new \Exception("Unsupported segment type " . get_class($segment));
+      throw new \Exception("Unsupported IStatementSegment type " . get_class($segment));
     }
 
     $assembler->setAssembler($this);

src/Assembler/Segments/AbstractSegmentAssembler.php

@@ -47,6 +47,7 @@ public function assembleSegments($segments)
    * @param $segment
    *
    * @return string
+   * @throws \Exception
    */
   public function assembleSegment($segment)
   {
@@ -55,13 +56,13 @@ public function assembleSegment($segment)
 
   protected function _assemblePrepared($expr = null)
   {
-    $assembler = $this->getAssembler();
-    if($assembler->isForPrepare())
+    if(!$this->getAssembler()->isForPrepare())
     {
-      $assembler->addParameter($expr !== null ? $expr : $this->_segment);
-      return '?';
+      return false;
     }
-    return false;
+
+    $this->getAssembler()->addParameter($expr !== null ? $expr : $this->_segment);
+    return '?';
   }
 
   /**
@@ -72,9 +73,7 @@ protected function _assemblePrepared($expr = null)
   public function assemble()
   {
     throw new \RuntimeException(
-      "Unsupported segment '"
-      . get_class($this->_segment)
-      . "' passed to the " .
+      "Unsupported segment '" . get_class($this->_segment) . "' passed to the " .
       ucwords(Strings::humanize(Objects::classShortname(get_called_class())))
     );
   }
@@ -86,10 +85,6 @@ public function escapeField($field)
 
   public function escapeValue($value)
   {
-    if(is_int($value) || is_float($value) || is_double($value))
-    {
-      return $value;
-    }
-    return $this->getAssembler()->escapeValue($value);
+    return !is_string($value) && is_numeric($value) ? $value : $this->getAssembler()->escapeValue($value);
   }
 }

src/Assembler/Segments/ExpressionAssembler.php

@@ -28,6 +28,7 @@ public function __construct(IExpression $expression)
    * Assemble the segment
    *
    * @return string
+   * @throws QueryBuilderAssemblerException
    */
   public function assemble()
   {
@@ -85,9 +86,9 @@ public function assemble()
   public function assembleCaseExpression(CaseExpression $expr)
   {
     return 'CASE WHEN(' . $this->assembleSegment($expr->getExpression()) . ')'
-    . ' THEN ' . $this->assembleSegment($expr->getTrueValue())
-    . ' ELSE ' . $this->assembleSegment($expr->getFalseValue())
-    . ' END';
+      . ' THEN ' . $this->assembleSegment($expr->getTrueValue())
+      . ' ELSE ' . $this->assembleSegment($expr->getFalseValue())
+      . ' END';
   }
 
   public function assembleIfExpression(IfExpression $expr)
@@ -113,17 +114,14 @@ public function assembleStringExpression(StringExpression $expr)
   public function assembleArrayExpression(ArrayExpression $expr)
   {
     $exprValues = $expr->getValue();
-    if(count($exprValues) < 1)
+    if(empty($exprValues))
     {
-      throw new QueryBuilderAssemblerException(
-        'Cannot assemble an empty ArrayExpression'
-      );
+      throw new QueryBuilderAssemblerException('Cannot assemble an empty ArrayExpression');
     }
     $values = [];
     foreach($exprValues as $value)
     {
-      $values[] = $this->_assemblePrepared($value)
-        ?: $this->escapeValue($value);
+      $values[] = $this->_assemblePrepared($value) ?: $this->escapeValue($value);
     }
     return '(' . implode(',', $values) . ')';
   }
@@ -135,8 +133,7 @@ public function assembleNumericExpression(NumericExpression $expr)
 
   public function assembleBooleanExpression(BooleanExpression $expr)
   {
-    return $this->_assemblePrepared()
-      ?: ($expr->getValue() ? 'true' : 'false');
+    return $this->_assemblePrepared() ?: ($expr->getValue() ? 'true' : 'false');
   }
 
   public function assembleCounterExpression(CounterExpression $expr)
@@ -151,13 +148,11 @@ public function assembleCounterExpression(CounterExpression $expr)
     }
 
     return $this->assembleSegment($field)
-    . ' ' . $expr->getOperator() . ' '
-    . $this->assembleSegment($expr->getValue());
+      . ' ' . $expr->getOperator()
+      . ' ' . $this->assembleSegment($expr->getValue());
   }
 
-  public function assembleArithmeticExpression(
-    AbstractArithmeticExpression $expr
-  )
+  public function assembleArithmeticExpression(AbstractArithmeticExpression $expr)
   {
     $values = [];
     foreach($expr->getExpressions() as $value)
@@ -178,33 +173,25 @@ public function assembleValueExpression(ValueExpression $expression)
     {
       if(!is_string($value) && is_numeric($value))
       {
-        return $this->assembleNumericExpression(
-          NumericExpression::create($value)
-        );
+        return $this->assembleNumericExpression(NumericExpression::create($value));
       }
-      else if(is_bool($value))
+      if(is_bool($value))
       {
-        return $this->assembleBooleanExpression(
-          BooleanExpression::create($value)
-        );
+        return $this->assembleBooleanExpression(BooleanExpression::create($value));
       }
     }
     else if(is_array($value))
     {
-      return $this->assembleArrayExpression(
-        ArrayExpression::create($value)
-      );
+      return $this->assembleArrayExpression(ArrayExpression::create($value));
     }
-    return $this->assembleStringExpression(
-      StringExpression::create($value)
-    );
+    return $this->assembleStringExpression(StringExpression::create($value));
   }
 
   public function assembleFieldExpression(FieldExpression $expr)
   {
     return ($expr->hasTable() ?
-      $this->assembleSegment($expr->getTable()) . '.' : '')
-    . $this->escapeField($expr->getField());
+        $this->assembleSegment($expr->getTable()) . '.' : '')
+      . $this->escapeField($expr->getField());
   }
 
   public function assembleTableExpression(TableExpression $expr)