diff --git a/core/Updates/2.0.4-b4.php b/core/Updates/2.0.4-b4.php new file mode 100644 index 0000000000000000000000000000000000000000..f95a94fdd5f4c38023a64f240510808844715560 --- /dev/null +++ b/core/Updates/2.0.4-b4.php @@ -0,0 +1,41 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + * @category Piwik + * @package Piwik + */ + +namespace Piwik\Updates; + +use Piwik\Common; +use Piwik\Site; +use Piwik\Updater; +use Piwik\Updates; +use Piwik\Filesystem; + +use Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker; +use Piwik\Plugins\PrivacyManager\IPAnonymizer; + +/** + * @package Updates + */ +class Updates_2_0_4_b4 extends Updates +{ + static function getSql($schema = 'Myisam') + { + return array( + // ignore existing column name error (1060) + 'ALTER TABLE ' . Common::prefixTable('user') + . " ADD COLUMN `superuser_access` tinyint(2) unsigned NOT NULL DEFAULT '0' AFTER token_auth" => 1060, + ); + } + + static function update() + { + Updater::updateDatabase(__FILE__, self::getSql()); + } +} diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php index 0af1ae8fcf3cf81701b5c9a3bf1a1be1decf80e4..2f0e63a5d86f590c812550070f117bbc93f92210 100644 --- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Core/DeprecatedMethodsTest.php @@ -32,6 +32,7 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase $this->assertDeprecatedMethodIsRemoved('\Piwik\Access', 'isSuperUser', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Access', 'checksUserIsSuperUser', $validTill); $this->assertDeprecatedMethodIsRemoved('\FakeAccess', 'checksUserIsSuperUser', $validTill); + $this->assertDeprecatedMethodIsRemoved('\FakeAccess', 'setSuperUser', $validTill); } private function assertDeprecatedMethodIsRemoved($className, $method, $removalDate) diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php index 45c703b545c769542b2a356cd7ceafafd46ba9ca..83447f49b4699d6577e828600df39a35bf801f5d 100644 --- a/tests/PHPUnit/FakeAccess.php +++ b/tests/PHPUnit/FakeAccess.php @@ -60,11 +60,20 @@ class FakeAccess self::checkUserHasSuperUserAccess(); } - public static function setSuperUser($bool = true) + public static function setSuperUserAccess($bool = true) { self::$superUser = $bool; } + /** + * @see FakeAccess::checkUserHasSuperUserAccess() + * @deprecated deprecated since version 2.0.4 + */ + public static function setSuperUser($bool = true) + { + self::setSuperUserAccess($bool); + } + public static function reloadAccess() { }