diff options
Diffstat (limited to 'tests/PHPUnit/Integration')
51 files changed, 143 insertions, 102 deletions
diff --git a/tests/PHPUnit/Integration/.gitignore b/tests/PHPUnit/Integration/.gitignore new file mode 100644 index 0000000000..bcbf044114 --- /dev/null +++ b/tests/PHPUnit/Integration/.gitignore @@ -0,0 +1 @@ +/plugins
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/AccessTest.php b/tests/PHPUnit/Integration/AccessTest.php index 232581ffb6..886ddb5f9b 100644 --- a/tests/PHPUnit/Integration/AccessTest.php +++ b/tests/PHPUnit/Integration/AccessTest.php @@ -11,8 +11,6 @@ namespace Piwik\Tests\Integration; use Exception; use Piwik\Access; use Piwik\AuthResult; -use Matomo\Cache\Cache; -use Piwik\Db; use Piwik\NoAccessException; use Piwik\Piwik; use Piwik\Plugins\UsersManager\API as UsersManagerAPI; diff --git a/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php b/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php index 6f735e64f4..d640d805bf 100644 --- a/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php +++ b/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php @@ -8,11 +8,8 @@ namespace Piwik\Tests\Integration\Archive; -use Piwik\Archive; -use Piwik\ArchiveProcessor; use Piwik\DataTable; use Piwik\DataTable\Row; -use Piwik\Db; use Piwik\Period; use Piwik\Plugins\SegmentEditor\API; use Piwik\Segment; diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php index b5fad41104..3058797448 100644 --- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php @@ -9,8 +9,6 @@ namespace Piwik\Tests\Integration; use Exception; -use Piwik\Access; -use Piwik\Archive; use Piwik\ArchiveProcessor; use Piwik\ArchiveProcessor\Rules; use Piwik\Common; @@ -21,10 +19,8 @@ use Piwik\DataTable; use Piwik\Date; use Piwik\Db; use Piwik\Db\BatchInsert; -use Piwik\DbHelper; use Piwik\Period; use Piwik\Piwik; -use Piwik\Plugins\SitesManager\API; use Piwik\Segment; use Piwik\SettingsServer; use Piwik\Site; diff --git a/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php b/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php index eed521a1d1..a373b5c362 100644 --- a/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php +++ b/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php @@ -11,7 +11,6 @@ namespace Piwik\Tests\Integration\ArchiveProcessor; use Piwik\ArchiveProcessor\LoaderLock; use Piwik\Common; -use Piwik\Db; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; class LoaderLockTest extends IntegrationTestCase diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php index 802c3194a1..d4a0178122 100644 --- a/tests/PHPUnit/Integration/ArchiveWebTest.php +++ b/tests/PHPUnit/Integration/ArchiveWebTest.php @@ -10,9 +10,7 @@ namespace Piwik\Tests\Integration; use Piwik\Option; use Piwik\Http; use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\ManySitesImportedLogs; use Piwik\Tests\Framework\Fixture; -use Exception; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php b/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php index f14708ba49..3cb43fe326 100644 --- a/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php +++ b/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php @@ -37,6 +37,9 @@ class PluginUmdAssetFetcherTest extends UnitTestCase 'TestPlugin5' => ['TestPlugin1', 'TestPlugin3'], ]; + private $oldPluginDirsEnvVar; + private $oldPluginDirsGlobal; + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); @@ -84,6 +87,9 @@ class PluginUmdAssetFetcherTest extends UnitTestCase public function setUp(): void { + $this->oldPluginDirsEnvVar = getenv('MATOMO_PLUGIN_DIRS'); + $this->oldPluginDirsGlobal = $GLOBALS['MATOMO_PLUGIN_DIRS']; + parent::setUp(); clearstatcache(true); @@ -100,8 +106,8 @@ class PluginUmdAssetFetcherTest extends UnitTestCase clearstatcache(true); - putenv("MATOMO_PLUGIN_DIRS="); - unset($GLOBALS['MATOMO_PLUGIN_DIRS']); + putenv("MATOMO_PLUGIN_DIRS={$this->oldPluginDirsEnvVar}"); + $GLOBALS['MATOMO_PLUGIN_DIRS'] = $this->oldPluginDirsGlobal; Manager::initPluginDirectories(); } diff --git a/tests/PHPUnit/Integration/AssetManagerTest.php b/tests/PHPUnit/Integration/AssetManagerTest.php index 360d4352aa..b08bcdc9a5 100644 --- a/tests/PHPUnit/Integration/AssetManagerTest.php +++ b/tests/PHPUnit/Integration/AssetManagerTest.php @@ -13,6 +13,7 @@ use Piwik\AssetManager\UIAsset; use Piwik\AssetManager; use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher; use Piwik\Config; +use Piwik\Filesystem; use Piwik\Plugin; use Piwik\Plugin\Manager; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; @@ -28,6 +29,8 @@ class AssetManagerTest extends IntegrationTestCase { // todo Theme->rewriteAssetPathIfOverridesFound is not tested + const TEST_PLUGINS_DIR = __DIR__ . '/plugins'; + const ASSET_MANAGER_TEST_DIR = 'tests/PHPUnit/Unit/AssetManager/'; const FIRST_CACHE_BUSTER_JS = 'first-cache-buster-js'; @@ -40,6 +43,11 @@ class AssetManagerTest extends IntegrationTestCase const NON_CORE_PLUGIN_NAME = 'MockNonCorePlugin'; const CORE_THEME_PLUGIN_NAME = 'CoreThemePlugin'; const NON_CORE_THEME_PLUGIN_NAME = 'NonCoreThemePlugin'; + const CORE_PLUGIN_WITH_ONLY_UMD_NAME = 'MockCorePluginOnlyUmd'; + const NON_CORE_PLUGIN_WITH_ONLY_UMD_NAME = 'MockNonCorePluginOnlyUmd'; + + private $oldPluginDirsEnvVar; + private $oldPluginDirsGlobal; /** * @var AssetManager @@ -65,6 +73,8 @@ class AssetManagerTest extends IntegrationTestCase { parent::setUp(); + $this->setUpPluginsDirectory(); + $this->setUpConfig(); $this->activateMergedAssets(); @@ -82,6 +92,8 @@ class AssetManagerTest extends IntegrationTestCase public function tearDown(): void { + $this->removePluginsDirectory(); + if ($this->assetManager !== null) { $this->assetManager->removeMergedAssets(); } @@ -96,6 +108,62 @@ class AssetManagerTest extends IntegrationTestCase ); } + private function setUpPluginsDirectory() + { + $this->oldPluginDirsEnvVar = getenv('MATOMO_PLUGIN_DIRS'); + $this->oldPluginDirsGlobal = $GLOBALS['MATOMO_PLUGIN_DIRS']; + + parent::setUpBeforeClass(); + + $pluginsWithUmds = [ + self::CORE_PLUGIN_NAME, + self::NON_CORE_PLUGIN_NAME, + self::CORE_PLUGIN_WITH_ONLY_UMD_NAME, + self::NON_CORE_PLUGIN_WITH_ONLY_UMD_NAME, + ]; + + // setup plugin test directories + Filesystem::unlinkRecursive(self::TEST_PLUGINS_DIR, true); + foreach ($pluginsWithUmds as $pluginName) { + $vueDir = self::TEST_PLUGINS_DIR . '/' . $pluginName . '/vue/dist'; + $vueSrcDir = self::TEST_PLUGINS_DIR . '/' . $pluginName . '/vue/src'; + + Filesystem::mkdir($vueDir); + Filesystem::mkdir($vueSrcDir); + + $umdDependencies = [ + "dependsOn" => [], + ]; + $umdDependenciesPath = $vueDir . '/umd.metadata.json'; + + file_put_contents($umdDependenciesPath, json_encode($umdDependencies)); + + $umdPath = $vueDir . '/' . $pluginName . '.umd.min.js'; + $umdContent = "// begin $pluginName\n"; + $umdContent .= "// end $pluginName\n"; + + file_put_contents($umdPath, $umdContent); + } + + clearstatcache(true); + + putenv("MATOMO_PLUGIN_DIRS=" . self::TEST_PLUGINS_DIR . ';' + . str_replace(PIWIK_INCLUDE_PATH, '', self::TEST_PLUGINS_DIR)); + unset($GLOBALS['MATOMO_PLUGIN_DIRS']); + Manager::initPluginDirectories(); + } + + private function removePluginsDirectory() + { + Filesystem::unlinkRecursive(self::TEST_PLUGINS_DIR, true); + + clearstatcache(true); + + putenv("MATOMO_PLUGIN_DIRS={$this->oldPluginDirsEnvVar}"); + $GLOBALS['MATOMO_PLUGIN_DIRS'] = $this->oldPluginDirsGlobal; + Manager::initPluginDirectories(); + } + private function activateMergedAssets() { Config::getInstance()->Development['disable_merged_assets'] = 0; @@ -142,7 +210,9 @@ class AssetManagerTest extends IntegrationTestCase $this->getNonCoreTheme()->getPlugin(), $this->getCorePlugin(), $this->getCorePluginWithoutUIAssets(), - $this->getNonCorePlugin() + $this->getNonCorePlugin(), + $this->getCorePluginWithOnlyUmd(), + $this->getNonCorePluginWithOnlyUmd(), ) ); @@ -179,6 +249,16 @@ class AssetManagerTest extends IntegrationTestCase return $corePlugin; } + private function getCorePluginWithOnlyUmd() + { + return new PluginMock(self::CORE_PLUGIN_WITH_ONLY_UMD_NAME); + } + + private function getNonCorePluginWithOnlyUmd() + { + return new PluginMock(self::NON_CORE_PLUGIN_WITH_ONLY_UMD_NAME); + } + /** * @return Plugin */ @@ -279,6 +359,15 @@ class AssetManagerTest extends IntegrationTestCase $this->mergedAsset = $this->assetManager->getMergedNonCoreJavaScript(); } + private function triggerGetMergedChunkJavaScript() + { + $chunks = []; + for ($i = 0; $i < AssetManager\UIAssetFetcher\PluginUmdAssetFetcher::getDefaultChunkCount(); ++$i) { + $chunks[] = $this->assetManager->getMergedJavaScriptChunk($i); + } + return $chunks; + } + private function triggerGetMergedStylesheet() { $this->mergedAsset = $this->assetManager->getMergedStylesheet(); @@ -413,7 +502,7 @@ class AssetManagerTest extends IntegrationTestCase } /** - * @return UIAsset[] + * @return array */ private function generateAllMergedAssets() { @@ -430,7 +519,13 @@ class AssetManagerTest extends IntegrationTestCase $this->assertTrue($coreJsAsset->exists()); $this->assertTrue($nonCoreJsAsset->exists()); - return array($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset); + $chunks = $this->triggerGetMergedChunkJavaScript(); + $this->assertCount(3, $chunks); + $this->assertTrue($chunks[0]->exists()); + $this->assertTrue($chunks[1]->exists()); + $this->assertTrue($chunks[2]->exists()); + + return array($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset, $chunks); } /** @@ -611,7 +706,11 @@ class AssetManagerTest extends IntegrationTestCase '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleObject.js"></script>' . "\n" . '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleArray.js"></script>' . "\n" . '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleComments.js"></script>' . "\n" . - '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleAlert.js"></script>' . "\n"; + '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleAlert.js"></script>' . "\n" . + '<script type="text/javascript" src="tests/PHPUnit/Integration/plugins/MockCorePlugin/vue/dist/MockCorePlugin.umd.min.js"></script>' . "\n" . + '<script type="text/javascript" src="tests/PHPUnit/Integration/plugins/MockNonCorePlugin/vue/dist/MockNonCorePlugin.umd.min.js"></script>' . "\n" . + '<script type="text/javascript" src="tests/PHPUnit/Integration/plugins/MockCorePluginOnlyUmd/vue/dist/MockCorePluginOnlyUmd.umd.min.js"></script>' . "\n" . + '<script type="text/javascript" src="tests/PHPUnit/Integration/plugins/MockNonCorePluginOnlyUmd/vue/dist/MockNonCorePluginOnlyUmd.umd.min.js"></script>' . "\n"; $this->assertEquals($expectedJsInclusionDirective, $this->assetManager->getJsInclusionDirective()); } @@ -624,7 +723,10 @@ class AssetManagerTest extends IntegrationTestCase $expectedJsInclusionDirective = $this->getJsTranslationScript() . '<script type="text/javascript" src="index.php?module=Proxy&action=getCoreJs"></script>' . "\n" . - '<script type="text/javascript" src="index.php?module=Proxy&action=getNonCoreJs"></script>' . "\n"; + '<script type="text/javascript" src="index.php?module=Proxy&action=getNonCoreJs"></script>' . "\n" . + '<script type="text/javascript" src="index.php?module=Proxy&action=getUmdJs&chunk=0" defer></script>' . "\n" . + '<script type="text/javascript" src="index.php?module=Proxy&action=getUmdJs&chunk=1" defer></script>' . "\n" . + '<script type="text/javascript" src="index.php?module=Proxy&action=getUmdJs&chunk=2" defer></script>' . "\n"; $this->assertEquals($expectedJsInclusionDirective, $this->assetManager->getJsInclusionDirective()); } @@ -656,13 +758,18 @@ class AssetManagerTest extends IntegrationTestCase */ public function test_removeMergedAssets() { - list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset) = $this->generateAllMergedAssets(); + list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset, $chunks) = $this->generateAllMergedAssets(); $this->assetManager->removeMergedAssets(); $this->assertFalse($stylesheetAsset->exists()); $this->assertFalse($coreJsAsset->exists()); $this->assertFalse($nonCoreJsAsset->exists()); + + $this->assertCount(3, $chunks); + $this->assertFalse($chunks[0]->exists()); + $this->assertFalse($chunks[1]->exists()); + $this->assertFalse($chunks[2]->exists()); } /** @@ -670,13 +777,18 @@ class AssetManagerTest extends IntegrationTestCase */ public function test_removeMergedAssets_PluginNameSpecified_PluginWithoutAssets() { - list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset) = $this->generateAllMergedAssets(); + list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset, $chunks) = $this->generateAllMergedAssets(); $this->assetManager->removeMergedAssets(self::CORE_PLUGIN_WITHOUT_ASSETS_NAME); $this->assertFalse($stylesheetAsset->exists()); $this->assertTrue($coreJsAsset->exists()); $this->assertTrue($nonCoreJsAsset->exists()); + + $this->assertCount(3, $chunks); + $this->assertTrue($chunks[0]->exists()); + $this->assertTrue($chunks[1]->exists()); + $this->assertTrue($chunks[2]->exists()); } /** @@ -684,13 +796,18 @@ class AssetManagerTest extends IntegrationTestCase */ public function test_removeMergedAssets_PluginNameSpecified_CorePlugin() { - list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset) = $this->generateAllMergedAssets(); + list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset, $chunks) = $this->generateAllMergedAssets(); $this->assetManager->removeMergedAssets(self::CORE_PLUGIN_NAME); $this->assertFalse($stylesheetAsset->exists()); $this->assertFalse($coreJsAsset->exists()); $this->assertTrue($nonCoreJsAsset->exists()); + + $this->assertCount(3, $chunks); + $this->assertFalse($chunks[0]->exists()); + $this->assertTrue($chunks[1]->exists()); + $this->assertTrue($chunks[2]->exists()); } /** @@ -698,12 +815,17 @@ class AssetManagerTest extends IntegrationTestCase */ public function test_removeMergedAssets_PluginNameSpecified_NonCoreThemeWithAssets() { - list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset) = $this->generateAllMergedAssets(); + list($stylesheetAsset, $coreJsAsset, $nonCoreJsAsset, $chunks) = $this->generateAllMergedAssets(); $this->assetManager->removeMergedAssets(self::NON_CORE_THEME_PLUGIN_NAME); $this->assertFalse($stylesheetAsset->exists()); $this->assertTrue($coreJsAsset->exists()); $this->assertFalse($nonCoreJsAsset->exists()); + + $this->assertCount(3, $chunks); + $this->assertTrue($chunks[0]->exists()); + $this->assertTrue($chunks[1]->exists()); + $this->assertTrue($chunks[2]->exists()); } }
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/Columns/UpdaterTest.php b/tests/PHPUnit/Integration/Columns/UpdaterTest.php index 2b7e982cfd..a23e34c752 100644 --- a/tests/PHPUnit/Integration/Columns/UpdaterTest.php +++ b/tests/PHPUnit/Integration/Columns/UpdaterTest.php @@ -15,7 +15,6 @@ use Piwik\Plugin\Dimension\ActionDimension; use Piwik\Plugin\Dimension\ConversionDimension; use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; -use Piwik\Updater; use Piwik\Updater\Migration; // NOTE: we can't use PHPUnit mock framework since we have to set columnName/columnType. reflection will set it, but diff --git a/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php b/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php index cd5ac86bdf..52261c4db1 100644 --- a/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php +++ b/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php @@ -16,7 +16,7 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase; class MysqlLockBackendTest extends IntegrationTestCase { /** - * @var MySQLLockBackend + * @var MySqlLockBackend */ private $backend; private $key = 'testKeyValueKey'; @@ -43,7 +43,7 @@ class MysqlLockBackendTest extends IntegrationTestCase protected function createMysqlBackend() { - return new MySQLLockBackend(); + return new MySqlLockBackend(); } public function test_deleteIfKeyHasValue_ShouldNotWork_IfKeyDoesNotExist() diff --git a/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php b/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php index ac88ba9b8e..e1ab674d81 100644 --- a/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php +++ b/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php @@ -27,7 +27,6 @@ use Piwik\Date; use Piwik\Db; use Piwik\Piwik; use Piwik\Plugins\SegmentEditor\API; -use Piwik\Plugins\SitesManager\SitesManager; use Piwik\Segment; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php b/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php index d178f9661c..efd5c12797 100644 --- a/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php +++ b/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php @@ -9,11 +9,8 @@ namespace Piwik\Tests\Integration\CronArchive; use Piwik\Config; -use Piwik\CronArchive; use Piwik\Date; use Piwik\CronArchive\SegmentArchiving; -use Piwik\Option; -use Piwik\Site; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php b/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php index 2752244c04..ffd62b4ef0 100644 --- a/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php +++ b/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php @@ -16,7 +16,6 @@ use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\Mock\FakeLogger; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Plugins\SegmentEditor\API as SegmentAPI; -use Piwik\Version; /** * @group Archiver diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php index c149ef918d..cf32511fd9 100644 --- a/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php +++ b/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php @@ -10,9 +10,7 @@ namespace Piwik\Tests\Integration\DataAccess; -use Piwik\ArchiveProcessor\Parameters; use Piwik\ArchiveProcessor\Rules; -use Piwik\Config; use Piwik\DataAccess\ArchiveSelector; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Date; diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php index 1e4d77c80d..79ca3e286c 100644 --- a/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php +++ b/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php @@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\DataAccess; use Piwik\Access; use Piwik\ArchiveProcessor\Parameters; -use Piwik\ArchiveProcessor\Rules; use Piwik\Common; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\DataAccess\ArchiveWriter; @@ -18,7 +17,6 @@ use Piwik\Date; use Piwik\Db; use Piwik\Period\Day; use Piwik\Period\Factory as PeriodFactory; -use Piwik\Plugins\SegmentEditor\API; use Piwik\Segment; use Piwik\Sequence; use Piwik\Site; diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php index a8311bdd09..5a53b5f92e 100644 --- a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php +++ b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php @@ -13,7 +13,6 @@ use Piwik\Config; use Piwik\Common; use Piwik\DataAccess\LogAggregator; use Piwik\Date; -use Piwik\Db; use Piwik\Period; use Piwik\Segment; use Piwik\Site; diff --git a/tests/PHPUnit/Integration/EmailValidatorTest.php b/tests/PHPUnit/Integration/EmailValidatorTest.php index bb34778aff..3ee1b3aa92 100644 --- a/tests/PHPUnit/Integration/EmailValidatorTest.php +++ b/tests/PHPUnit/Integration/EmailValidatorTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration; -use Piwik\Http; use Piwik\Piwik; /** diff --git a/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php b/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php index 45da6a6aff..1907a6c81f 100644 --- a/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php +++ b/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php @@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Measurable; use Piwik\Settings\FieldConfig; use Piwik\Settings\Measurable\MeasurableSetting; -use Piwik\Settings\Storage\Storage; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\Mock\FakeAccess; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php b/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php index 5ee12b23cd..1110ebba04 100644 --- a/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php +++ b/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php @@ -8,8 +8,6 @@ namespace Piwik\Tests\Integration\Measurable; -use Piwik\Access; -use Piwik\Db; use Piwik\Plugin; use Piwik\Plugins\WebsiteMeasurable\Type as WebsiteType; use Piwik\Plugins\WebsiteMeasurable\MeasurableSettings; diff --git a/tests/PHPUnit/Integration/Plugin/CategoriesTest.php b/tests/PHPUnit/Integration/Plugin/CategoriesTest.php index b550fcd2f5..f12ded6f57 100644 --- a/tests/PHPUnit/Integration/Plugin/CategoriesTest.php +++ b/tests/PHPUnit/Integration/Plugin/CategoriesTest.php @@ -12,7 +12,6 @@ use Piwik\Category\Category; use Piwik\Category\Subcategory; use Piwik\Container\StaticContainer; use Piwik\Plugin\Categories; -use Piwik\Settings\Storage; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Plugin/ManagerTest.php b/tests/PHPUnit/Integration/Plugin/ManagerTest.php index 8dadd20646..d2bbcef0b1 100644 --- a/tests/PHPUnit/Integration/Plugin/ManagerTest.php +++ b/tests/PHPUnit/Integration/Plugin/ManagerTest.php @@ -10,13 +10,10 @@ namespace Piwik\Tests\Integration\Plugin; use Piwik\Config; use Piwik\Container\StaticContainer; -use Piwik\Db; use Piwik\Http\ControllerResolver; use Piwik\Plugin; -use Piwik\Settings\Storage; use Piwik\Cache as PiwikCache; use Piwik\Tests\Integration\Settings\IntegrationTestCase; -use Piwik\Widget\WidgetsList; /** * @group Plugin diff --git a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php index afdecc243d..af123afef0 100644 --- a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php +++ b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php @@ -8,12 +8,8 @@ namespace Piwik\Tests\Integration\Plugin; -use Piwik\Config; use Piwik\Container\StaticContainer; -use Piwik\Db; use Piwik\Plugin; -use Piwik\Settings\Storage; -use Piwik\Cache as PiwikCache; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\UpdateCheck\ReleaseChannel; diff --git a/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php b/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php index 2915033e38..7ee397823a 100644 --- a/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php +++ b/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php @@ -9,13 +9,11 @@ namespace Piwik\Tests\Integration\Plugin; use Piwik\Container\StaticContainer; -use Piwik\Db; use Piwik\Plugin; use Piwik\Plugin\SettingsProvider; use Piwik\Settings\Measurable\MeasurableSettings; use Piwik\Settings\Plugin\SystemSettings; use Piwik\Settings\Plugin\UserSettings; -use Piwik\Settings\Storage; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php b/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php index 46993ab135..88c16ae34b 100644 --- a/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php +++ b/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php @@ -9,9 +9,7 @@ namespace Piwik\Tests\Integration\Plugin; use Piwik\Container\StaticContainer; -use Piwik\Db; use Piwik\Plugin\WidgetsProvider; -use Piwik\Settings\Storage; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Widget\WidgetConfig; diff --git a/tests/PHPUnit/Integration/PluginTest.php b/tests/PHPUnit/Integration/PluginTest.php index 7ab46a8945..430cde0719 100644 --- a/tests/PHPUnit/Integration/PluginTest.php +++ b/tests/PHPUnit/Integration/PluginTest.php @@ -9,11 +9,9 @@ namespace PHPUnit\Integration; -use Piwik\Common; use Piwik\CronArchive; use Piwik\CronArchive\ReArchiveList; use Piwik\Date; -use Piwik\Db; use Piwik\Option; use Piwik\Plugin; use Piwik\Tests\Framework\Fixture; diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 8b875b922d..f11f977ed6 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -15,8 +15,6 @@ use Piwik\AssetManager\UIAssetFetcher; use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Filesystem; -use Piwik\Http; -use Piwik\Plugin; use Piwik\Plugin\Manager; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tracker; @@ -1099,7 +1097,7 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase $countFileChecked++; } - $this->assertGreaterThan(20, $countFileChecked, "expected to test at least 20 files, but tested only " . $countFileChecked); + $this->assertGreaterThan(1, $countFileChecked, "expected to test at least one file, but tested only " . $countFileChecked); if (!empty($errors)) { throw new Exception(implode(",\n\n ", $errors)); diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php index 9e9662aefe..eab2877df8 100644 --- a/tests/PHPUnit/Integration/SegmentTest.php +++ b/tests/PHPUnit/Integration/SegmentTest.php @@ -15,7 +15,6 @@ use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Db; -use Piwik\Http; use Piwik\Plugins\SegmentEditor\API; use Piwik\Segment; use Piwik\Tests\Framework\Fixture; diff --git a/tests/PHPUnit/Integration/SequenceTest.php b/tests/PHPUnit/Integration/SequenceTest.php index d7e84ffaab..2db27a093e 100644 --- a/tests/PHPUnit/Integration/SequenceTest.php +++ b/tests/PHPUnit/Integration/SequenceTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration; -use Piwik\Db; use Piwik\Sequence; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/SessionTest.php b/tests/PHPUnit/Integration/SessionTest.php index ae4ff2ecfd..60f0e4c0f6 100644 --- a/tests/PHPUnit/Integration/SessionTest.php +++ b/tests/PHPUnit/Integration/SessionTest.php @@ -9,7 +9,6 @@ namespace Piwik\Tests\Integration; use Piwik\Http; -use Piwik\Piwik; use Piwik\Session; use Piwik\Tests\Framework\Fixture; diff --git a/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php b/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php index ad4272deb1..ce0e15ca0d 100644 --- a/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php +++ b/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php @@ -11,7 +11,6 @@ namespace Piwik\Tests\Integration\Settings; use PHPUnit\Framework\Constraint\IsType; use Piwik\Db; use Piwik\Settings\Setting; -use Piwik\Settings\Storage; use Piwik\Tests\Framework\Mock\FakeAccess; use Piwik\Tests\Framework\Mock\Settings\FakeSystemSettings; diff --git a/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php b/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php index b057162632..beae8b033b 100644 --- a/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php +++ b/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php @@ -8,11 +8,9 @@ namespace Piwik\Tests\Integration\Settings\Plugin; -use Piwik\Config; use Piwik\Db; use Piwik\Settings\FieldConfig; use Piwik\Settings\Measurable\MeasurableProperty; -use Piwik\Settings\Measurable\MeasurableSetting; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\Mock\Settings\FakeMeasurableSettings; use Piwik\Tests\Integration\Settings\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php b/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php index 7bc95322a2..c7bdbcc6b4 100644 --- a/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php +++ b/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Plugin; -use Piwik\Config; use Piwik\Db; use Piwik\Settings\FieldConfig; use Piwik\Settings\Measurable\MeasurableSetting; diff --git a/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php b/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php index 40769e641a..209e927059 100644 --- a/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php +++ b/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php @@ -9,10 +9,8 @@ namespace Piwik\Tests\Integration\Settings\Plugin; use Piwik\Config; -use Piwik\Db; use Piwik\Settings\FieldConfig; use Piwik\Settings\Plugin\SystemConfigSetting; -use Piwik\Settings\Plugin\SystemSetting; use Piwik\Tests\Integration\Settings\IntegrationTestCase; /** diff --git a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php index d3580d9e73..6abc8ffc92 100644 --- a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php +++ b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php @@ -9,7 +9,6 @@ namespace Piwik\Tests\Integration\Settings\Plugin; use Piwik\Config; -use Piwik\Db; use Piwik\Settings\FieldConfig; use Piwik\Settings\Plugin\SystemSetting; use Piwik\Tests\Integration\Settings\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php index c7e89c9b6c..80a88c4eec 100644 --- a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php +++ b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Plugin; -use Piwik\Db; use Piwik\Settings\Plugin\SystemSetting; use Piwik\Settings\Plugin\SystemSettings; use Piwik\Tests\Integration\Settings\BaseSettingsTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php index 6732d12eea..120ade8833 100644 --- a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php +++ b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php @@ -11,9 +11,7 @@ namespace Piwik\Tests\Integration\Settings\Plugin; use Piwik\Db; use Piwik\Settings\FieldConfig; use Piwik\Settings\Plugin\UserSetting; -use Piwik\Settings\Storage\Storage; use Piwik\Tests\Framework\Mock\FakeAccess; -use Piwik\Tests\Framework\Mock\Settings\FakeBackend; use Piwik\Tests\Framework\Mock\Settings\FakeUserSettings; use Piwik\Tests\Integration\Settings\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php index 00d5e455b0..fcb3eec238 100644 --- a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php +++ b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Plugin; -use Piwik\Db; use Piwik\Settings\Plugin\UserSetting; use Piwik\Settings\Plugin\UserSettings; use Piwik\Tests\Framework\Mock\Settings\FakeUserSettings; diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php index 1d557684f5..add4765bbc 100644 --- a/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php +++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Storage\Backend; -use Piwik\Db; use Piwik\Settings\Storage\Backend\MeasurableSettingsTable; use Piwik\Settings\Storage\Backend\Config; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php index e0b5edcef3..27c33d4de8 100644 --- a/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php +++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php @@ -8,8 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Storage\Backend; -use Piwik\Config; -use Piwik\Db; use Piwik\Settings\Storage\Backend\MeasurableSettingsTable; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php index 00617f3771..5048f75c47 100644 --- a/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php +++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php @@ -8,8 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Storage\Backend; -use Piwik\Config; -use Piwik\Db; use Piwik\Settings\Storage\Backend\PluginSettingsTable; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php index 8c077a2869..ff462b812d 100644 --- a/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php +++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php @@ -8,8 +8,6 @@ namespace Piwik\Tests\Integration\Settings\Storage\Backend; -use Piwik\Config; -use Piwik\Db; use Piwik\Settings\Storage\Backend\SitesTable; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/SupportedBrowserTest.php b/tests/PHPUnit/Integration/SupportedBrowserTest.php index 631df4f111..a8ecc4aa23 100644 --- a/tests/PHPUnit/Integration/SupportedBrowserTest.php +++ b/tests/PHPUnit/Integration/SupportedBrowserTest.php @@ -7,12 +7,7 @@ */ namespace Piwik\Tests\Integration; -use Piwik\Http; -use Piwik\Site; -use Piwik\Piwik; use Piwik\SupportedBrowser; -use Piwik\Tests\Framework\Fixture; -use Piwik\Plugins\SitesManager\API; use Piwik\Exception\NotSupportedBrowserException; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; diff --git a/tests/PHPUnit/Integration/Tracker/DbTest.php b/tests/PHPUnit/Integration/Tracker/DbTest.php index 9260abd4a2..f4a63d7352 100644 --- a/tests/PHPUnit/Integration/Tracker/DbTest.php +++ b/tests/PHPUnit/Integration/Tracker/DbTest.php @@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Tracker; use Piwik\Common; use Piwik\Config; -use Piwik\Db; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Timer; diff --git a/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php b/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php index 687595f6d2..1e63e3cc7e 100644 --- a/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php +++ b/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php @@ -8,16 +8,8 @@ namespace Piwik\Tests\Integration\Tracker; -use Piwik\Config; use Piwik\Date; -use Piwik\Plugins\SitesManager\API; -use Piwik\Tests\Framework\Mock\FakeAccess; -use Piwik\Tracker\Action; use Piwik\Tracker\FingerprintSalt; -use Piwik\Tracker\PageUrl; -use Piwik\Tracker\Request; -use Piwik\Translate; -use Piwik\Plugin\Manager as PluginManager; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** diff --git a/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php b/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php index d3a5d98b94..0a3046f24e 100644 --- a/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php +++ b/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Tracker\Handler; -use Piwik\EventDispatcher; use Piwik\Piwik; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Tracker; diff --git a/tests/PHPUnit/Integration/Tracker/RequestSetTest.php b/tests/PHPUnit/Integration/Tracker/RequestSetTest.php index b0448e45dc..d0f7010281 100644 --- a/tests/PHPUnit/Integration/Tracker/RequestSetTest.php +++ b/tests/PHPUnit/Integration/Tracker/RequestSetTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Tracker; -use Piwik\EventDispatcher; use Piwik\Piwik; use Piwik\Tests\Framework\Fixture; use Piwik\Tracker\Request; diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index be93db0811..be50c3e5f2 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Tracker; use Piwik\Config; use Piwik\Piwik; -use Piwik\Plugins\SitesManager\SitesManager; use Piwik\Tests\Framework\Mock\Plugin\Manager; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Tracker\TrackerCodeGenerator; diff --git a/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php b/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php index b9b8c1c15f..336854da3e 100644 --- a/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php +++ b/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php @@ -8,7 +8,6 @@ namespace Piwik\Tests\Integration\Tracker\Visit; -use Piwik\EventDispatcher; use Piwik\Piwik; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Tracker; diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php index 8ca50e386a..e9251249d7 100644 --- a/tests/PHPUnit/Integration/Tracker/VisitTest.php +++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php @@ -8,10 +8,8 @@ namespace Piwik\Tests\Integration\Tracker; -use Piwik\Cache; use Piwik\Container\StaticContainer; use Piwik\Date; -use Matomo\Network\IPUtils; use Piwik\Plugin\Manager; use Piwik\Plugins\SitesManager\API; use Piwik\Tests\Framework\Fixture; diff --git a/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php b/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php index 20a45a1a4d..f456dcfcff 100644 --- a/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php +++ b/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php @@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Tracker; use Matomo\Network\IP; use Piwik\Common; -use Piwik\Config; use Piwik\Date; use Piwik\EventDispatcher; use Piwik\Tests\Framework\Fixture; diff --git a/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php b/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php index f817b1f1a0..9bd6b4fa7f 100644 --- a/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php +++ b/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php @@ -9,10 +9,7 @@ namespace Piwik\Tests\Integration\Updater\Migration\Db; use Piwik\Common; -use Piwik\Config; -use Piwik\Db; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; -use Piwik\Updater\Migration\Config\Set; use Piwik\Updater\Migration\Db\AddColumn; use Piwik\Updater\Migration\Db\AddColumns; use Piwik\Updater\Migration\Db\AddIndex; |