Merge branch 'master' of github.com:piwik/piwik

matomo-org · Aug 21, 2014 · e927364 · e927364
2 parents 15f155f + 4bf8ddc
commit e927364
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,14 @@
 # do not edit this file manually, instead run the generate:travis-yml console command
+# if you are a Piwik core developer, edit this template file to auto generate the travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
 
 language: php
 
 # We want to test against PHP 5.3.3/5.4/5.5
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3.3
-#  - 5.6
 #  - hhvm
 
 # Separate different test suites

diff --git a/core/Tracker/Visitor.php b/core/Tracker/Visitor.php
@@ -256,6 +256,7 @@ public static function getVisitFieldsPersist()
             'visitor_days_since_first',
             'visitor_days_since_order',
             'visitor_count_visits',
+            'visit_goal_buyer',
 
             'location_country',
             'location_region',

diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist
@@ -54,6 +54,7 @@
         <exclude>
             <directory suffix=".php">../../core/Updates</directory>
             <directory suffix=".php">../../plugins/Example*</directory>
+            <directory suffix=".php">../../plugins/SecurityInfo*</directory>
             <directory suffix=".php">../../plugins/*/Updates</directory>
             <directory suffix=".php">../../plugins/*/libs</directory>
             <directory suffix=".php">../../plugins/*/tests</directory>