Some refactoring and preparations for custom events ref matomo-org#472

PHP Tracker and Tests fixtures
Schema updates

.gitignore

@@ -1,30 +1,35 @@
 bootstrap.php
 build
+composer.phar
+config/config.ini.php
 crossdomain.xml
 documentation
+docs/
 favicon.ico
+js/yui*
 logs
-plugins/*.zip
+misc/*.dat
 misc/user/logo-header.png
 misc/user/logo.png
 misc/user/logo.svg
+php_errors.log
 piwik-min.js
+plugins/*.zip
 robots.txt
 tmp
 tmp/*
+vendor/
+
 .cache
+.DS_Store
 .externalToolBuilders
 .idea/*
 .metadata
-.settings
 .project
-*.tmp
-*.db
+.settings
 *.buildpath
-config/config.ini.php
-.DS_Store
-js/yui*
-misc/*.dat
+*.tmp
+tests/javascript/enable_sqlite
 tests/javascript/enable_sqlite
 tests/javascript/unittest.dbf
 tests/lib/geoip-files/*.dat*
@@ -59,9 +64,6 @@ tests/lib/xhprof-0.9.2/extension/ltmain.sh
 tests/lib/xhprof-0.9.2/extension/missing
 tests/lib/xhprof-0.9.2/extension/mkinstalldirs
 tests/lib/xhprof-0.9.2/extension/run-tests.php
-docs/
-composer.phar
-vendor/
 /.htaccess
 config/.htaccess
 core/.htaccess

core/Db/Schema/Myisam.php

@@ -165,6 +165,7 @@ public function getTablesCreateSql()
 							  visit_entry_idaction_name INTEGER(11) UNSIGNED NOT NULL,
 							  visit_total_actions SMALLINT(5) UNSIGNED NOT NULL,
 							  visit_total_searches SMALLINT(5) UNSIGNED NOT NULL,
+							  visit_total_events SMALLINT(5) UNSIGNED NOT NULL,
 							  visit_total_time SMALLINT(5) UNSIGNED NOT NULL,
 							  visit_goal_converted TINYINT(1) NOT NULL,
 							  visit_goal_buyer TINYINT(1) NOT NULL,
@@ -292,6 +293,8 @@ public function getTablesCreateSql()
 											  idaction_url_ref INTEGER(10) UNSIGNED NULL DEFAULT 0,
 											  idaction_name INTEGER(10) UNSIGNED,
 											  idaction_name_ref INTEGER(10) UNSIGNED NOT NULL,
+											  idaction_event_category INTEGER(10) UNSIGNED,
+											  idaction_event_action INTEGER(10) UNSIGNED,
 											  time_spent_ref_action INTEGER(10) UNSIGNED NOT NULL,
 											  custom_var_k1 VARCHAR(200) DEFAULT NULL,
 											  custom_var_v1 VARCHAR(200) DEFAULT NULL,

core/RankingQuery.php

@@ -177,7 +177,7 @@ public function setColumnToMarkExcludedRows($column)
     /**
      * This method can be used to get multiple groups in one go. For example, one might query
      * the top following pages, outlinks and downloads in one go by using log_action.type as
-     * the partition column and [TYPE_ACTION_URL, TYPE_OUTLINK, TYPE_DOWNLOAD] as the possible
+     * the partition column and [TYPE_PAGE_URL, TYPE_OUTLINK, TYPE_DOWNLOAD] as the possible
      * values.
      * When this method has been used, generate() returns as array that contains one array
      * per group of data.