bug #16 Minor fixes (sstok)

This PR was merged into the master branch. Discussion ---------- Commits ------- 2455d17 fix wrong type-hint in DoctrineDbalFactory 2c28aa0 fix wrong property in getConversionHints()
rollerworks · Feb 27, 2015 · 2cf89cf · 2cf89cf
2 parents a14b076 + 2c28aa0
commit 2cf89cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/DoctrineDbalFactory.php b/src/DoctrineDbalFactory.php
@@ -12,7 +12,7 @@
 namespace Rollerworks\Component\Search\Doctrine\Dbal;
 
 use Doctrine\Common\Cache\Cache;
-use Doctrine\DBAL\Driver\Connection;
+use Doctrine\DBAL\Connection;
 use Rollerworks\Component\Search\SearchConditionInterface;
 
 /**

diff --git a/src/Query/QueryGenerator.php b/src/Query/QueryGenerator.php
@@ -236,14 +236,12 @@ protected function acceptsField(FieldConfigInterface $field)
      * @param string $column
      *
      * @return ConversionHints
-     *
-     * @internal param mixed $value
      */
     protected function getConversionHints($fieldName, $strategy = null, $column = null)
     {
         $hints = new ConversionHints();
         $hints->field = $this->fields[$fieldName];
-        $hints->value = $column;
+        $hints->column = $column;
         $hints->connection = $this->connection;
         $hints->conversionStrategy = $strategy;
 
@@ -491,7 +489,7 @@ protected function getConversionStrategy($fieldName, $value)
      * @param string   $column
      * @param int|null $strategy
      *
-     * @return string
+     * @return string|integer
      */
     protected function getValueAsSql($value, $fieldName, $column, $strategy = null)
     {