From 8e37ebbc15711796990bcf6c9a30da17386ba93b Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 10 Mar 2015 16:18:40 +1300
Subject: [PATCH] Remove deprecated MenuTop::addEntry() and
 MenuTop::removeEntry()

---
 CHANGELOG.md          |  1 +
 core/Menu/MenuTop.php | 31 -------------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b36f7b5447..f87d5e1a20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 * The deprecated method `Period::factory()` has been removed. Use `Period\Factory` instead.
 * The deprecated method `Config::getConfigSuperUserForBackwardCompatibility()` has been removed.
 * The deprecated methods `MenuAdmin::addEntry()` and `MenuAdmin::removeEntry()` have been removed. Use `Piwik\Plugin\Menu` instead.
+* The deprecated methods `MenuTop::addEntry()` and `MenuTop::removeEntry()` have been removed. Use `Piwik\Plugin\Menu` instead.
 
 ## Piwik 2.11.0
 
diff --git a/core/Menu/MenuTop.php b/core/Menu/MenuTop.php
index 55c09c57af..87ccb3c5f8 100644
--- a/core/Menu/MenuTop.php
+++ b/core/Menu/MenuTop.php
@@ -31,37 +31,6 @@ use Piwik\Piwik;
  */
 class MenuTop extends MenuAbstract
 {
-    /**
-     * Adds a new entry to the TopMenu.
-     *
-     * @param string $topMenuName The menu item name. Can be a translation token.
-     * @param string|array $url The URL the admin menu entry should link to, or an array of query parameters
-     *                          that can be used to build the URL. If `$isHTML` is true, this can be a string with
-     *                          HTML that is simply embedded.
-     * @param boolean $displayedForCurrentUser Whether this menu entry should be displayed for the
-     *                                         current user. If false, the entry will not be added.
-     * @param int $order The order hint.
-     * @param bool $isHTML Whether `$url` is an HTML string or a URL that will be rendered as a link.
-     * @param bool|string $tooltip Optional tooltip to display.
-     * @deprecated since version 2.4.0. See {@link Piwik\Plugin\Menu} for new implementation.
-     */
-    public static function addEntry($topMenuName, $url, $displayedForCurrentUser = true, $order = 10, $isHTML = false, $tooltip = false)
-    {
-        if ($isHTML) {
-            MenuTop::getInstance()->addHtml($topMenuName, $url, $displayedForCurrentUser, $order, $tooltip);
-        } else {
-            MenuTop::getInstance()->add($topMenuName, null, $url, $displayedForCurrentUser, $order, $tooltip);
-        }
-    }
-
-    /**
-     * @deprecated since version 2.4.0. See {@link Piwik\Plugin\Menu} for new implementation.
-     */
-    public static function removeEntry($menuName, $subMenuName = false)
-    {
-        MenuTop::getInstance()->remove($menuName, $subMenuName);
-    }
-
     /**
      * Directly adds a menu entry containing html.
      *
-- 
GitLab