refs #4564 deprecate some more methods

core/Access.php

@@ -275,12 +275,21 @@ class Access
         return $this->token_auth;
     }
 
+    /**
+     * @see Access::getConfigSuperUserLogin()
+     * @deprecated deprecated since version 2.0.4
+     */
+    public function getSuperUserLogin()
+    {
+        return $this->getConfigSuperUserLogin();
+    }
+
     /**
      * Returns the super user's login.
      *
      * @return string
      */
-    public function getSuperUserLogin()
+    public function getConfigSuperUserLogin()
     {
         $superuser = Config::getInstance()->superuser;
         return $superuser['login'];
@@ -445,7 +454,7 @@ class Access
     private function setConfigUserLoginIfCurrentUserHasNotSuperUserAccess()
     {
         if (!Piwik::hasTheUserSuperUserAccess($this->login)) {
-            $this->login = $this->getSuperUserLogin();
+            $this->login = $this->getConfigSuperUserLogin();
         }
     }
 }

core/Piwik.php

@@ -230,7 +230,7 @@ class Piwik
      */
     static public function getConfigSuperUserLogin()
     {
-        return Access::getInstance()->getSuperUserLogin();
+        return Access::getInstance()->getConfigSuperUserLogin();
     }
 
     /**

tests/PHPUnit/Core/DeprecatedMethodsTest.php

@@ -31,8 +31,10 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Piwik', 'getSuperUserLogin', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Access', 'isSuperUser', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Access', 'checksUserIsSuperUser', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('\Piwik\Access', 'getSuperUserLogin', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\FakeAccess', 'checksUserIsSuperUser', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\FakeAccess', 'setSuperUser', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('\FakeAccess', 'getSuperUserLogin', $validTill);
     }
 
     private function assertDeprecatedMethodIsRemoved($className, $method, $removalDate)

tests/PHPUnit/FakeAccess.php

@@ -183,8 +183,17 @@ class FakeAccess
         return $result;
     }
     
-    public function getSuperUserLogin()
+    public function getConfigSuperUserLogin()
     {
         return self::$superUserLogin;
     }
+
+    /**
+     * @see FakeAccess::getConfigSuperUserLogin()
+     * @deprecated deprecated since version 2.0.4
+     */
+    public function getSuperUserLogin()
+    {
+        return $this->getConfigSuperUserLogin();
+    }
 }