diff options
Diffstat (limited to 'plugins')
41 files changed, 58 insertions, 59 deletions
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 66269ff14c32ed433d86b46fb772e4082ac66cb +Subproject caac998ad29770aa068cbb859214f395b4d5913 diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject cf4bc33047985ac8308ed0fc39f2a24d523cde4 +Subproject 70b77298680c1341440294f03b3438fee93d91e diff --git a/plugins/BulkTracking/tests/System/TrackerTest.php b/plugins/BulkTracking/tests/System/TrackerTest.php index 4c3be14816..3be6fd139e 100644 --- a/plugins/BulkTracking/tests/System/TrackerTest.php +++ b/plugins/BulkTracking/tests/System/TrackerTest.php @@ -22,7 +22,7 @@ class TrackerTest extends SystemTestCase public static $fixture = null; /** - * @var \PiwikTracker + * @var \MatomoTracker */ private $tracker; diff --git a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php index 4285d3ee08..aea0a68c51 100644 --- a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php +++ b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\Contents\tests\Fixtures; use Piwik\Date; use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Tests\Framework\Fixture; -use PiwikTracker; +use MatomoTracker; /** * Tracks contents @@ -56,13 +56,13 @@ class TwoVisitsWithContents extends Fixture $this->trackContentImpressionsAndInteractions($vis2); } - private function moveTimeForward(PiwikTracker $vis, $minutes) + private function moveTimeForward(MatomoTracker $vis, $minutes) { $hour = $minutes / 60; $vis->setForceVisitDateTime(Date::factory($this->dateTime)->addHour($hour)->getDatetime()); } - protected function trackContentImpressionsAndInteractions(PiwikTracker $vis) + protected function trackContentImpressionsAndInteractions(MatomoTracker $vis) { $vis->setUrl('http://www.example.org/page'); $vis->setGenerationTime(333); diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php index cd777e6e97..2daa351f77 100644 --- a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php +++ b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Common; use Piwik\Container\StaticContainer; -use Piwik\Decompress\Tar; +use Matomo\Decompress\Tar; use Piwik\Development; use Piwik\Filesystem; use Piwik\Http; diff --git a/plugins/CoreHome/Columns/VisitIp.php b/plugins/CoreHome/Columns/VisitIp.php index 8875cd2149..f7f09e56f4 100644 --- a/plugins/CoreHome/Columns/VisitIp.php +++ b/plugins/CoreHome/Columns/VisitIp.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\CoreHome\Columns; use Piwik\Common; use Piwik\Metrics\Formatter; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Segment; @@ -27,7 +27,7 @@ class VisitIp extends VisitDimension protected $nameSingular = 'General_VisitorIP'; protected $namePlural = 'General_VisitorIPs'; protected $acceptValues = '13.54.122.1. </code>Select IP ranges with notation: <code>visitIp>13.54.122.0;visitIp<13.54.122.255'; - protected $sqlFilterValue = array('Piwik\Network\IPUtils', 'stringToBinaryIP'); + protected $sqlFilterValue = array('Matomo\Network\IPUtils', 'stringToBinaryIP'); public function formatValue($value, $idSite, Formatter $formatter) { diff --git a/plugins/CoreHome/LoginWhitelist.php b/plugins/CoreHome/LoginWhitelist.php index 677736a3c5..b4e7f1eac1 100644 --- a/plugins/CoreHome/LoginWhitelist.php +++ b/plugins/CoreHome/LoginWhitelist.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\CoreHome; use Piwik\Common; use Piwik\Config; use Piwik\Container\StaticContainer; -use Piwik\Network\IP as NetworkIp; +use Matomo\Network\IP as NetworkIp; use Piwik\NoAccessException; use Piwik\Piwik; use Piwik\SettingsServer; diff --git a/plugins/CoreHome/tests/Integration/Column/UserIdTest.php b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php index 115fd76314..ef41206d23 100644 --- a/plugins/CoreHome/tests/Integration/Column/UserIdTest.php +++ b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php @@ -244,7 +244,7 @@ class UserIdTest extends IntegrationTestCase } } - private function trackPageview(\PiwikTracker $tracker, $userId, $url = null) + private function trackPageview(\MatomoTracker $tracker, $userId, $url = null) { if (null !== $url) { $tracker->setUrl('http://www.example.org' . $url); diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index 221f916cf4..5d2448e7a4 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -16,8 +16,6 @@ use Piwik\Metrics; use Piwik\Tracker\GoalManager; use Piwik\Tracker; -require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; - class Archiver extends \Piwik\Plugin\Archiver { const LABEL_CUSTOM_VALUE_NOT_DEFINED = "Value not defined"; @@ -109,7 +107,7 @@ class Archiver extends \Piwik\Plugin\Archiver // then we also query the "Product page view" price which was possibly recorded. $additionalSelects = false; - if (in_array($slot, array(\PiwikTracker::CVAR_INDEX_ECOMMERCE_ITEM_SKU, \PiwikTracker::CVAR_INDEX_ECOMMERCE_ITEM_NAME, \PiwikTracker::CVAR_INDEX_ECOMMERCE_ITEM_CATEGORY))) { + if (in_array($slot, array(\MatomoTracker::CVAR_INDEX_ECOMMERCE_ITEM_SKU, \MatomoTracker::CVAR_INDEX_ECOMMERCE_ITEM_NAME, \MatomoTracker::CVAR_INDEX_ECOMMERCE_ITEM_CATEGORY))) { $additionalSelects = array($this->getSelectAveragePrice()); } $query = $this->getLogAggregator()->queryActionsByDimension($dimensions, $where, $additionalSelects); @@ -121,7 +119,7 @@ class Archiver extends \Piwik\Plugin\Archiver protected function getSelectAveragePrice() { - $field = "custom_var_v" . \PiwikTracker::CVAR_INDEX_ECOMMERCE_ITEM_PRICE; + $field = "custom_var_v" . \MatomoTracker::CVAR_INDEX_ECOMMERCE_ITEM_PRICE; return LogAggregator::getSqlRevenue("AVG(log_link_visit_action." . $field . ")") . " as `" . Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`"; } diff --git a/plugins/Diagnostics/ConfigReader.php b/plugins/Diagnostics/ConfigReader.php index 9f98ab94cb..824dc4f362 100644 --- a/plugins/Diagnostics/ConfigReader.php +++ b/plugins/Diagnostics/ConfigReader.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\Diagnostics; use Piwik\Development; -use Piwik\Ini\IniReader; +use Matomo\Ini\IniReader; use Piwik\Application\Kernel\GlobalSettingsProvider; use Piwik\Settings as PiwikSettings; use Piwik\Plugin\Settings as PluginSettings; diff --git a/plugins/Diagnostics/tests/Integration/ConfigReaderTest.php b/plugins/Diagnostics/tests/Integration/ConfigReaderTest.php index 05b5f0af50..f5d78fb1c1 100644 --- a/plugins/Diagnostics/tests/Integration/ConfigReaderTest.php +++ b/plugins/Diagnostics/tests/Integration/ConfigReaderTest.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\Diagnostics\tests\Integration\Commands; use Piwik\Application\Kernel\GlobalSettingsProvider; -use Piwik\Ini\IniReader; +use Matomo\Ini\IniReader; use Piwik\Plugins\Diagnostics\ConfigReader; use Piwik\Plugins\ExampleSettingsPlugin\SystemSettings; use Piwik\Settings\FieldConfig; diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2.php b/plugins/GeoIp2/LocationProvider/GeoIp2.php index e4e9a7efa3..3a17da686d 100644 --- a/plugins/GeoIp2/LocationProvider/GeoIp2.php +++ b/plugins/GeoIp2/LocationProvider/GeoIp2.php @@ -245,7 +245,7 @@ abstract class GeoIp2 extends LocationProvider */ protected function getIpFromInfo($info) { - $ip = \Piwik\Network\IP::fromStringIP($info['ip']); + $ip = \Matomo\Network\IP::fromStringIP($info['ip']); return $ip->toString(); } diff --git a/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php b/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php index 25fac65727..a842449a11 100644 --- a/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php +++ b/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php @@ -49,7 +49,7 @@ class IntranetSitesWithVisits extends Fixture } } - private function configureSameDevice(\PiwikTracker $t) + private function configureSameDevice(\MatomoTracker $t) { // to make purpose of test more clear we configure the device partially... $t->setIp('56.11.55.70'); diff --git a/plugins/Live/VisitorDetails.php b/plugins/Live/VisitorDetails.php index 98c0c52c9d..37b3c71215 100644 --- a/plugins/Live/VisitorDetails.php +++ b/plugins/Live/VisitorDetails.php @@ -14,7 +14,7 @@ use Piwik\Config; use Piwik\Date; use Piwik\DataTable; use Piwik\Metrics\Formatter; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Piwik; use Piwik\Site; use Piwik\Plugins\SitesManager\API as APISitesManager; diff --git a/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php b/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php index 987ea6fc51..d21bed8221 100644 --- a/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php +++ b/plugins/Live/tests/Fixtures/VisitsWithAllActionsAndDevices.php @@ -69,7 +69,7 @@ class VisitsWithAllActionsAndDevices extends Fixture // empty } - private function trackVisitSmartphone(\PiwikTracker $t, $dateTime) + private function trackVisitSmartphone(\MatomoTracker $t, $dateTime) { $t->setForceVisitDateTime($dateTime); $t->setUserAgent('Mozilla/5.0 (Linux; U; Android 4.4.2; fr-fr; HTC One_M8 Build/KOT49H) AppleWebKit/537.16 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.16'); @@ -147,7 +147,7 @@ class VisitsWithAllActionsAndDevices extends Fixture self::checkResponse($t->doTrackAction('http://vendor.site', 'link')); } - private function trackVisitTablet(\PiwikTracker $t, $dateTime) + private function trackVisitTablet(\MatomoTracker $t, $dateTime) { $t->setForceVisitDateTime($dateTime); $t->setUserAgent('Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.8 Safari/535.19 Silk-Accelerated=true'); @@ -187,7 +187,7 @@ class VisitsWithAllActionsAndDevices extends Fixture $t->doTrackContentImpression('product slider', 'product_16.jpg', 'http://example.org/product16'); } - private function trackVisitMediaPlayer(\PiwikTracker $t, $dateTime) + private function trackVisitMediaPlayer(\MatomoTracker $t, $dateTime) { $t->setForceVisitDateTime($dateTime); $t->setUserAgent('Mozilla/5.0 (iPod; U; CPU iPhone OS 4_2_1 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C148'); @@ -213,7 +213,7 @@ class VisitsWithAllActionsAndDevices extends Fixture self::checkResponse($t->doTrackPageView('Action without url')); } - private function trackDeviceVisit(\PiwikTracker $t, $dateTime, $useragent) + private function trackDeviceVisit(\MatomoTracker $t, $dateTime, $useragent) { $t->setForceVisitDateTime($dateTime); $t->setUserAgent($useragent); diff --git a/plugins/Login/SystemSettings.php b/plugins/Login/SystemSettings.php index 360add240c..93c1f799e5 100644 --- a/plugins/Login/SystemSettings.php +++ b/plugins/Login/SystemSettings.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\Login; -use Piwik\Network\IP; +use Matomo\Network\IP; use Piwik\Piwik; use Piwik\Settings\Setting; use Piwik\Settings\FieldConfig; diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject 7131f1af70ef02787db7d817d3f3f01dfe7c90f +Subproject 263d8dbf5664fb54728863a854728bbeb64fd9e diff --git a/plugins/Marketplace/Api/Client.php b/plugins/Marketplace/Api/Client.php index 7334d2f629..b1e42b9ee9 100644 --- a/plugins/Marketplace/Api/Client.php +++ b/plugins/Marketplace/Api/Client.php @@ -8,7 +8,7 @@ */ namespace Piwik\Plugins\Marketplace\Api; -use Piwik\Cache; +use Matomo\Cache\Lazy; use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\Filesystem; @@ -34,7 +34,7 @@ class Client private $service; /** - * @var Cache\Lazy + * @var Lazy */ private $cache; @@ -53,7 +53,7 @@ class Client */ private $environment; - public function __construct(Service $service, Cache\Lazy $cache, LoggerInterface $logger, Environment $environment) + public function __construct(Service $service, Lazy $cache, LoggerInterface $logger, Environment $environment) { $this->service = $service; $this->cache = $cache; diff --git a/plugins/Marketplace/Plugins/InvalidLicenses.php b/plugins/Marketplace/Plugins/InvalidLicenses.php index 2439a06117..faae824031 100644 --- a/plugins/Marketplace/Plugins/InvalidLicenses.php +++ b/plugins/Marketplace/Plugins/InvalidLicenses.php @@ -8,7 +8,7 @@ */ namespace Piwik\Plugins\Marketplace\Plugins; -use Piwik\Cache; +use Matomo\Cache\Eager; use Piwik\Piwik; use Piwik\Plugin; use Piwik\Plugins\Marketplace\Api\Client; @@ -37,7 +37,7 @@ class InvalidLicenses private $translator; /** - * @var Cache\Eager + * @var Eager */ private $cache; @@ -50,7 +50,7 @@ class InvalidLicenses private $cacheKey = 'Marketplace_ExpiredPlugins'; - public function __construct(Client $client, Cache\Eager $cache, Translator $translator, Plugins $plugins) + public function __construct(Client $client, Eager $cache, Translator $translator, Plugins $plugins) { $this->client = $client; $this->translator = $translator; diff --git a/plugins/Marketplace/tests/Framework/Mock/Client.php b/plugins/Marketplace/tests/Framework/Mock/Client.php index 1fab955c2d..813ad08934 100644 --- a/plugins/Marketplace/tests/Framework/Mock/Client.php +++ b/plugins/Marketplace/tests/Framework/Mock/Client.php @@ -8,8 +8,8 @@ namespace Piwik\Plugins\Marketplace\tests\Framework\Mock; -use Piwik\Cache\Backend\NullCache; -use Piwik\Cache\Lazy; +use Matomo\Cache\Backend\NullCache; +use Matomo\Cache\Lazy; use Psr\Log\NullLogger; class Client { diff --git a/plugins/Marketplace/tests/Integration/Plugins/InvalidLicensesTest.php b/plugins/Marketplace/tests/Integration/Plugins/InvalidLicensesTest.php index 132ec6f211..1d3203548b 100644 --- a/plugins/Marketplace/tests/Integration/Plugins/InvalidLicensesTest.php +++ b/plugins/Marketplace/tests/Integration/Plugins/InvalidLicensesTest.php @@ -8,8 +8,8 @@ namespace Piwik\Plugins\Marketplace\tests\Integration\Plugins; -use Piwik\Cache\Backend\ArrayCache; -use Piwik\Cache\Eager; +use Matomo\Cache\Backend\ArrayCache; +use Matomo\Cache\Eager; use Piwik\Container\StaticContainer; use Piwik\Plugins\Marketplace\Consumer; use Piwik\Plugins\Marketplace\Plugins; diff --git a/plugins/Monolog/tests/System/TrackerLoggingTest.php b/plugins/Monolog/tests/System/TrackerLoggingTest.php index 0942be7560..f0281e47eb 100644 --- a/plugins/Monolog/tests/System/TrackerLoggingTest.php +++ b/plugins/Monolog/tests/System/TrackerLoggingTest.php @@ -10,12 +10,10 @@ namespace Piwik\Plugins\Monolog\tests\System; use Piwik\Config; use Piwik\Date; -use Piwik\Plugins\Monolog\Handler\EchoHandler; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Framework\TestingEnvironmentVariables; -use PiwikTracker; -use Psr\Container\ContainerInterface; +use MatomoTracker; /** * @group Monolog @@ -72,7 +70,7 @@ class TrackerLoggingTest extends SystemTestCase return $t; } - private function assertTrackerResponseContainsLogOutput(PiwikTracker $t) + private function assertTrackerResponseContainsLogOutput(MatomoTracker $t) { $response = $t->doTrackPageView('incredible title!'); diff --git a/plugins/PrivacyManager/Dao/LogDataAnonymizer.php b/plugins/PrivacyManager/Dao/LogDataAnonymizer.php index d4d7319acc..0ddf6c8ef2 100644 --- a/plugins/PrivacyManager/Dao/LogDataAnonymizer.php +++ b/plugins/PrivacyManager/Dao/LogDataAnonymizer.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\PrivacyManager\Dao; use Piwik\Common; use Piwik\Db; use Piwik\DbHelper; -use Piwik\Network\IP; +use Matomo\Network\IP; use Piwik\Plugins\PrivacyManager\Config; use Piwik\Plugins\PrivacyManager\IPAnonymizer; use Piwik\Plugins\PrivacyManager\Tracker\RequestProcessor; diff --git a/plugins/PrivacyManager/IPAnonymizer.php b/plugins/PrivacyManager/IPAnonymizer.php index f92b4dccd1..2280492d55 100644 --- a/plugins/PrivacyManager/IPAnonymizer.php +++ b/plugins/PrivacyManager/IPAnonymizer.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\PrivacyManager; use Piwik\Common; -use Piwik\Network\IP; +use Matomo\Network\IP; /** * Anonymize visitor IP addresses to comply with the privacy laws/guidelines in countries, such as Germany. diff --git a/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php b/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php index 73e47b5a86..37ba33c83b 100644 --- a/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php +++ b/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php @@ -160,7 +160,7 @@ class MultipleSitesMultipleVisitsFixture extends Fixture public $idSite = 1; public $numVisitsPerIteration = 32; /** - * @var \PiwikTracker + * @var \MatomoTracker */ private $tracker; diff --git a/plugins/PrivacyManager/tests/Unit/AnonymizeIPTest.php b/plugins/PrivacyManager/tests/Unit/AnonymizeIPTest.php index c9ae38e952..d0e331c1dd 100644 --- a/plugins/PrivacyManager/tests/Unit/AnonymizeIPTest.php +++ b/plugins/PrivacyManager/tests/Unit/AnonymizeIPTest.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\PrivacyManager\tests; -use Piwik\Network\IP; +use Matomo\Network\IP; use Piwik\Plugins\PrivacyManager\IPAnonymizer; require_once PIWIK_INCLUDE_PATH . '/plugins/PrivacyManager/IPAnonymizer.php'; diff --git a/plugins/Provider/Columns/Provider.php b/plugins/Provider/Columns/Provider.php index 4d15833ad8..337683c742 100644 --- a/plugins/Provider/Columns/Provider.php +++ b/plugins/Provider/Columns/Provider.php @@ -9,8 +9,8 @@ namespace Piwik\Plugins\Provider\Columns; use Piwik\Common; -use Piwik\Network\IP; -use Piwik\Network\IPUtils; +use Matomo\Network\IP; +use Matomo\Network\IPUtils; use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Tracker\Action; use Piwik\Tracker\Request; diff --git a/plugins/RssWidget/RssRenderer.php b/plugins/RssWidget/RssRenderer.php index ed3dcd13c7..884f51ccd2 100644 --- a/plugins/RssWidget/RssRenderer.php +++ b/plugins/RssWidget/RssRenderer.php @@ -8,7 +8,9 @@ */ namespace Piwik\Plugins\RssWidget; + use Piwik\Cache; +use Matomo\Cache\Lazy; use Piwik\Http; /** @@ -21,7 +23,7 @@ class RssRenderer protected $showDescription = false; protected $showContent = false; /** - * @var Cache\Lazy + * @var Lazy */ private $cache; diff --git a/plugins/SEO/Metric/ProviderCache.php b/plugins/SEO/Metric/ProviderCache.php index 6066f6d677..d8f6d44ff9 100644 --- a/plugins/SEO/Metric/ProviderCache.php +++ b/plugins/SEO/Metric/ProviderCache.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\SEO\Metric; use Piwik\Cache; +use Matomo\Cache\Lazy; /** * Caches another provider. @@ -21,7 +22,7 @@ class ProviderCache implements MetricsProvider private $provider; /** - * @var Cache\Lazy + * @var Lazy */ private $cache; diff --git a/plugins/SegmentEditor/Services/StoredSegmentService.php b/plugins/SegmentEditor/Services/StoredSegmentService.php index a5cee090dd..96a9dcd8ac 100644 --- a/plugins/SegmentEditor/Services/StoredSegmentService.php +++ b/plugins/SegmentEditor/Services/StoredSegmentService.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\SegmentEditor\Services; use Piwik\Plugins\SegmentEditor\Model; -use Piwik\Cache\Transient as TransientCache; +use Matomo\Cache\Transient as TransientCache; /** diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index b217593ab2..1230e3e4b6 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -15,7 +15,7 @@ use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Intl\Data\Provider\CurrencyDataProvider; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Option; use Piwik\Piwik; use Piwik\Plugin\SettingsProvider; diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 807757b845..be4ea71120 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -102,6 +102,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin /** * User will download a file called PiwikTracker.php that is the content of the actual script + * + * @deprecated seems unused and PiwikTracker is now MatomoTracker */ function downloadPiwikTracker() { diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php index 1df6f47bb7..f44e7f301d 100644 --- a/plugins/TestRunner/Commands/TestsSetupFixture.php +++ b/plugins/TestRunner/Commands/TestsSetupFixture.php @@ -256,8 +256,6 @@ class TestsSetupFixture extends ConsoleCommand private function requireFixtureFiles(InputInterface $input) { - require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; - $file = $input->getOption('file'); if ($file) { if (is_file($file)) { diff --git a/plugins/UserCountry/Columns/Base.php b/plugins/UserCountry/Columns/Base.php index 1ee6ea9d18..fb9468f68d 100644 --- a/plugins/UserCountry/Columns/Base.php +++ b/plugins/UserCountry/Columns/Base.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\UserCountry\Columns; use Piwik\Common; use Piwik\Exception\InvalidRequestParameterException; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugins\UserCountry\VisitorGeolocator; use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig; diff --git a/plugins/UserCountry/Columns/Country.php b/plugins/UserCountry/Columns/Country.php index 6138c0278d..608be68e6b 100644 --- a/plugins/UserCountry/Columns/Country.php +++ b/plugins/UserCountry/Columns/Country.php @@ -13,7 +13,7 @@ use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Intl\Data\Provider\RegionDataProvider; use Piwik\Metrics\Formatter; -use Piwik\Network\IP; +use Matomo\Network\IP; use Piwik\Piwik; use Piwik\Plugin\Manager; use Piwik\Plugin\Segment; diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php index bd0ca86ff6..95f08a9a8d 100644 --- a/plugins/UserCountry/LocationProvider.php +++ b/plugins/UserCountry/LocationProvider.php @@ -498,9 +498,9 @@ abstract class LocationProvider */ protected function getIpFromInfo($info) { - $ip = \Piwik\Network\IP::fromStringIP($info['ip']); + $ip = \Matomo\Network\IP::fromStringIP($info['ip']); - if ($ip instanceof \Piwik\Network\IPv6 && $ip->isMappedIPv4()) { + if ($ip instanceof \Matomo\Network\IPv6 && $ip->isMappedIPv4()) { return $ip->toIPv4String(); } else { return $ip->toString(); diff --git a/plugins/UserCountry/VisitorGeolocator.php b/plugins/UserCountry/VisitorGeolocator.php index 5f992af396..ba2b884e80 100644 --- a/plugins/UserCountry/VisitorGeolocator.php +++ b/plugins/UserCountry/VisitorGeolocator.php @@ -8,12 +8,12 @@ */ namespace Piwik\Plugins\UserCountry; -use Piwik\Cache\Cache; -use Piwik\Cache\Transient; +use Matomo\Cache\Cache; +use Matomo\Cache\Transient; use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\DataAccess\RawLogDao; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider; use Piwik\Tracker\Visit; use Psr\Log\LoggerInterface; diff --git a/plugins/UserCountry/tests/Integration/VisitorGeolocatorTest.php b/plugins/UserCountry/tests/Integration/VisitorGeolocatorTest.php index e315a9ee77..f0b83490ef 100644 --- a/plugins/UserCountry/tests/Integration/VisitorGeolocatorTest.php +++ b/plugins/UserCountry/tests/Integration/VisitorGeolocatorTest.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\UserCountry\tests\Integration; use PHPUnit_Framework_MockObject_MockObject; use Piwik\Common; use Piwik\Db; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Plugins\UserCountry\VisitorGeolocator; use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 39b582f70784895649667c3464f120ccc6fe75e +Subproject 2f671813cd59b9d89745f6157ae71e84496a8ea diff --git a/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php b/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php index 090741ddff..221f48daa0 100644 --- a/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php +++ b/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php @@ -150,7 +150,7 @@ class VisitsSummaryTest extends IntegrationTestCase } } - private function trackPageview(\PiwikTracker $tracker, $userId, $url) + private function trackPageview(\MatomoTracker $tracker, $userId, $url) { $tracker->setUrl('http://www.example.org' . $url); $tracker->setUserId($userId); diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index bc07b254a1..7c0ff2e9eb 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\WebsiteMeasurable; use Piwik\IP; use Piwik\Measurable\Type\TypeManager; -use Piwik\Network\IPUtils; +use Matomo\Network\IPUtils; use Piwik\Piwik; use Piwik\Plugin; use Piwik\Plugins\WebsiteMeasurable\Settings\Urls; |