coding style fixes, some PHPStorm inspection fixes, improved readability of code, few refactorings, all as part of our code cleanup strategy

1 files changed, 27 insertions, 6 deletions

diff --git a/core/Columns/Updater.php b/core/Columns/Updater.php
index 2dd6e4040e..1bc53607ca 100644
--- a/core/Columns/Updater.php
+++ b/core/Columns/Updater.php
@@ -87,17 +87,17 @@ class Updater extends \Piwik\Updates
 
         $changingColumns = array();
 
-        foreach (VisitDimension::getAllDimensions() as $dimension) {
+        foreach (self::getVisitDimensions() as $dimension) {
             $updates         = self::getUpdatesForDimension($dimension, 'log_visit.', $visitColumns, $conversionColumns);
             $changingColumns = self::mixinUpdates($changingColumns, $updates);
         }
 
-        foreach (ActionDimension::getAllDimensions() as $dimension) {
+        foreach (self::getActionDimensions() as $dimension) {
             $updates         = self::getUpdatesForDimension($dimension, 'log_link_visit_action.', $actionColumns);
             $changingColumns = self::mixinUpdates($changingColumns, $updates);
         }
 
-        foreach (ConversionDimension::getAllDimensions() as $dimension) {
+        foreach (self::getConversionDimensions() as $dimension) {
             $updates         = self::getUpdatesForDimension($dimension, 'log_conversion.', $conversionColumns);
             $changingColumns = self::mixinUpdates($changingColumns, $updates);
         }
@@ -167,15 +167,15 @@ class Updater extends \Piwik\Updates
         $actionColumns     = DbHelper::getTableColumns(Common::prefixTable('log_link_visit_action'));
         $conversionColumns = DbHelper::getTableColumns(Common::prefixTable('log_conversion'));
 
-        foreach (VisitDimension::getAllDimensions() as $dimension) {
+        foreach (self::getVisitDimensions() as $dimension) {
             $versions = self::mixinVersions($dimension, 'log_visit.', $visitColumns, $versions);
         }
 
-        foreach (ActionDimension::getAllDimensions() as $dimension) {
+        foreach (self::getActionDimensions() as $dimension) {
             $versions = self::mixinVersions($dimension, 'log_link_visit_action.', $actionColumns, $versions);
         }
 
-        foreach (ConversionDimension::getAllDimensions() as $dimension) {
+        foreach (self::getConversionDimensions() as $dimension) {
             $versions = self::mixinVersions($dimension, 'log_conversion.', $conversionColumns, $versions);
         }
 
@@ -327,4 +327,25 @@ class Updater extends \Piwik\Updates
 
         return array();
     }
+
+    private static function getVisitDimensions()
+    {
+        return VisitDimension::getAllDimensions();
+    }
+
+    /**
+     * @return mixed|Dimension[]
+     */
+    private static function getActionDimensions()
+    {
+        return ActionDimension::getAllDimensions();
+    }
+
+    /**
+     * @return mixed|Dimension[]
+     */
+    private static function getConversionDimensions()
+    {
+        return ConversionDimension::getAllDimensions();
+    }
 }