diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-08-17 11:58:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 11:58:59 +0300 |
| commit | 4272da0b3793838a46867857535afebe4ff5ea6f (patch) | |
| tree | c885565828555739ae5f344c94a7b65b13cee40b | |
| parent | b914ff78688f8a7120a9b36baedc454aad477fca (diff) | |
Use renamed composer package matomo/referrer-spam-list (#16304)
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.lock | 17 | ||||
| -rw-r--r-- | core/Tracker/Visit/ReferrerSpamFilter.php | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/composer.json b/composer.json index cec2176dfc..dc10812627 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "matomo/ini": "~2.0", "matomo/matomo-php-tracker": "dev-4.x-dev", "matomo/network": "~2.0", - "matomo/referrer-spam-blacklist": "^3.11", + "matomo/referrer-spam-list": "~4.0.0", "matomo/searchengine-and-social-list": "~3.0", "monolog/monolog": "~1.11", "mustangostang/spyc": "~0.6.0", diff --git a/composer.lock b/composer.lock index 17683ebb04..3abfa826e5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "77ee4f8dcec82efcc88cd3d27e3fb495", + "content-hash": "700bebdcb248d636e79ee338ad6f86f3", "packages": [ { "name": "composer/ca-bundle", @@ -623,20 +623,21 @@ "time": "2020-01-01T12:57:48+00:00" }, { - "name": "matomo/referrer-spam-blacklist", - "version": "3.11.0", + "name": "matomo/referrer-spam-list", + "version": "4.0.0", "source": { "type": "git", - "url": "https://github.com/matomo-org/referrer-spam-blacklist.git", - "reference": "0968ea308924ed4b9c636133fff9eb54820626f7" + "url": "https://github.com/matomo-org/referrer-spam-list.git", + "reference": "afe4c1ea107ee7a8915a0d5eb0031cf0366608a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/referrer-spam-blacklist/zipball/0968ea308924ed4b9c636133fff9eb54820626f7", - "reference": "0968ea308924ed4b9c636133fff9eb54820626f7", + "url": "https://api.github.com/repos/matomo-org/referrer-spam-list/zipball/afe4c1ea107ee7a8915a0d5eb0031cf0366608a8", + "reference": "afe4c1ea107ee7a8915a0d5eb0031cf0366608a8", "shasum": "" }, "replace": { + "matomo/referrer-spam-blacklist": "*", "piwik/referrer-spam-blacklist": "*" }, "type": "library", @@ -645,7 +646,7 @@ "CC0-1.0" ], "description": "Community-contributed list of referrer spammers", - "time": "2020-01-07T13:07:59+00:00" + "time": "2020-08-10T19:54:07+00:00" }, { "name": "matomo/searchengine-and-social-list", diff --git a/core/Tracker/Visit/ReferrerSpamFilter.php b/core/Tracker/Visit/ReferrerSpamFilter.php index a9871bca46..cb5639023c 100644 --- a/core/Tracker/Visit/ReferrerSpamFilter.php +++ b/core/Tracker/Visit/ReferrerSpamFilter.php @@ -78,7 +78,7 @@ class ReferrerSpamFilter $this->spammerList = Common::safe_unserialize($list); } else { // Fallback to reading the bundled list - $file = PIWIK_VENDOR_PATH . '/matomo/referrer-spam-blacklist/spammers.txt'; + $file = PIWIK_VENDOR_PATH . '/matomo/referrer-spam-list/spammers.txt'; $this->spammerList = file($file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); } |