diff options
34 files changed, 44 insertions, 44 deletions
diff --git a/core/AssetManager.php b/core/AssetManager.php index 8c7d2adfa7..812a386c52 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -253,7 +253,7 @@ class AssetManager extends Singleton */ public function getAssetDirectory() { - $mergedFileDirectory = StaticContainer::getContainer()->get('path.tmp') . '/assets'; + $mergedFileDirectory = StaticContainer::get('path.tmp') . '/assets'; if (!is_dir($mergedFileDirectory)) { Filesystem::mkdir($mergedFileDirectory); diff --git a/core/Cache.php b/core/Cache.php index b90be8d27b..3036d05006 100644 --- a/core/Cache.php +++ b/core/Cache.php @@ -24,7 +24,7 @@ class Cache */ public static function getLazyCache() { - return StaticContainer::getContainer()->get('Piwik\Cache\Lazy'); + return StaticContainer::get('Piwik\Cache\Lazy'); } /** @@ -35,7 +35,7 @@ class Cache */ public static function getTransientCache() { - return StaticContainer::getContainer()->get('Piwik\Cache\Transient'); + return StaticContainer::get('Piwik\Cache\Transient'); } /** @@ -53,7 +53,7 @@ class Cache */ public static function getEagerCache() { - return StaticContainer::getContainer()->get('Piwik\Cache\Eager'); + return StaticContainer::get('Piwik\Cache\Eager'); } public static function flushAll() @@ -84,7 +84,7 @@ class Cache switch ($type) { case 'file': - $options = array('directory' => StaticContainer::getContainer()->get('path.cache')); + $options = array('directory' => StaticContainer::get('path.cache')); break; case 'chained': diff --git a/core/CliMulti.php b/core/CliMulti.php index 64c7c2aaa9..a83920247d 100644 --- a/core/CliMulti.php +++ b/core/CliMulti.php @@ -229,7 +229,7 @@ class CliMulti { public static function getTmpPath() { - return StaticContainer::getContainer()->get('path.tmp') . '/climulti'; + return StaticContainer::get('path.tmp') . '/climulti'; } private function executeAsyncCli($url, Output $output, $cmdId) diff --git a/core/Console.php b/core/Console.php index e248ed4770..de51756f39 100644 --- a/core/Console.php +++ b/core/Console.php @@ -156,7 +156,7 @@ class Console extends Application private function initLoggerOutput(OutputInterface $output) { /** @var ConsoleHandler $consoleLogHandler */ - $consoleLogHandler = StaticContainer::getContainer()->get('Symfony\Bridge\Monolog\Handler\ConsoleHandler'); + $consoleLogHandler = StaticContainer::get('Symfony\Bridge\Monolog\Handler\ConsoleHandler'); $consoleLogHandler->setOutput($output); } diff --git a/core/Date.php b/core/Date.php index 4d89d2c7bf..909f7adb0e 100644 --- a/core/Date.php +++ b/core/Date.php @@ -609,7 +609,7 @@ class Date */ public function getLocalized($template) { - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $day = $this->toString('j'); $dayOfWeek = $this->toString('N'); $monthOfYear = $this->toString('n'); diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php index bb620d692e..f2b322ad2c 100644 --- a/core/Db/BatchInsert.php +++ b/core/Db/BatchInsert.php @@ -57,7 +57,7 @@ class BatchInsert */ public static function tableInsertBatch($tableName, $fields, $values, $throwException = false) { - $filePath = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $tableName . '-' . Common::generateUniqId() . '.csv'; + $filePath = StaticContainer::get('path.tmp') . '/assets/' . $tableName . '-' . Common::generateUniqId() . '.csv'; $loadDataInfileEnabled = Config::getInstance()->General['enable_load_data_infile']; diff --git a/core/Filesystem.php b/core/Filesystem.php index 4355083fa2..ea138dbfb0 100644 --- a/core/Filesystem.php +++ b/core/Filesystem.php @@ -416,7 +416,7 @@ class Filesystem */ private static function getChmodForPath($path) { - $pathIsTmp = StaticContainer::getContainer()->get('path.tmp'); + $pathIsTmp = StaticContainer::get('path.tmp'); if (strpos($path, $pathIsTmp) === 0) { // tmp/* folder return 0750; diff --git a/core/FrontController.php b/core/FrontController.php index 601e11e677..d4f290e721 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -314,7 +314,7 @@ class FrontController extends Singleton $exceptionToThrow = self::createConfigObject(); - $tmpPath = StaticContainer::getContainer()->get('path.tmp'); + $tmpPath = StaticContainer::get('path.tmp'); $directoriesToCheck = array( $tmpPath, diff --git a/core/Log.php b/core/Log.php index afbe2c46f5..260e57fea6 100644 --- a/core/Log.php +++ b/core/Log.php @@ -91,7 +91,7 @@ class Log extends Singleton public static function getInstance() { if (self::$instance === null) { - self::$instance = StaticContainer::getContainer()->get(__CLASS__); + self::$instance = StaticContainer::get(__CLASS__); } return self::$instance; } diff --git a/core/Piwik.php b/core/Piwik.php index 2227eca2e4..7eb70c8ec8 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -742,7 +742,7 @@ class Piwik public static function translate($translationId, $args = array(), $language = null) { /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); return $translator->translate($translationId, $args, $language); } diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 675bc63f0f..3d793bf0c1 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -570,7 +570,7 @@ class Manager extends Singleton public function loadAllPluginsAndGetTheirInfo() { /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $plugins = array(); @@ -1299,7 +1299,7 @@ class Manager extends Singleton public function loadPluginTranslations() { /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); foreach ($this->getAllPluginsNames() as $pluginName) { $translator->addDirectory(self::getPluginsDirectory() . $pluginName . '/lang'); } diff --git a/core/Profiler.php b/core/Profiler.php index cb68432725..b6cbfb67dd 100644 --- a/core/Profiler.php +++ b/core/Profiler.php @@ -338,6 +338,6 @@ class Profiler */ private static function getPathToXHProfRunIds() { - return StaticContainer::getContainer()->get('path.tmp') . '/cache/tests-xhprof-runs'; + return StaticContainer::get('path.tmp') . '/cache/tests-xhprof-runs'; } } diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index 5486d5cd21..7d7566a428 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -145,7 +145,7 @@ abstract class ReportRenderer extends BaseFactory */ protected static function getOutputPath($filename) { - $outputFilename = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $filename; + $outputFilename = StaticContainer::get('path.tmp') . '/assets/' . $filename; @chmod($outputFilename, 0600); @unlink($outputFilename); diff --git a/core/Translate.php b/core/Translate.php index eb7f19f21d..5b46a2e71a 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -118,7 +118,7 @@ class Translate */ private static function getTranslator() { - return StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + return StaticContainer::get('Piwik\Translation\Translator'); } public static function loadAllTranslations() diff --git a/core/Twig.php b/core/Twig.php index 1127d47a60..221236002a 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -65,7 +65,7 @@ class Twig $chainLoader = new Twig_Loader_Chain($loaders); // Create new Twig Environment and set cache dir - $templatesCompiledPath = StaticContainer::getContainer()->get('path.tmp') . '/templates_c'; + $templatesCompiledPath = StaticContainer::get('path.tmp') . '/templates_c'; $this->twig = new Twig_Environment($chainLoader, array( diff --git a/misc/cron/updatetoken.php b/misc/cron/updatetoken.php index 37513b1a42..3e27babc44 100644 --- a/misc/cron/updatetoken.php +++ b/misc/cron/updatetoken.php @@ -59,7 +59,7 @@ $token = Db::get()->fetchOne("SELECT token_auth WHERE superuser_access = 1 ORDER BY date_registered ASC"); -$filename = StaticContainer::getContainer()->get('path.tmp') . '/cache/token.php'; +$filename = StaticContainer::get('path.tmp') . '/cache/token.php'; $content = "<?php exit; //\t" . $token; file_put_contents($filename, $content); diff --git a/misc/others/cli-script-bootstrap.php b/misc/others/cli-script-bootstrap.php index ac60ae30af..afd3494834 100644 --- a/misc/others/cli-script-bootstrap.php +++ b/misc/others/cli-script-bootstrap.php @@ -30,7 +30,7 @@ define('PIWIK_ENABLE_DISPATCH', false); if (Piwik\Common::isPhpCliMode()) { StaticContainer::setEnvironment('cli'); /** @var ConsoleHandler $consoleLogHandler */ - $consoleLogHandler = StaticContainer::getContainer()->get('Symfony\Bridge\Monolog\Handler\ConsoleHandler'); + $consoleLogHandler = StaticContainer::get('Symfony\Bridge\Monolog\Handler\ConsoleHandler'); $consoleLogHandler->setOutput(new ConsoleOutput()); } diff --git a/plugins/API/API.php b/plugins/API/API.php index 8c19b0a9b8..1f789011b0 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -325,7 +325,7 @@ class API extends \Piwik\Plugin\API { if ($language) { /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $translator->setCurrentLanguage($language); } diff --git a/plugins/CoreConsole/Commands/WatchLog.php b/plugins/CoreConsole/Commands/WatchLog.php index d2b650726c..599c986ea7 100644 --- a/plugins/CoreConsole/Commands/WatchLog.php +++ b/plugins/CoreConsole/Commands/WatchLog.php @@ -26,7 +26,7 @@ class WatchLog extends ConsoleCommand protected function execute(InputInterface $input, OutputInterface $output) { - $path = StaticContainer::getContainer()->get('path.tmp') . '/logs/'; + $path = StaticContainer::get('path.tmp') . '/logs/'; $cmd = sprintf('tail -f %s*.log', $path); $output->writeln('Executing command: ' . $cmd); diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php index e95f7f1d74..ed140d27bc 100644 --- a/plugins/CorePluginsAdmin/PluginInstaller.php +++ b/plugins/CorePluginsAdmin/PluginInstaller.php @@ -32,7 +32,7 @@ class PluginInstaller public function installOrUpdatePluginFromMarketplace() { - $tmpPluginPath = StaticContainer::getContainer()->get('path.tmp') . '/latest/plugins/'; + $tmpPluginPath = StaticContainer::get('path.tmp') . '/latest/plugins/'; $tmpPluginZip = $tmpPluginPath . $this->pluginName . '.zip'; $tmpPluginFolder = $tmpPluginPath . $this->pluginName; @@ -63,7 +63,7 @@ class PluginInstaller public function installOrUpdatePluginFromFile($pathToZip) { - $tmpPluginFolder = StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_DOWNLOAD . $this->pluginName; + $tmpPluginFolder = StaticContainer::get('path.tmp') . self::PATH_TO_DOWNLOAD . $this->pluginName; try { $this->makeSureFoldersAreWritable(); @@ -97,7 +97,7 @@ class PluginInstaller private function makeSureFoldersAreWritable() { Filechecks::dieIfDirectoriesNotWritable(array( - StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_DOWNLOAD, + StaticContainer::get('path.tmp') . self::PATH_TO_DOWNLOAD, self::PATH_TO_EXTRACT )); } diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index bbb0cdc7f2..6a105958fc 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -164,7 +164,7 @@ class Controller extends \Piwik\Plugin\Controller private function oneClick_Download() { - $path = StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION; + $path = StaticContainer::get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION; $this->pathPiwikZip = $path . 'latest.zip'; Filechecks::dieIfDirectoriesNotWritable(array($path)); @@ -177,7 +177,7 @@ class Controller extends \Piwik\Plugin\Controller private function oneClick_Unpack() { - $pathExtracted = StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION; + $pathExtracted = StaticContainer::get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION; $this->pathRootExtractedPiwik = $pathExtracted . 'piwik'; diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index f9bb63c6bf..a758804779 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -229,7 +229,7 @@ abstract class StaticGraph extends BaseFactory */ protected static function getOutputPath($filename) { - $outputFilename = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $filename; + $outputFilename = StaticContainer::get('path.tmp') . '/assets/' . $filename; @chmod($outputFilename, 0600); @unlink($outputFilename); diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php index 04599d9dba..de55506884 100644 --- a/plugins/Installation/SystemCheck.php +++ b/plugins/Installation/SystemCheck.php @@ -149,7 +149,7 @@ class SystemCheck */ protected static function getDirectoriesShouldBeWritable() { - $tmpPath = StaticContainer::getContainer()->get('path.tmp'); + $tmpPath = StaticContainer::get('path.tmp'); $directoriesToCheck = array( $tmpPath, diff --git a/plugins/LanguagesManager/Commands/CompareKeys.php b/plugins/LanguagesManager/Commands/CompareKeys.php index 60364ac39d..fbbe803a6e 100644 --- a/plugins/LanguagesManager/Commands/CompareKeys.php +++ b/plugins/LanguagesManager/Commands/CompareKeys.php @@ -51,7 +51,7 @@ class CompareKeys extends TranslationBase $englishFromOTrance = json_decode(file_get_contents($englishFromOTrance), true); /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $translator->setCurrentLanguage('en'); $availableTranslations = $translator->getAllTranslations(); diff --git a/plugins/LanguagesManager/Commands/FetchFromOTrance.php b/plugins/LanguagesManager/Commands/FetchFromOTrance.php index ae130b0bc6..8802209ced 100644 --- a/plugins/LanguagesManager/Commands/FetchFromOTrance.php +++ b/plugins/LanguagesManager/Commands/FetchFromOTrance.php @@ -25,7 +25,7 @@ class FetchFromOTrance extends TranslationBase protected function configure() { - $path = StaticContainer::getContainer()->get('path.tmp') . self::DOWNLOAD_PATH; + $path = StaticContainer::get('path.tmp') . self::DOWNLOAD_PATH; $this->setName('translations:fetch') ->setDescription('Fetches translations files from oTrance to ' . $path) @@ -171,7 +171,7 @@ class FetchFromOTrance extends TranslationBase public static function getDownloadPath() { - $path = StaticContainer::getContainer()->get('path.tmp') . self::DOWNLOAD_PATH; + $path = StaticContainer::get('path.tmp') . self::DOWNLOAD_PATH; if (!is_dir($path)) { mkdir($path); diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index afd60dc53d..9d81a7655f 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -95,7 +95,7 @@ class LanguagesManager extends \Piwik\Plugin public function initLanguage() { /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $language = Common::getRequestVar('language', '', 'string'); if (empty($language)) { diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php index 6f8baa28a9..00966cbe95 100644 --- a/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php +++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php @@ -211,7 +211,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase public function getTranslationPathTemporaryTestData() { - $tmpPath = StaticContainer::getContainer()->get('path.tmp'); + $tmpPath = StaticContainer::get('path.tmp'); return array( array('de', null, $tmpPath . '/de.json'), diff --git a/plugins/LanguagesManager/TranslationWriter/Writer.php b/plugins/LanguagesManager/TranslationWriter/Writer.php index a4f0f06a23..6095f5a982 100644 --- a/plugins/LanguagesManager/TranslationWriter/Writer.php +++ b/plugins/LanguagesManager/TranslationWriter/Writer.php @@ -199,14 +199,14 @@ class Writer if (!empty($this->pluginName)) { if ($base == 'tmp') { - return sprintf('%s/plugins/%s/lang/%s.json', StaticContainer::getContainer()->get('path.tmp'), $this->pluginName, $lang); + return sprintf('%s/plugins/%s/lang/%s.json', StaticContainer::get('path.tmp'), $this->pluginName, $lang); } else { return sprintf('%s/plugins/%s/lang/%s.json', PIWIK_INCLUDE_PATH, $this->pluginName, $lang); } } if ($base == 'tmp') { - return sprintf('%s/%s.json', StaticContainer::getContainer()->get('path.tmp'), $lang); + return sprintf('%s/%s.json', StaticContainer::get('path.tmp'), $lang); } return sprintf('%s/%s/%s.json', PIWIK_INCLUDE_PATH, $base, $lang); diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index d93e252793..eceee4a231 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -273,7 +273,7 @@ class API extends \Piwik\Plugin\API } /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $translator->setCurrentLanguage($language); $reports = $this->getReports($idSite = false, $_period = false, $idReport); diff --git a/plugins/ScheduledReports/config/tcpdf_config.php b/plugins/ScheduledReports/config/tcpdf_config.php index f7a92b0006..cf7dad0fce 100644 --- a/plugins/ScheduledReports/config/tcpdf_config.php +++ b/plugins/ScheduledReports/config/tcpdf_config.php @@ -15,7 +15,7 @@ use Piwik\Container\StaticContainer; define('K_PATH_MAIN', PIWIK_INCLUDE_PATH . '/libs/tcpdf/'); -$pathTmpTCPDF = StaticContainer::getContainer()->get('path.tmp') . '/tcpdf/'; +$pathTmpTCPDF = StaticContainer::get('path.tmp') . '/tcpdf/'; define('K_PATH_CACHE', $pathTmpTCPDF); define('K_PATH_IMAGES', $pathTmpTCPDF); diff --git a/plugins/TestRunner/TravisYml/Generator.php b/plugins/TestRunner/TravisYml/Generator.php index aa43cfbcd5..8243ac969e 100644 --- a/plugins/TestRunner/TravisYml/Generator.php +++ b/plugins/TestRunner/TravisYml/Generator.php @@ -40,7 +40,7 @@ abstract class Generator public function __construct($options) { $this->options = $options; - $this->logger = StaticContainer::getContainer()->get('Psr\Log\LoggerInterface'); + $this->logger = StaticContainer::get('Psr\Log\LoggerInterface'); $this->view = new TravisYmlView(); } diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php index 8e63da92b8..d0932ec0cf 100755 --- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php @@ -494,7 +494,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase if ($this->lastLanguage != $langId) { $_GET['language'] = $langId; /** @var Translator $translator */ - $translator = StaticContainer::getContainer()->get('Piwik\Translation\Translator'); + $translator = StaticContainer::get('Piwik\Translation\Translator'); $translator->setCurrentLanguage($langId); } diff --git a/tests/PHPUnit/Integration/CacheTest.php b/tests/PHPUnit/Integration/CacheTest.php index 083e54fd0c..894a6e4695 100644 --- a/tests/PHPUnit/Integration/CacheTest.php +++ b/tests/PHPUnit/Integration/CacheTest.php @@ -65,7 +65,7 @@ class CacheTest extends IntegrationTestCase $cache->save('test', 'mycontent'); // make sure something was changed, otherwise it won't save anything /** @var \Piwik\Cache\Backend $backend */ - $backend = StaticContainer::getContainer()->get('Piwik\Cache\Backend'); + $backend = StaticContainer::get('Piwik\Cache\Backend'); $this->assertFalse($backend->doContains($storageId)); Piwik::postEvent('Request.dispatch.end'); // should trigger save diff --git a/tests/PHPUnit/Integration/LogTest.php b/tests/PHPUnit/Integration/LogTest.php index 15c04a9f2a..720e03b161 100644 --- a/tests/PHPUnit/Integration/LogTest.php +++ b/tests/PHPUnit/Integration/LogTest.php @@ -214,6 +214,6 @@ class LogTest extends IntegrationTestCase public static function getLogFileLocation() { - return StaticContainer::getContainer()->get('path.tmp') . '/logs/piwik.test.log'; + return StaticContainer::get('path.tmp') . '/logs/piwik.test.log'; } -}
\ No newline at end of file +} |