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

6 files changed, 26 insertions, 24 deletions

diff --git a/core/Menu/Group.php b/core/Menu/Group.php
index 17e7c9bc5c..90e063e264 100644
--- a/core/Menu/Group.php
+++ b/core/Menu/Group.php
@@ -18,8 +18,8 @@ class Group
     public function add($subTitleMenu, $url, $tooltip = false)
     {
         $this->items[] = array(
-            'name' => $subTitleMenu,
-            'url'  => $url,
+            'name'    => $subTitleMenu,
+            'url'     => $url,
             'tooltip' => $tooltip
         );;
     }
diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php
index 1fe1152c98..8fcc4786cc 100644
--- a/core/Menu/MenuAbstract.php
+++ b/core/Menu/MenuAbstract.php
@@ -9,7 +9,6 @@
 namespace Piwik\Menu;
 
 use Piwik\Common;
-use Piwik\Log;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Singleton;
 use Piwik\Plugin\Manager as PluginManager;
@@ -215,8 +214,8 @@ abstract class MenuAbstract extends Singleton
     {
         foreach ($this->edits as $edit) {
             $mainMenuToEdit = $edit[0];
-            $subMenuToEdit = $edit[1];
-            $newUrl = $edit[2];
+            $subMenuToEdit  = $edit[1];
+            $newUrl         = $edit[2];
 
             if ($subMenuToEdit === null) {
                 $menuDataToEdit = @$this->menu[$mainMenuToEdit];
@@ -236,14 +235,14 @@ abstract class MenuAbstract extends Singleton
     {
         foreach($this->menuEntriesToRemove as $menuToDelete) {
 
-            if(empty($menuToDelete[1])) {
+            if (empty($menuToDelete[1])) {
                 // Delete Main Menu
-                if(isset($this->menu[$menuToDelete[0]])) {
+                if (isset($this->menu[$menuToDelete[0]])) {
                     unset($this->menu[$menuToDelete[0]]);
                 }
             } else {
                 // Delete Sub Menu
-                if(isset($this->menu[$menuToDelete[0]][$menuToDelete[1]])) {
+                if (isset($this->menu[$menuToDelete[0]][$menuToDelete[1]])) {
                     unset($this->menu[$menuToDelete[0]][$menuToDelete[1]]);
                 }
             }
@@ -256,9 +255,10 @@ abstract class MenuAbstract extends Singleton
     {
         foreach ($this->renames as $rename) {
             $mainMenuOriginal = $rename[0];
-            $subMenuOriginal = $rename[1];
-            $mainMenuRenamed = $rename[2];
-            $subMenuRenamed = $rename[3];
+            $subMenuOriginal  = $rename[1];
+            $mainMenuRenamed  = $rename[2];
+            $subMenuRenamed   = $rename[3];
+
             // Are we changing a submenu?
             if (!empty($subMenuOriginal)) {
                 if (isset($this->menu[$mainMenuOriginal][$subMenuOriginal])) {
diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php
index 5c814b6706..13e8480596 100644
--- a/core/Menu/MenuAdmin.php
+++ b/core/Menu/MenuAdmin.php
@@ -45,7 +45,9 @@ class MenuAdmin extends MenuAbstract
      */
     public static function addEntry($adminMenuName, $url, $displayedForCurrentUser = true, $order = 20)
     {
-        self::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order);
+        if ($displayedForCurrentUser) {
+            self::getInstance()->addItem('General_Settings', $adminMenuName, $url, $order);
+        }
     }
 
     /**
@@ -59,7 +61,7 @@ class MenuAdmin extends MenuAbstract
      */
     public function addDevelopmentItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('CoreAdminHome_MenuDevelopment', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('CoreAdminHome_MenuDevelopment', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -73,7 +75,7 @@ class MenuAdmin extends MenuAbstract
      */
     public function addDiagnosticItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('CoreAdminHome_MenuDiagnostic', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('CoreAdminHome_MenuDiagnostic', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -87,7 +89,7 @@ class MenuAdmin extends MenuAbstract
      */
     public function addPlatformItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('CorePluginsAdmin_MenuPlatform', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('CorePluginsAdmin_MenuPlatform', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -101,7 +103,7 @@ class MenuAdmin extends MenuAbstract
      */
     public function addSettingsItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('General_Settings', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('General_Settings', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -115,7 +117,7 @@ class MenuAdmin extends MenuAbstract
      */
     public function addManageItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('CoreAdminHome_MenuManage', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('CoreAdminHome_MenuManage', $menuName, $url, $order, $tooltip);
     }
 
     /**
diff --git a/core/Menu/MenuMain.php b/core/Menu/MenuMain.php
index 5f27f3229e..adb6b538e9 100644
--- a/core/Menu/MenuMain.php
+++ b/core/Menu/MenuMain.php
@@ -11,7 +11,7 @@ namespace Piwik\Menu;
 /**
  * @deprecated since 2.4.0
  * @see MenuReporting
- * @method static \Piwik\Menu\MenuMain getInstance()
+ * @method static MenuMain getInstance()
  * @ignore
  */
 class MenuMain extends MenuReporting
diff --git a/core/Menu/MenuReporting.php b/core/Menu/MenuReporting.php
index 28fddd8313..ac35151bcb 100644
--- a/core/Menu/MenuReporting.php
+++ b/core/Menu/MenuReporting.php
@@ -45,7 +45,7 @@ class MenuReporting extends MenuAbstract
      */
     public function addVisitorsItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('General_Visitors', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('General_Visitors', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -59,7 +59,7 @@ class MenuReporting extends MenuAbstract
      */
     public function addActionsItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('General_Actions', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('General_Actions', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -88,7 +88,7 @@ class MenuReporting extends MenuAbstract
      */
     public function addReferrersItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('Referrers_Referrers', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('Referrers_Referrers', $menuName, $url, $order, $tooltip);
     }
 
     /**
diff --git a/core/Menu/MenuUser.php b/core/Menu/MenuUser.php
index ad9b195d46..758ac3d578 100755
--- a/core/Menu/MenuUser.php
+++ b/core/Menu/MenuUser.php
@@ -26,7 +26,7 @@ namespace Piwik\Menu;
  *         );
  *     }
  *
- * @method static \Piwik\Menu\MenuUser getInstance()
+ * @method static MenuUser getInstance()
  */
 class MenuUser extends MenuAbstract
 {
@@ -42,7 +42,7 @@ class MenuUser extends MenuAbstract
      */
     public function addManageItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('CoreAdminHome_MenuManage', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('CoreAdminHome_MenuManage', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -56,7 +56,7 @@ class MenuUser extends MenuAbstract
      */
     public function addPlatformItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->add('CorePluginsAdmin_MenuPlatform', $menuName, $url, true, $order, $tooltip);
+        $this->addItem('CorePluginsAdmin_MenuPlatform', $menuName, $url, $order, $tooltip);
     }
 
     /**