From a2a63d34ebb460174e1a3e8d8022fe3e3ab4b469 Mon Sep 17 00:00:00 2001 From: fabiocarneiro Date: Wed, 27 May 2015 06:56:17 -0300 Subject: fix core folder with php-cs-fixer for psr-2 --- core/Menu/Group.php | 2 +- core/Menu/MenuAbstract.php | 7 +++---- core/Menu/MenuReporting.php | 2 +- core/Menu/MenuTop.php | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core/Menu') diff --git a/core/Menu/Group.php b/core/Menu/Group.php index 90e063e264..a13da035b3 100644 --- a/core/Menu/Group.php +++ b/core/Menu/Group.php @@ -21,7 +21,7 @@ class Group 'name' => $subTitleMenu, 'url' => $url, 'tooltip' => $tooltip - );; + ); } public function getItems() diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index 539cbac7e7..4e9e090dad 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.php @@ -240,8 +240,7 @@ abstract class MenuAbstract extends Singleton private function applyRemoves() { - foreach($this->menuEntriesToRemove as $menuToDelete) { - + foreach ($this->menuEntriesToRemove as $menuToDelete) { if (empty($menuToDelete[1])) { // Delete Main Menu if (isset($this->menu[$menuToDelete[0]])) { @@ -275,7 +274,7 @@ abstract class MenuAbstract extends Singleton $this->menu[$mainMenuRenamed][$subMenuRenamed] = $save; } } // Changing a first-level element - else if (isset($this->menu[$mainMenuOriginal])) { + elseif (isset($this->menu[$mainMenuOriginal])) { $save = $this->menu[$mainMenuOriginal]; $save['_name'] = $mainMenuRenamed; unset($this->menu[$mainMenuOriginal]); @@ -299,7 +298,7 @@ abstract class MenuAbstract extends Singleton foreach ($this->menu as $key => &$element) { if (is_null($element)) { unset($this->menu[$key]); - } else if ($element['_hasSubmenu']) { + } elseif ($element['_hasSubmenu']) { uasort($element, array($this, 'menuCompare')); } } diff --git a/core/Menu/MenuReporting.php b/core/Menu/MenuReporting.php index ac35151bcb..598a757633 100644 --- a/core/Menu/MenuReporting.php +++ b/core/Menu/MenuReporting.php @@ -7,6 +7,7 @@ * */ namespace Piwik\Menu; + use Piwik\Piwik; use Piwik\Plugin\Report; @@ -135,7 +136,6 @@ class MenuReporting extends MenuAbstract foreach ($this->getAllMenus() as $menu) { $menu->configureReportingMenu($this); } - } return parent::getMenu(); diff --git a/core/Menu/MenuTop.php b/core/Menu/MenuTop.php index 87ccb3c5f8..687b1b46cf 100644 --- a/core/Menu/MenuTop.php +++ b/core/Menu/MenuTop.php @@ -7,6 +7,7 @@ * */ namespace Piwik\Menu; + use Piwik\Piwik; /** -- cgit v1.2.3