From 1c51265ecb93d2a6e0b4838da1e75f6a6bb800cb Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Thu, 23 Jan 2014 04:36:39 +0000
Subject: [PATCH] refs #4564 deprecate some more methods
---
core/Access.php | 13 +++++++++++--
core/Piwik.php | 2 +-
tests/PHPUnit/Core/DeprecatedMethodsTest.php | 2 ++
tests/PHPUnit/FakeAccess.php | 11 ++++++++++-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/core/Access.php b/core/Access.php
index 7d35ed72cf..5490cc5d41 100644
--- a/core/Access.php
+++ b/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();
}
}
}
diff --git a/core/Piwik.php b/core/Piwik.php
index 49f839d665..5c787ed7a1 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -230,7 +230,7 @@ class Piwik
*/
static public function getConfigSuperUserLogin()
{
- return Access::getInstance()->getSuperUserLogin();
+ return Access::getInstance()->getConfigSuperUserLogin();
}
/**
diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
index 2f0e63a5d8..9f51d56874 100644
--- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php
+++ b/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)
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
index 83447f49b4..7a9d7ce2ca 100644
--- a/tests/PHPUnit/FakeAccess.php
+++ b/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();
+ }
}
--
GitLab