diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-06-03 09:47:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-03 09:47:44 +0300 |
commit | 7585967cbd80d7869f57a9adc69c02e8d14cbc33 (patch) | |
tree | 7b06afedbcb883175f02ffff141809d001097b64 /tests/PHPUnit/Framework | |
parent | caf7dbf0fdd3e91a47fa49f297ed18a75ddeff9d (diff) |
Remove code tagged with `@deprecated` (#16001)
* remove some code tagged with deprecated
* some more tweaks
* remove more deprecated methods
* more deprecations
* remove old files
* remove more deprecated methods
* fix some tests
* update logviewer submodule
* fix some tests
* fix ui test
* another deprecation
* Update CHANGELOG.md
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* add test for dimensions provider
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'tests/PHPUnit/Framework')
-rw-r--r-- | tests/PHPUnit/Framework/Fixture.php | 28 | ||||
-rw-r--r-- | tests/PHPUnit/Framework/TestCase/SystemTestCase.php | 16 | ||||
-rw-r--r-- | tests/PHPUnit/Framework/TestRequest/Collection.php | 4 |
3 files changed, 0 insertions, 48 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 57e914d362..c02f845cec 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -87,19 +87,9 @@ class Fixture extends \PHPUnit\Framework\Assert public $dbName = false; - /** - * @deprecated has no effect now. - */ - public $createConfig = true; - public $dropDatabaseInSetUp = true; public $dropDatabaseInTearDown = true; - /** - * @deprecated - */ - public $loadTranslations = true; - public $createSuperUser = true; public $removeExistingSuperUser = true; public $overwriteExisting = true; @@ -962,13 +952,6 @@ class Fixture extends \PHPUnit\Framework\Assert $dbConfig['dbname'] = $oldDbName; } - /** - * @deprecated - */ - public static function createAccessInstance() - { - } - public function dropDatabase($dbName = null) { $dbName = $dbName ?: $this->dbName ?: self::getConfig()->database_tests['dbname']; @@ -998,17 +981,6 @@ class Fixture extends \PHPUnit\Framework\Assert } } - /** - * @param $type - * @param bool $sanitize - * @deprecated Use XssTesting - */ - public static function makeXssContent($type, $sanitize = false) - { - $xssTesting = new XssTesting(); - return $xssTesting->forTwig($type, $sanitize); - } - public static function updateDatabase($force = false) { Cache::deleteTrackerCache(); diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php index 60a343aaf2..20ebb007bb 100644 --- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php @@ -773,22 +773,6 @@ abstract class SystemTestCase extends TestCase DbHelper::deleteArchiveTables(); } - /** - * @deprecated - */ - public function assertHttpResponseText($expectedResponseText, $url, $message = '') - { - self::assertThat($url, new HttpResponseText($expectedResponseText), $message); - } - - /** - * @deprecated - */ - public function assertResponseCode($expectedResponseCode, $url, $message = '') - { - self::assertThat($url, new ResponseCode($expectedResponseCode), $message); - } - public function assertNotDbConnectionCreated($message = 'A database connection was created but should not.') { self::assertFalse(Db::hasDatabaseObject(), $message); diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php index 6082909351..0510b7df4b 100644 --- a/tests/PHPUnit/Framework/TestRequest/Collection.php +++ b/tests/PHPUnit/Framework/TestRequest/Collection.php @@ -314,10 +314,6 @@ class Collection ((strpos($methodName, 'get') !== 0 && $methodName != 'generateReport') || in_array($moduleName, $this->apiNotToCall) === true || in_array($apiId, $this->apiNotToCall) === true - || $methodName == 'getLogoUrl' - || $methodName == 'getSVGLogoUrl' - || $methodName == 'hasSVGLogo' - || $methodName == 'getHeaderLogoUrl' ) ) { // Excluded modules from test return true; |