Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-06-03 09:47:44 +0300
committerGitHub <noreply@github.com>2020-06-03 09:47:44 +0300
commit7585967cbd80d7869f57a9adc69c02e8d14cbc33 (patch)
tree7b06afedbcb883175f02ffff141809d001097b64 /plugins/GeoIp2
parentcaf7dbf0fdd3e91a47fa49f297ed18a75ddeff9d (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 'plugins/GeoIp2')
-rw-r--r--plugins/GeoIp2/GeoIP2AutoUpdater.php2
-rw-r--r--plugins/GeoIp2/LocationProvider/GeoIp2.php20
2 files changed, 0 insertions, 22 deletions
diff --git a/plugins/GeoIp2/GeoIP2AutoUpdater.php b/plugins/GeoIp2/GeoIP2AutoUpdater.php
index 65903e94d7..3f2b7b1baf 100644
--- a/plugins/GeoIp2/GeoIP2AutoUpdater.php
+++ b/plugins/GeoIp2/GeoIP2AutoUpdater.php
@@ -8,8 +8,6 @@
*/
namespace Piwik\Plugins\GeoIp2;
-require_once PIWIK_INCLUDE_PATH . "/core/ScheduledTask.php"; // for the tracker which doesn't include this file
-
use Exception;
use GeoIp2\Database\Reader;
use Piwik\Common;
diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2.php b/plugins/GeoIp2/LocationProvider/GeoIp2.php
index 3a17da686d..f418c035ef 100644
--- a/plugins/GeoIp2/LocationProvider/GeoIp2.php
+++ b/plugins/GeoIp2/LocationProvider/GeoIp2.php
@@ -21,8 +21,6 @@ use Piwik\Plugins\UserCountry\LocationProvider;
*/
abstract class GeoIp2 extends LocationProvider
{
- /** @deprecated */
- const GEO_LITE_URL = 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz';
const TEST_IP = '194.57.91.215';
const SWITCH_TO_ISO_REGIONS_OPTION_NAME = 'usercountry.switchtoisoregions';
@@ -113,24 +111,6 @@ abstract class GeoIp2 extends LocationProvider
return StaticContainer::get('path.geoip2') . $filename;
}
- /**
- * Returns test IP used by isWorking and expected result.
- *
- * @return array eg. array('1.2.3.4', array(self::COUNTRY_CODE_KEY => ...))
- * @deprecated
- */
- protected function getTestIpAndResult()
- {
- static $result = null;
- if (is_null($result)) {
- $expected = array(self::COUNTRY_CODE_KEY => 'FR',
- self::REGION_CODE_KEY => 'BFC',
- self::CITY_NAME_KEY => 'Besançon');
- $result = array(self::TEST_IP, $expected);
- }
- return $result;
- }
-
public function activate()
{
$option = Option::get(self::SWITCH_TO_ISO_REGIONS_OPTION_NAME);