Removed deprecated methods, renamed calls to the new methods. Refs #4942

2 files changed, 0 insertions, 95 deletions

diff --git a/core/Access.php b/core/Access.php
index a7b4d7178e..55335385d0 100644
--- a/core/Access.php
+++ b/core/Access.php
@@ -246,15 +246,6 @@ class Access
     }
 
     /**
-     * @see Access::setSuperUserAccess()
-     * @deprecated deprecated since version 2.0.4
-     */
-    public function setSuperUser($bool = true)
-    {
-        self::setSuperUserAccess($bool);
-    }
-
-    /**
      * Returns true if the current user is logged in as the Super User
      *
      * @return bool
@@ -265,15 +256,6 @@ class Access
     }
 
     /**
-     * @see Access::hasSuperUserAccess()
-     * @deprecated deprecated since version 2.0.4
-     */
-    public function isSuperUser()
-    {
-        return $this->hasSuperUserAccess();
-    }
-
-    /**
      * Returns the current user login
      *
      * @return string|null
@@ -315,14 +297,6 @@ class Access
     }
 
     /**
-     * @deprecated deprecated since version 2.0.4
-     */
-    public function getSuperUserLogin()
-    {
-        return $this->getAnySuperUserAccessLogin();
-    }
-
-    /**
      * Returns an array of ID sites for which the user has at least a VIEW access.
      * Which means VIEW or ADMIN or SUPERUSER.
      *
@@ -378,15 +352,6 @@ class Access
     }
 
     /**
-     * @see Access::checkUserHasSuperUserAccess()
-     * @deprecated deprecated since version 2.0.4
-     */
-    public function checkUserIsSuperUser()
-    {
-        self::checkUserHasSuperUserAccess();
-    }
-
-    /**
      * If the user doesn't have an ADMIN access for at least one website, throws an exception
      *
      * @throws \Piwik\NoAccessException
diff --git a/core/Piwik.php b/core/Piwik.php
index a0cff3cdc2..6c47070734 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -258,22 +258,6 @@ class Piwik
     }
 
     /**
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function getSuperUserLogin()
-    {
-        return Access::getInstance()->getSuperUserLogin();
-    }
-
-    /**
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function getSuperUserEmail()
-    {
-        return '';
-    }
-
-    /**
      * Get a list of all email addresses having Super User access.
      *
      * @return array
@@ -336,24 +320,6 @@ class Piwik
     }
 
     /**
-     * @see Piwik::hasUserSuperUserAccessOrIsTheUser()
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function isUserIsSuperUserOrTheUser($theUser)
-    {
-        return self::hasUserSuperUserAccessOrIsTheUser($theUser);
-    }
-
-    /**
-     * @see Piwik::checkUserHasSuperUserAccessOrIsTheUser()
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function checkUserIsSuperUserOrTheUser($theUser)
-    {
-        self::checkUserHasSuperUserAccessOrIsTheUser($theUser);
-    }
-
-    /**
      * Check that the current user is either the specified user or the superuser.
      *
      * @param string $theUser A username.
@@ -404,14 +370,6 @@ class Piwik
         return false;
     }
 
-    /**
-     * @see Piwik::hasUserSuperUserAccess()
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function isUserIsSuperUser()
-    {
-        return self::hasUserSuperUserAccess();
-    }
 
     /**
      * Returns true if the current user has Super User access.
@@ -465,24 +423,6 @@ class Piwik
     }
 
     /**
-     * @see Piwik::setUserHasSuperUserAccess()
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function setUserIsSuperUser($bool = true)
-    {
-        self::setUserHasSuperUserAccess($bool);
-    }
-
-    /**
-     * @see Piwik::checkUserHasSuperUserAccess()
-     * @deprecated deprecated since version 2.0.4
-     */
-    static public function checkUserIsSuperUser()
-    {
-        self::checkUserHasSuperUserAccess();
-    }
-
-    /**
      * Check that the current user has superuser access.
      *
      * @throws Exception if the current user is not the superuser.