Refactor AttributeHistoricalDataWithLocations for clarity, fixing IntegrationTestCase issue and fixing changes to RawLog...

2 files changed, 5 insertions, 7 deletions

diff --git a/core/DataAccess/RawLogFetcher.php b/core/DataAccess/RawLogFetcher.php
index ec1f7d14ce..0a867e24a3 100644
--- a/core/DataAccess/RawLogFetcher.php
+++ b/core/DataAccess/RawLogFetcher.php
@@ -22,7 +22,7 @@ class RawLogFetcher
      * @param array $fields
      * @param int $fromId
      * @param int $limit
-     * @return array
+     * @return array[]
      */
     public function getVisitsWithDatesLimit($from, $to, $fields = array(), $fromId = 0, $limit = 1000)
     {
diff --git a/core/DataAccess/RawLogUpdater.php b/core/DataAccess/RawLogUpdater.php
index 7d54fbbfe2..a19ce52e94 100644
--- a/core/DataAccess/RawLogUpdater.php
+++ b/core/DataAccess/RawLogUpdater.php
@@ -21,7 +21,7 @@ class RawLogUpdater
     {
         $sql = "UPDATE " . Common::prefixTable('log_visit')
              . " SET " . $this->getColumnSetExpressions(array_keys($values))
-             . "WHERE idvisit = ?";
+             . " WHERE idvisit = ?";
 
         $this->update($sql, $values, $idVisit);
     }
@@ -32,11 +32,9 @@ class RawLogUpdater
      */
     public function updateConversions(array $values, $idVisit)
     {
-        $sql = array(
-            "UPDATE " . Common::prefixTable('log_conversion'),
-            "SET " . $this->getColumnSetExpressions(array_keys($values)),
-            "WHERE idvisit = ?"
-        );
+        $sql = "UPDATE " . Common::prefixTable('log_conversion')
+             . " SET " . $this->getColumnSetExpressions(array_keys($values))
+             . " WHERE idvisit = ?";
 
         $this->update($sql, $values, $idVisit);
     }