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, 11 deletions

diff --git a/core/Tracker/ActionPageview.php b/core/Tracker/ActionPageview.php
index fa3d0146dc..9088fc543a 100644
--- a/core/Tracker/ActionPageview.php
+++ b/core/Tracker/ActionPageview.php
@@ -38,7 +38,7 @@ class ActionPageview extends Action
     {
         return array(
             'idaction_name' => array($this->getActionName(), Action::TYPE_PAGE_TITLE),
-            'idaction_url' => $this->getUrlAndType()
+            'idaction_url'  => $this->getUrlAndType()
         );
     }
 
@@ -55,22 +55,38 @@ class ActionPageview extends Action
     private function cleanupActionName($actionName)
     {
         // get the delimiter, by default '/'; BC, we read the old action_category_delimiter first (see #1067)
-        $actionCategoryDelimiter = isset(Config::getInstance()->General['action_category_delimiter'])
-            ? Config::getInstance()->General['action_category_delimiter']
-            : Config::getInstance()->General['action_url_category_delimiter'];
+        $actionCategoryDelimiter = $this->getActionCategoryDelimiter();
 
         // create an array of the categories delimited by the delimiter
         $split = explode($actionCategoryDelimiter, $actionName);
+        $split = $this->trimEveryCategory($split);
+        $split = $this->removeEmptyCategories($split);
 
-        // trim every category
-        $split = array_map('trim', $split);
+        return $this->rebuildNameOfCleanedCategories($actionCategoryDelimiter, $split);
+    }
+
+    private function rebuildNameOfCleanedCategories($actionCategoryDelimiter, $split)
+    {
+        return implode($actionCategoryDelimiter, $split);
+    }
 
-        // remove empty categories
-        $split = array_filter($split, 'strlen');
+    private function removeEmptyCategories($split)
+    {
+        return array_filter($split, 'strlen');
+    }
+
+    private function trimEveryCategory($split)
+    {
+        return array_map('trim', $split);
+    }
+
+    private function getActionCategoryDelimiter()
+    {
+        if (isset(Config::getInstance()->General['action_category_delimiter'])) {
+            return Config::getInstance()->General['action_category_delimiter'];
+        }
 
-        // rebuild the name from the array of cleaned categories
-        $actionName = implode($actionCategoryDelimiter, $split);
-        return $actionName;
+        return Config::getInstance()->General['action_url_category_delimiter'];
     }
 
 }