From 3c6ff414d390a333e45fea181a3c5386a44a609f Mon Sep 17 00:00:00 2001
From: Fabian Becker <halfdan@xnorfz.de>
Date: Tue, 2 Apr 2013 16:42:13 +0200
Subject: [PATCH] Reformat method visibility according to PSR-2
https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md#45-abstract-final-and-static
---
core/Access.php | 10 ++--
core/Archive.php | 12 ++--
core/ArchiveProcessing.php | 14 ++---
core/CacheFile.php | 10 ++--
core/Common.php | 118 ++++++++++++++++++-------------------
core/Config.php | 12 ++--
core/Controller.php | 8 +--
core/Cookie.php | 2 +-
core/DataTable.php | 8 +--
core/Date.php | 22 +++----
core/FrontController.php | 16 ++---
core/HTMLPurifier.php | 4 +-
core/Http.php | 9 ++-
core/IP.php | 33 ++++++-----
14 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/core/Access.php b/core/Access.php
index 0e3bc42054..7210b5ac19 100644
--- a/core/Access.php
+++ b/core/Access.php
@@ -71,7 +71,7 @@ class Piwik_Access
*
* @var array
*/
- static private $availableAccess = array('noaccess', 'view', 'admin', 'superuser');
+ private static $availableAccess = array('noaccess', 'view', 'admin', 'superuser');
/**
* Authentification object (see Piwik_Auth)
@@ -87,7 +87,7 @@ class Piwik_Access
*
* @return array
*/
- static public function getListAccess()
+ public static function getListAccess()
{
return self::$availableAccess;
}
@@ -95,7 +95,7 @@ class Piwik_Access
/**
* Constructor
*/
- function __construct()
+ public function __construct()
{
$this->idsitesByAccess = array(
'view' => array(),
@@ -154,7 +154,7 @@ class Piwik_Access
return true;
}
- static public function getRawSitesWithSomeViewAccess($login)
+ public static function getRawSitesWithSomeViewAccess($login)
{
return Piwik_FetchAll(self::getSqlAccessSite("access, t2.idsite"), $login);
}
@@ -165,7 +165,7 @@ class Piwik_Access
* @param string $select Columns or expression to SELECT FROM table, eg. "MIN(ts_created)"
* @return string SQL query
*/
- static public function getSqlAccessSite($select)
+ public static function getSqlAccessSite($select)
{
return "SELECT " . $select . "
FROM " . Piwik_Common::prefixTable('access') . " as t1
diff --git a/core/Archive.php b/core/Archive.php
index 530694f7a6..598247cbe1 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -205,7 +205,7 @@ abstract class Piwik_Archive
* @param bool|string $_restrictSitesToLogin Used only when running as a scheduled task
* @return Piwik_Archive
*/
- static public function build($idSite, $period, $strDate, $segment = false, $_restrictSitesToLogin = false)
+ public static function build($idSite, $period, $strDate, $segment = false, $_restrictSitesToLogin = false)
{
if ($idSite === 'all') {
$sites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess($_restrictSitesToLogin);
@@ -249,7 +249,7 @@ abstract class Piwik_Archive
* @param string $strDate The date or date range string.
* @return Piwik_Period
*/
- static public function makePeriodFromQueryParams($site, $strPeriod, $strDate)
+ public static function makePeriodFromQueryParams($site, $strPeriod, $strDate)
{
$tz = $site->getTimezone();
@@ -341,7 +341,7 @@ abstract class Piwik_Archive
* @param null $idSubtable
* @return Piwik_DataTable|Piwik_DataTable_Array
*/
- static public function getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded, $idSubtable = null)
+ public static function getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded, $idSubtable = null)
{
Piwik::checkUserHasViewAccess($idSite);
$archive = Piwik_Archive::build($idSite, $period, $date, $segment);
@@ -422,7 +422,7 @@ abstract class Piwik_Archive
*
* @return bool
*/
- static public function isSegmentationEnabled()
+ public static function isSegmentationEnabled()
{
return !Piwik::isUserIsAnonymous()
|| Piwik_Config::getInstance()->General['anonymous_user_enable_use_segments_API'];
@@ -436,7 +436,7 @@ abstract class Piwik_Archive
* @param $period
* @return boolean
*/
- static public function isMultiplePeriod($dateString, $period)
+ public static function isMultiplePeriod($dateString, $period)
{
return (preg_match('/^(last|previous){1}([0-9]*)$/D', $dateString, $regs)
|| Piwik_Period_Range::parseDateRange($dateString))
@@ -449,7 +449,7 @@ abstract class Piwik_Archive
* @param string $idSiteString
* @return bool
*/
- static public function isMultipleSites($idSiteString)
+ public static function isMultipleSites($idSiteString)
{
return $idSiteString == 'all' || strpos($idSiteString, ',') !== false;
}
diff --git a/core/ArchiveProcessing.php b/core/ArchiveProcessing.php
index ac74487217..18acd71b1a 100644
--- a/core/ArchiveProcessing.php
+++ b/core/ArchiveProcessing.php
@@ -226,7 +226,7 @@ abstract class Piwik_ArchiveProcessing
* @throws Exception
* @return Piwik_ArchiveProcessing Piwik_ArchiveProcessing_Day|Piwik_ArchiveProcessing_Period
*/
- static function factory($name)
+ public static function factory($name)
{
switch ($name) {
case 'day':
@@ -256,7 +256,7 @@ abstract class Piwik_ArchiveProcessing
const OPTION_TODAY_ARCHIVE_TTL = 'todayArchiveTimeToLive';
const OPTION_BROWSER_TRIGGER_ARCHIVING = 'enableBrowserTriggerArchiving';
- static public function getCoreMetrics()
+ public static function getCoreMetrics()
{
return array(
'nb_uniq_visitors',
@@ -268,7 +268,7 @@ abstract class Piwik_ArchiveProcessing
);
}
- static public function setTodayArchiveTimeToLive($timeToLiveSeconds)
+ public static function setTodayArchiveTimeToLive($timeToLiveSeconds)
{
$timeToLiveSeconds = (int)$timeToLiveSeconds;
if ($timeToLiveSeconds <= 0) {
@@ -277,7 +277,7 @@ abstract class Piwik_ArchiveProcessing
Piwik_SetOption(self::OPTION_TODAY_ARCHIVE_TTL, $timeToLiveSeconds, $autoload = true);
}
- static public function getTodayArchiveTimeToLive()
+ public static function getTodayArchiveTimeToLive()
{
$timeToLive = Piwik_GetOption(self::OPTION_TODAY_ARCHIVE_TTL);
if ($timeToLive !== false) {
@@ -286,7 +286,7 @@ abstract class Piwik_ArchiveProcessing
return Piwik_Config::getInstance()->General['time_before_today_archive_considered_outdated'];
}
- static public function setBrowserTriggerArchiving($enabled)
+ public static function setBrowserTriggerArchiving($enabled)
{
if (!is_bool($enabled)) {
throw new Exception('Browser trigger archiving must be set to true or false.');
@@ -295,7 +295,7 @@ abstract class Piwik_ArchiveProcessing
Piwik_Tracker_Cache::clearCacheGeneral();
}
- static public function isBrowserTriggerArchivingEnabled()
+ public static function isBrowserTriggerArchivingEnabled()
{
$browserArchivingEnabled = Piwik_GetOption(self::OPTION_BROWSER_TRIGGER_ARCHIVING);
if ($browserArchivingEnabled !== false) {
@@ -644,7 +644,7 @@ abstract class Piwik_ArchiveProcessing
return $this->requestedReport;
}
- static public function getPluginBeingProcessed($requestedReport)
+ public static function getPluginBeingProcessed($requestedReport)
{
$plugin = substr($requestedReport, 0, strpos($requestedReport, '_'));
if (empty($plugin)
diff --git a/core/CacheFile.php b/core/CacheFile.php
index 336945db91..e17e43e1fc 100644
--- a/core/CacheFile.php
+++ b/core/CacheFile.php
@@ -39,7 +39,7 @@ class Piwik_CacheFile
* @param string $directory directory to use
* @param int TTL
*/
- function __construct($directory, $timeToLiveInSeconds = 300)
+ public function __construct($directory, $timeToLiveInSeconds = 300)
{
$this->cachePath = PIWIK_USER_PATH . '/tmp/cache/' . $directory . '/';
if ($timeToLiveInSeconds < self::MINIMUM_TTL) {
@@ -54,7 +54,7 @@ class Piwik_CacheFile
* @param string $id The cache entry ID
* @return array|bool False on error, or array the cache content
*/
- function get($id)
+ public function get($id)
{
if (empty($id)) {
return false;
@@ -101,7 +101,7 @@ class Piwik_CacheFile
* @param array $content The cache content
* @return bool True if the entry was succesfully stored
*/
- function set($id, $content)
+ public function set($id, $content)
{
if (empty($id)) {
return false;
@@ -150,7 +150,7 @@ class Piwik_CacheFile
* @param string $id The cache entry ID
* @return bool True if the entry was succesfully deleted
*/
- function delete($id)
+ public function delete($id)
{
if (empty($id)) {
return false;
@@ -168,7 +168,7 @@ class Piwik_CacheFile
/**
* A function to delete all cache entries in the directory
*/
- function deleteAll()
+ public function deleteAll()
{
Piwik::unlinkRecursive($this->cachePath, $deleteRootToo = false);
}
diff --git a/core/Common.php b/core/Common.php
index 8a7a0191a2..160200c847 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -43,13 +43,13 @@ class Piwik_Common
* @param string $string String to hash
* @return int Resulting int hash
*/
- static public function hashStringToInt($string)
+ public static function hashStringToInt($string)
{
$stringHash = substr(md5($string), 0, 8);
return base_convert($stringHash, 16, 10);
}
- static public $cachedTablePrefix = null;
+ public static $cachedTablePrefix = null;
/**
* Returns the table name prefixed by the table prefix.
@@ -58,7 +58,7 @@ class Piwik_Common
* @param string $table The table name to prefix, ie "log_visit"
* @return string The table name prefixed, ie "piwik-production_log_visit"
*/
- static public function prefixTable($table)
+ public static function prefixTable($table)
{
if (is_null(self::$cachedTablePrefix)) {
self::$cachedTablePrefix = Piwik_Config::getInstance()->database['tables_prefix'];
@@ -72,7 +72,7 @@ class Piwik_Common
* @param string ... The table names to prefix, ie "log_visit"
* @return array The prefixed names in an array.
*/
- static public function prefixTables()
+ public static function prefixTables()
{
$result = array();
foreach (func_get_args() as $table) {
@@ -87,7 +87,7 @@ class Piwik_Common
* @param string $table
* @return string
*/
- static public function unprefixTable($table)
+ public static function unprefixTable($table)
{
static $prefixTable = null;
if (is_null($prefixTable)) {
@@ -105,7 +105,7 @@ class Piwik_Common
/*
* Tracker
*/
- static public function isGoalPluginEnabled()
+ public static function isGoalPluginEnabled()
{
return Piwik_PluginsManager::getInstance()->isPluginActivated('Goals');
}
@@ -121,7 +121,7 @@ class Piwik_Common
* @param string $url either http://piwik.org/test or /
* @return string
*/
- static public function getPathAndQueryFromUrl($url)
+ public static function getPathAndQueryFromUrl($url)
{
$parsedUrl = parse_url($url);
$result = '';
@@ -141,7 +141,7 @@ class Piwik_Common
* @param string $parameter
* @return string|bool Parameter value if found (can be the empty string!), null if not found
*/
- static public function getParameterFromQueryString($urlQuery, $parameter)
+ public static function getParameterFromQueryString($urlQuery, $parameter)
{
$nameToValue = self::getArrayFromQueryString($urlQuery);
if (isset($nameToValue[$parameter])) {
@@ -156,7 +156,7 @@ class Piwik_Common
* @param string $urlQuery
* @return array array( param1=> value1, param2=>value2)
*/
- static public function getArrayFromQueryString($urlQuery)
+ public static function getArrayFromQueryString($urlQuery)
{
if (strlen($urlQuery) == 0) {
return array();
@@ -215,7 +215,7 @@ class Piwik_Common
* @param array $parsed
* @return bool|string
*/
- static public function getParseUrlReverse($parsed)
+ public static function getParseUrlReverse($parsed)
{
if (!is_array($parsed)) {
return false;
@@ -245,7 +245,7 @@ class Piwik_Common
* @param string $url
* @return bool
*/
- static public function isLookLikeUrl($url)
+ public static function isLookLikeUrl($url)
{
return preg_match('~^(ftp|news|http|https)?://(.*)$~D', $url, $matches) !== 0
&& strlen($matches[2]) > 0;
@@ -260,7 +260,7 @@ class Piwik_Common
*
* @return string
*/
- static public function getPathToPiwikRoot()
+ public static function getPathToPiwikRoot()
{
return realpath(dirname(__FILE__) . "/..");
}
@@ -271,7 +271,7 @@ class Piwik_Common
* @param string $path
* @param bool $denyAccess
*/
- static public function mkdir($path, $denyAccess = true)
+ public static function mkdir($path, $denyAccess = true)
{
if (!is_dir($path)) {
// the mode in mkdir is modified by the current umask
@@ -302,7 +302,7 @@ class Piwik_Common
* @param bool $overwrite whether to overwrite an existing file or not
* @param string $content
*/
- static public function createHtAccess($path, $overwrite = true, $content = "<Files \"*\">\n<IfModule mod_access.c>\nDeny from all\n</IfModule>\n<IfModule !mod_access_compat>\n<IfModule mod_authz_host.c>\nDeny from all\n</IfModule>\n</IfModule>\n<IfModule mod_access_compat>\nDeny from all\n</IfModule>\n</Files>\n")
+ public static function createHtAccess($path, $overwrite = true, $content = "<Files \"*\">\n<IfModule mod_access.c>\nDeny from all\n</IfModule>\n<IfModule !mod_access_compat>\n<IfModule mod_authz_host.c>\nDeny from all\n</IfModule>\n</IfModule>\n<IfModule mod_access_compat>\nDeny from all\n</IfModule>\n</Files>\n")
{
if (self::isApache()) {
$file = $path . '/.htaccess';
@@ -319,7 +319,7 @@ class Piwik_Common
* @param string $path
* @return string canonicalized absolute path
*/
- static public function realpath($path)
+ public static function realpath($path)
{
if (file_exists($path)) {
return realpath($path);
@@ -337,7 +337,7 @@ class Piwik_Common
* @return bool
*
*/
- static public function isValidFilename($filename)
+ public static function isValidFilename($filename)
{
return (0 !== preg_match('/(^[a-zA-Z0-9]+([a-zA-Z_0-9.-]*))$/D', $filename));
}
@@ -354,7 +354,7 @@ class Piwik_Common
* @param int ... optional length
* @return string
*/
- static public function substr($string, $start)
+ public static function substr($string, $start)
{
// in case mbstring overloads substr function
$substr = function_exists('mb_orig_substr') ? 'mb_orig_substr' : 'substr';
@@ -372,7 +372,7 @@ class Piwik_Common
* @param string $string
* @return int
*/
- static public function strlen($string)
+ public static function strlen($string)
{
// in case mbstring overloads strlen function
$strlen = function_exists('mb_orig_strlen') ? 'mb_orig_strlen' : 'strlen';
@@ -387,7 +387,7 @@ class Piwik_Common
* @param int ... optional length
* @return string
*/
- static public function mb_substr($string, $start)
+ public static function mb_substr($string, $start)
{
$length = func_num_args() > 2
? func_get_arg(2)
@@ -406,7 +406,7 @@ class Piwik_Common
* @param string $string
* @return int
*/
- static public function mb_strlen($string)
+ public static function mb_strlen($string)
{
if (function_exists('mb_strlen')) {
return mb_strlen($string, 'UTF-8');
@@ -421,7 +421,7 @@ class Piwik_Common
* @param string $string
* @return string
*/
- static public function mb_strtolower($string)
+ public static function mb_strtolower($string)
{
if (function_exists('mb_strtolower')) {
return mb_strtolower($string, 'UTF-8');
@@ -458,7 +458,7 @@ class Piwik_Common
* @throws Exception
* @return mixed The variable after cleaning
*/
- static public function sanitizeInputValues($value, $alreadyStripslashed = false)
+ public static function sanitizeInputValues($value, $alreadyStripslashed = false)
{
if (is_numeric($value)) {
return $value;
@@ -494,7 +494,7 @@ class Piwik_Common
* @param string $value
* @return string sanitized input
*/
- static public function sanitizeInputValue($value)
+ public static function sanitizeInputValue($value)
{
// $_GET and $_REQUEST already urldecode()'d
// decode
@@ -522,7 +522,7 @@ class Piwik_Common
* @param string $value
* @return string unsanitized input
*/
- static public function unsanitizeInputValue($value)
+ public static function unsanitizeInputValue($value)
{
return htmlspecialchars_decode($value, self::HTML_ENCODING_QUOTE_STYLE);
}
@@ -533,7 +533,7 @@ class Piwik_Common
* @param string|array $value
* @return string|array unsanitized input
*/
- static public function unsanitizeInputValues($value)
+ public static function unsanitizeInputValues($value)
{
if (is_array($value)) {
$result = array();
@@ -552,7 +552,7 @@ class Piwik_Common
* @param string
* @return string modified or not
*/
- static public function undoMagicQuotes($value)
+ public static function undoMagicQuotes($value)
{
return version_compare(PHP_VERSION, '5.4', '<')
&& get_magic_quotes_gpc()
@@ -577,7 +577,7 @@ class Piwik_Common
*
* @return mixed The variable after cleaning
*/
- static public function getRequestVar($varName, $varDefault = null, $varType = null, $requestArrayToUse = null)
+ public static function getRequestVar($varName, $varDefault = null, $varType = null, $requestArrayToUse = null)
{
if (is_null($requestArrayToUse)) {
$requestArrayToUse = $_GET + $_POST;
@@ -657,7 +657,7 @@ class Piwik_Common
*
* @return string 32 chars
*/
- static public function generateUniqId()
+ public static function generateUniqId()
{
return md5(uniqid(rand(), true));
}
@@ -667,7 +667,7 @@ class Piwik_Common
*
* @return string
*/
- static public function getSalt()
+ public static function getSalt()
{
static $salt = null;
if (is_null($salt)) {
@@ -683,7 +683,7 @@ class Piwik_Common
* @param bool $raw_output
* @return string Hash string
*/
- static function hash($str, $raw_output = false)
+ public static function hash($str, $raw_output = false)
{
static $hashAlgorithm = null;
if (is_null($hashAlgorithm)) {
@@ -735,7 +735,7 @@ class Piwik_Common
* @param string $str Hexadecimal representation
* @return string
*/
- static public function hex2bin($str)
+ public static function hex2bin($str)
{
return pack("H*", $str);
}
@@ -753,7 +753,7 @@ class Piwik_Common
* @throws Exception
* @return string binary string
*/
- static public function convertVisitorIdToBin($id)
+ public static function convertVisitorIdToBin($id)
{
if (strlen($id) !== Piwik_Tracker::LENGTH_HEX_ID_STRING
|| @bin2hex(self::hex2bin($id)) != $id
@@ -778,7 +778,7 @@ class Piwik_Common
* @param string $ip IP address in network address format
* @return string
*/
- static public function long2ip($ip)
+ public static function long2ip($ip)
{
return Piwik_IP::long2ip($ip);
}
@@ -788,7 +788,7 @@ class Piwik_Common
*
* @return bool True if broken; false otherwise
*/
- static private function useJsonLibrary()
+ private static function useJsonLibrary()
{
static $useLib;
@@ -820,7 +820,7 @@ class Piwik_Common
* @param mixed $value
* @return string
*/
- static public function json_encode($value)
+ public static function json_encode($value)
{
if (self::useJsonLibrary()) {
return _json_encode($value);
@@ -837,7 +837,7 @@ class Piwik_Common
* @param bool $assoc
* @return mixed
*/
- static public function json_decode($json, $assoc = false)
+ public static function json_decode($json, $assoc = false)
{
if (self::useJsonLibrary()) {
return _json_decode($json, $assoc);
@@ -857,7 +857,7 @@ class Piwik_Common
*
* @return array Array of 3 letter continent codes
*/
- static public function getContinentsList()
+ public static function getContinentsList()
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
@@ -873,7 +873,7 @@ class Piwik_Common
* @param bool $includeInternalCodes
* @return array Array of (2 letter ISO codes => 3 letter continent code)
*/
- static public function getCountriesList($includeInternalCodes = false)
+ public static function getCountriesList($includeInternalCodes = false)
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
@@ -893,7 +893,7 @@ class Piwik_Common
*
* @return array Array of 2 letter ISO codes => Language name (in English)
*/
- static public function getLanguagesList()
+ public static function getLanguagesList()
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
@@ -908,7 +908,7 @@ class Piwik_Common
*
* @return array Array of ( 2 letter ISO language codes => 2 letter ISO country codes )
*/
- static public function getLanguageToCountryList()
+ public static function getLanguageToCountryList()
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/LanguageToCountry.php';
@@ -923,7 +923,7 @@ class Piwik_Common
*
* @return array Array of ( URL => array( searchEngineName, keywordParameter, path, charset ) )
*/
- static public function getSearchEngineUrls()
+ public static function getSearchEngineUrls()
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/SearchEngines.php';
@@ -938,7 +938,7 @@ class Piwik_Common
*
* @return array Array of ( searchEngineName => URL )
*/
- static public function getSearchEngineNames()
+ public static function getSearchEngineNames()
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/SearchEngines.php';
@@ -953,7 +953,7 @@ class Piwik_Common
*
* @return array Array of ( dnsName => providerName )
*/
- static public function getProviderNames()
+ public static function getProviderNames()
{
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Providers.php';
@@ -971,7 +971,7 @@ class Piwik_Common
* @param string $browserLang Optional browser language, otherwise taken from the request header
* @return string
*/
- static public function getBrowserLanguage($browserLang = NULL)
+ public static function getBrowserLanguage($browserLang = NULL)
{
static $replacementPatterns = array(
// extraneous bits of RFC 3282 that we ignore
@@ -1022,7 +1022,7 @@ class Piwik_Common
* @param string $ip
* @return string 2 letter ISO code
*/
- static public function getCountry($lang, $enableLanguageToCountryGuess, $ip)
+ public static function getCountry($lang, $enableLanguageToCountryGuess, $ip)
{
$country = null;
Piwik_PostEvent('Common.getCountry', $country, $ip);
@@ -1046,7 +1046,7 @@ class Piwik_Common
* @param bool $enableLanguageToCountryGuess (if true, will guess country based on language that lacks region information)
* @return array Array of 2 letter ISO codes
*/
- static public function extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $enableLanguageToCountryGuess)
+ public static function extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $enableLanguageToCountryGuess)
{
$langToCountry = self::getLanguageToCountryList();
@@ -1077,7 +1077,7 @@ class Piwik_Common
* @param $validLanguages array of valid language codes
* @return string 2 letter ISO 639 code
*/
- static public function extractLanguageCodeFromBrowserLanguage($browserLanguage, $validLanguages)
+ public static function extractLanguageCodeFromBrowserLanguage($browserLanguage, $validLanguages)
{
// assumes language preference is sorted;
// does not handle language-script-region tags or language range (*)
@@ -1105,7 +1105,7 @@ class Piwik_Common
*
* @return string Continent (3 letters code : afr, asi, eur, amn, ams, oce)
*/
- static public function getContinent($country)
+ public static function getContinent($country)
{
$countryList = self::getCountriesList();
if (isset($countryList[$country])) {
@@ -1127,7 +1127,7 @@ class Piwik_Common
* 1 => array( ... ) // campaign keyword parameters
* );
*/
- static public function getCampaignParameters()
+ public static function getCampaignParameters()
{
$return = array(
Piwik_Config::getInstance()->Tracker['campaign_var_name'],
@@ -1165,7 +1165,7 @@ class Piwik_Common
* @param string $url
* @return string
*/
- static public function getLossyUrl($url)
+ public static function getLossyUrl($url)
{
static $countries;
if (!isset($countries)) {
@@ -1208,7 +1208,7 @@ class Piwik_Common
* 'name' => 'Google',
* 'keywords' => 'my searched keywords')
*/
- static public function extractSearchEngineInformationFromUrl($referrerUrl)
+ public static function extractSearchEngineInformationFromUrl($referrerUrl)
{
$refererParsed = @parse_url($referrerUrl);
$refererHost = '';
@@ -1420,7 +1420,7 @@ class Piwik_Common
* @since added in 0.4.4
* @return bool true if PHP invoked as a CGI or from CLI
*/
- static public function isPhpCliMode()
+ public static function isPhpCliMode()
{
$remoteAddr = @$_SERVER['REMOTE_ADDR'];
return PHP_SAPI == 'cli' ||
@@ -1433,7 +1433,7 @@ class Piwik_Common
* Helpful for error handling: directly throw error without HTML (eg. when DB is down)
* @return bool
*/
- static public function isArchivePhpTriggered()
+ public static function isArchivePhpTriggered()
{
return !empty($_GET['trigger'])
&& $_GET['trigger'] == 'archivephp';
@@ -1444,7 +1444,7 @@ class Piwik_Common
* You can trigger Piwik from the command line by
* # /usr/bin/php5 /path/to/piwik/index.php -- "module=API&method=Actions.getActions&idSite=1&period=day&date=previous8&format=php"
*/
- static public function assignCliParametersToRequest()
+ public static function assignCliParametersToRequest()
{
if (isset($_SERVER['argc'])
&& $_SERVER['argc'] > 0
@@ -1459,10 +1459,10 @@ class Piwik_Common
/**
* Returns true if running on a Windows operating system
*
- * @since added in 0.6.5
+ * @since 0.6.5
* @return bool true if PHP detects it is running on Windows; else false
*/
- static public function isWindows()
+ public static function isWindows()
{
return DIRECTORY_SEPARATOR === '\\';
}
@@ -1472,7 +1472,7 @@ class Piwik_Common
*
* @return bool true if PHP detects it is running on MacOS; else false
*/
- static public function isMacOS()
+ public static function isMacOS()
{
return PHP_OS === 'Darwin';
}
@@ -1482,7 +1482,7 @@ class Piwik_Common
*
* @return bool
*/
- static public function isApache()
+ public static function isApache()
{
$apache = isset($_SERVER['SERVER_SOFTWARE']) &&
!strncmp($_SERVER['SERVER_SOFTWARE'], 'Apache', 6);
@@ -1495,7 +1495,7 @@ class Piwik_Common
*
* @return bool
*/
- static public function isIIS()
+ public static function isIIS()
{
$iis = isset($_SERVER['SERVER_SOFTWARE']) &&
preg_match('/^Microsoft-IIS\/(.+)/', $_SERVER['SERVER_SOFTWARE'], $matches) &&
diff --git a/core/Config.php b/core/Config.php
index e906311306..f966cd8a8a 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -40,14 +40,14 @@
*/
class Piwik_Config
{
- static private $instance = null;
+ private static $instance = null;
/**
* Returns the singleton Piwik_Config
*
* @return Piwik_Config
*/
- static public function getInstance()
+ public static function getInstance()
{
if (self::$instance == null) {
self::$instance = new self;
@@ -127,7 +127,7 @@ class Piwik_Config
*
* @return string
*/
- static public function getGlobalConfigPath()
+ public static function getGlobalConfigPath()
{
return PIWIK_USER_PATH . '/config/global.ini.php';
}
@@ -140,7 +140,7 @@ class Piwik_Config
* @deprecated 1.7
* @return string
*/
- static public function getDefaultDefaultConfigPath()
+ public static function getDefaultDefaultConfigPath()
{
return self::getGlobalConfigPath();
}
@@ -150,7 +150,7 @@ class Piwik_Config
*
* @return string
*/
- static public function getLocalConfigPath()
+ public static function getLocalConfigPath()
{
return PIWIK_USER_PATH . '/config/config.ini.php';
}
@@ -309,7 +309,7 @@ class Piwik_Config
* @param mixed $elem2
* @return int;
*/
- static function compareElements($elem1, $elem2)
+ public static function compareElements($elem1, $elem2)
{
if (is_array($elem1)) {
if (is_array($elem2)) {
diff --git a/core/Controller.php b/core/Controller.php
index 1687268cdf..378a4dbb7b 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -50,7 +50,7 @@ abstract class Piwik_Controller
/**
* Builds the controller object, reads the date from the request, extracts plugin name from
*/
- function __construct()
+ public function __construct()
{
$this->init();
}
@@ -118,7 +118,7 @@ abstract class Piwik_Controller
*
* @return string
*/
- function getDefaultAction()
+ public function getDefaultAction()
{
return 'index';
}
@@ -289,7 +289,7 @@ abstract class Piwik_Controller
* @param Piwik_Site $site
* @return string
*/
- static public function getDateRangeRelativeToEndDate($period, $lastN, $endDate, $site)
+ public static function getDateRangeRelativeToEndDate($period, $lastN, $endDate, $site)
{
$last30Relative = new Piwik_Period_Range($period, $lastN, $site->getTimezone());
$last30Relative->setDefaultEndDate(Piwik_Date::factory($endDate));
@@ -637,7 +637,7 @@ abstract class Piwik_Controller
* @param string $defaultDate Default date, eg. "today"
* @param array $parameters Parameters to append to url
*/
- function redirectToIndex($moduleToRedirect, $actionToRedirect, $websiteId = null, $defaultPeriod = null, $defaultDate = null, $parameters = array())
+ public function redirectToIndex($moduleToRedirect, $actionToRedirect, $websiteId = null, $defaultPeriod = null, $defaultDate = null, $parameters = array())
{
if (is_null($websiteId)) {
$websiteId = $this->getDefaultWebsiteId();
diff --git a/core/Cookie.php b/core/Cookie.php
index 46f9dc9e66..69cd83c188 100644
--- a/core/Cookie.php
+++ b/core/Cookie.php
@@ -378,7 +378,7 @@ class Piwik_Cookie
* @param string $value Value to be escaped
* @return mixed The value once cleaned.
*/
- static protected function escapeValue($value)
+ protected static function escapeValue($value)
{
return Piwik_Common::sanitizeInputValues($value);
}
diff --git a/core/DataTable.php b/core/DataTable.php
index 34d6fa6f8e..98086d9f17 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -146,7 +146,7 @@ class Piwik_DataTable
/**
* Maximum nesting level.
*/
- static private $maximumDepthLevelAllowed = self::MAX_DEPTH_DEFAULT;
+ private static $maximumDepthLevelAllowed = self::MAX_DEPTH_DEFAULT;
/**
* Array of Piwik_DataTable_Row
@@ -355,7 +355,7 @@ class Piwik_DataTable
/**
* Saves the current number of rows
*/
- function setRowsCountBeforeLimitFilter()
+ public function setRowsCountBeforeLimitFilter()
{
$this->rowsCountBeforeLimitFilter = $this->getRowsCount();
}
@@ -896,7 +896,7 @@ class Piwik_DataTable
* @param Piwik_DataTable $table2
* @return bool
*/
- static public function isEqual(Piwik_DataTable $table1, Piwik_DataTable $table2)
+ public static function isEqual(Piwik_DataTable $table1, Piwik_DataTable $table2)
{
$rows1 = $table1->getRows();
$rows2 = $table2->getRows();
@@ -1232,7 +1232,7 @@ class Piwik_DataTable
*
* @param int $atLeastLevel
*/
- static public function setMaximumDepthLevelAllowedAtLeast($atLeastLevel)
+ public static function setMaximumDepthLevelAllowedAtLeast($atLeastLevel)
{
self::$maximumDepthLevelAllowed = max($atLeastLevel, self::$maximumDepthLevelAllowed);
if (self::$maximumDepthLevelAllowed < 1) {
diff --git a/core/Date.php b/core/Date.php
index cd0fa6c238..0753514cf9 100644
--- a/core/Date.php
+++ b/core/Date.php
@@ -58,7 +58,7 @@ class Piwik_Date
* @throws Exception
* @return Piwik_Date
*/
- static public function factory($dateString, $timezone = null)
+ public static function factory($dateString, $timezone = null)
{
$invalidDateException = new Exception(Piwik_TranslateException('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime")) . ": $dateString");
if ($dateString instanceof self) {
@@ -104,7 +104,7 @@ class Piwik_Date
*
* @return string
*/
- function getDatetime()
+ public function getDatetime()
{
return $this->toString(self::DATE_TIME_FORMAT);
}
@@ -114,7 +114,7 @@ class Piwik_Date
*
* @return string
*/
- function getDateStartUTC()
+ public function getDateStartUTC()
{
$dateStartUTC = gmdate('Y-m-d', $this->timestamp);
$date = Piwik_Date::factory($dateStartUTC)->setTimezone($this->timezone);
@@ -126,7 +126,7 @@ class Piwik_Date
*
* @return string
*/
- function getDateEndUTC()
+ public function getDateEndUTC()
{
$dateEndUTC = gmdate('Y-m-d 23:59:59', $this->timestamp);
$date = Piwik_Date::factory($dateEndUTC)->setTimezone($this->timezone);
@@ -153,7 +153,7 @@ class Piwik_Date
* @param string $timezone
* @return int|bool utc offset or false
*/
- static protected function extractUtcOffset($timezone)
+ protected static function extractUtcOffset($timezone)
{
if ($timezone == 'UTC') {
return 0;
@@ -178,7 +178,7 @@ class Piwik_Date
* @param string $timezone The timezone to adjust to.
* @return int The adjusted time as seconds from EPOCH.
*/
- static public function adjustForTimezone($timestamp, $timezone)
+ public static function adjustForTimezone($timestamp, $timezone)
{
// manually adjust for UTC timezones
$utcOffset = self::extractUtcOffset($timezone);
@@ -308,7 +308,7 @@ class Piwik_Date
* @param Piwik_Date $date Month to compare
* @return int 0 = equal, 1 = later, -1 = earlier
*/
- function compareMonth(Piwik_Date $date)
+ public function compareMonth(Piwik_Date $date)
{
$currentMonth = date('n', $this->getTimestamp());
$toCompareMonth = date('n', $date->getTimestamp());
@@ -336,7 +336,7 @@ class Piwik_Date
*
* @return Piwik_Date
*/
- static public function now()
+ public static function now()
{
return new Piwik_Date(time());
}
@@ -346,7 +346,7 @@ class Piwik_Date
*
* @return Piwik_Date
*/
- static public function today()
+ public static function today()
{
return new Piwik_Date(strtotime(date("Y-m-d 00:00:00")));
}
@@ -356,7 +356,7 @@ class Piwik_Date
*
* @return Piwik_Date
*/
- static public function yesterday()
+ public static function yesterday()
{
return new Piwik_Date(strtotime("yesterday"));
}
@@ -366,7 +366,7 @@ class Piwik_Date
*
* @return Piwik_Date
*/
- static public function yesterdaySameTime()
+ public static function yesterdaySameTime()
{
return new Piwik_Date(strtotime("yesterday " . date('H:i:s')));
}
diff --git a/core/FrontController.php b/core/FrontController.php
index 33fb7107dd..c09a6eeb20 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -35,16 +35,16 @@ class Piwik_FrontController
*
* @var bool
*/
- static public $enableDispatch = true;
+ public static $enableDispatch = true;
- static private $instance = null;
+ private static $instance = null;
/**
* returns singleton
*
* @return Piwik_FrontController
*/
- static public function getInstance()
+ public static function getInstance()
{
if (self::$instance == null) {
self::$instance = new self;
@@ -63,7 +63,7 @@ class Piwik_FrontController
* @return mixed The returned value of the calls, often nothing as the module print but don't return data
* @see fetchDispatch()
*/
- function dispatch($module = null, $action = null, $parameters = null)
+ public function dispatch($module = null, $action = null, $parameters = null)
{
if (self::$enableDispatch === false) {
return;
@@ -141,7 +141,7 @@ class Piwik_FrontController
* @param array $parameters
* @return string
*/
- function fetchDispatch($controllerName = null, $actionName = null, $parameters = null)
+ public function fetchDispatch($controllerName = null, $actionName = null, $parameters = null)
{
ob_start();
$output = $this->dispatch($controllerName, $actionName, $parameters);
@@ -157,7 +157,7 @@ class Piwik_FrontController
* Called at the end of the page generation
*
*/
- function __destruct()
+ public function __destruct()
{
try {
Piwik::printSqlProfilingReportZend();
@@ -213,7 +213,7 @@ class Piwik_FrontController
* @throws Exception
* @return void
*/
- function init()
+ public function init()
{
static $initialized = false;
if ($initialized) {
@@ -361,7 +361,7 @@ class Piwik_FrontController
*/
class Piwik_FrontController_PluginDeactivatedException extends Exception
{
- function __construct($module)
+ public function __construct($module)
{
parent::__construct("The plugin $module is not enabled. You can activate the plugin on Settings > Plugins page in Piwik.");
}
diff --git a/core/HTMLPurifier.php b/core/HTMLPurifier.php
index cb5db8e473..33095f2f52 100644
--- a/core/HTMLPurifier.php
+++ b/core/HTMLPurifier.php
@@ -16,14 +16,14 @@
*/
class Piwik_HTMLPurifier
{
- static private $instance = null;
+ private static $instance = null;
/**
* Returns the singleton HTMLPurifier or a mock object
*
* @return HTMLPurifier|Piwik_HTMLPurifier
*/
- static public function getInstance()
+ public static function getInstance()
{
if (self::$instance == null) {
if (file_exists(PIWIK_INCLUDE_PATH . '/libs/HTMLPurifier.php')) {
diff --git a/core/Http.php b/core/Http.php
index 186ad321e2..d120a49a91 100644
--- a/core/Http.php
+++ b/core/Http.php
@@ -22,7 +22,7 @@ class Piwik_Http
*
* @return string
*/
- static public function getTransportMethod()
+ public static function getTransportMethod()
{
$method = 'curl';
if (!self::isCurlEnabled()) {
@@ -66,8 +66,7 @@ class Piwik_Http
* @throws Exception
* @return bool true (or string) on success; false on HTTP response error code (1xx or 4xx)
*/
- static public function sendHttpRequest($aUrl, $timeout, $userAgent = null, $destinationPath = null, $followDepth = 0, $acceptLanguage = false, $byteRange = false, $getExtendedInfo = false, $httpMethod = 'GET'
- )
+ public static function sendHttpRequest($aUrl, $timeout, $userAgent = null, $destinationPath = null, $followDepth = 0, $acceptLanguage = false, $byteRange = false, $getExtendedInfo = false, $httpMethod = 'GET')
{
// create output file
$file = null;
@@ -103,7 +102,7 @@ class Piwik_Http
* @throws Exception
* @return bool true (or string/array) on success; false on HTTP response error code (1xx or 4xx)
*/
- static public function sendHttpRequestBy(
+ public static function sendHttpRequestBy(
$method = 'socket',
$aUrl,
$timeout,
@@ -660,7 +659,7 @@ class Piwik_Http
* @throws Exception
* @return bool true on success, throws Exception on failure
*/
- static public function fetchRemoteFile($url, $destinationPath = null, $tries = 0)
+ public static function fetchRemoteFile($url, $destinationPath = null, $tries = 0)
{
@ignore_user_abort(true);
Piwik::setMaxExecutionTime(0);
diff --git a/core/IP.php b/core/IP.php
index 33cce5cdbb..4b2a94c942 100644
--- a/core/IP.php
+++ b/core/IP.php
@@ -59,7 +59,7 @@ class Piwik_IP
* @param string $ipString IP address
* @return string|false
*/
- static public function sanitizeIp($ipString)
+ public static function sanitizeIp($ipString)
{
$ipString = trim($ipString);
@@ -107,7 +107,7 @@ class Piwik_IP
* @param string $ipRangeString IP address range
* @return string|false IP address range in CIDR notation
*/
- static public function sanitizeIpRange($ipRangeString)
+ public static function sanitizeIpRange($ipRangeString)
{
$ipRangeString = trim($ipRangeString);
if (empty($ipRangeString)) {
@@ -151,7 +151,7 @@ class Piwik_IP
* @param string $ipString IP address, either IPv4 or IPv6, e.g., "127.0.0.1"
* @return string Binary-safe string, e.g., "\x7F\x00\x00\x01"
*/
- static public function P2N($ipString)
+ public static function P2N($ipString)
{
// use @inet_pton() because it throws an exception and E_WARNING on invalid input
$ip = @_inet_pton($ipString);
@@ -166,7 +166,7 @@ class Piwik_IP
* @param string $ip IP address in network address format
* @return string IP address in presentation format
*/
- static public function N2P($ip)
+ public static function N2P($ip)
{
// use @inet_ntop() because it throws an exception and E_WARNING on invalid input
$ipStr = @_inet_ntop($ip);
@@ -179,7 +179,7 @@ class Piwik_IP
* @param string $ip IP address in network address format
* @return string IP address in presentation format
*/
- static public function prettyPrint($ip)
+ public static function prettyPrint($ip)
{
return self::N2P($ip);
}
@@ -190,7 +190,7 @@ class Piwik_IP
* @param string $ip IP address in network address format
* @return bool True if IPv4, else false
*/
- static public function isIPv4($ip)
+ public static function isIPv4($ip)
{
// in case mbstring overloads strlen and substr functions
$strlen = function_exists('mb_orig_strlen') ? 'mb_orig_strlen' : 'strlen';
@@ -224,7 +224,7 @@ class Piwik_IP
* @param string $ip IPv4 address in network address format
* @return string IP address in presentation format
*/
- static public function long2ip($ip)
+ public static function long2ip($ip)
{
// IPv4
if (Piwik_Common::strlen($ip) == 4) {
@@ -251,7 +251,7 @@ class Piwik_IP
* @param string $ip
* @return bool
*/
- static public function isIPv6($ip)
+ public static function isIPv6($ip)
{
return strpos($ip, ':') !== false;
}
@@ -262,7 +262,7 @@ class Piwik_IP
* @param string $ip
* @return bool
*/
- static public function isMappedIPv4($ip)
+ public static function isMappedIPv4($ip)
{
return substr($ip, 0, strlen(self::MAPPED_IPv4_START)) === self::MAPPED_IPv4_START;
}
@@ -270,7 +270,7 @@ class Piwik_IP
/**
* Returns
*/
- static public function getIPv4FromMappedIPv6($ip)
+ public static function getIPv4FromMappedIPv6($ip)
{
return substr($ip, strlen(self::MAPPED_IPv4_START));
}
@@ -281,7 +281,7 @@ class Piwik_IP
* @param array $ipRange An IP address range in presentation format
* @return array|false Array ($lowIp, $highIp) in network address format, or false if failure
*/
- static public function getIpsForRange($ipRange)
+ public static function getIpsForRange($ipRange)
{
if (strpos($ipRange, '/') === false) {
$ipRange = self::sanitizeIpRange($ipRange);
@@ -322,7 +322,7 @@ class Piwik_IP
* @param array $ipRanges List of IP address ranges
* @return bool True if in any of the specified IP address ranges; else false.
*/
- static public function isIpInRange($ip, $ipRanges)
+ public static function isIpInRange($ip, $ipRanges)
{
$ipLen = Piwik_Common::strlen($ip);
if (empty($ip) || empty($ipRanges) || ($ipLen != 4 && $ipLen != 16)) {
@@ -363,7 +363,7 @@ class Piwik_IP
*
* @return string IP address in presentation format
*/
- static public function getIpFromHeader()
+ public static function getIpFromHeader()
{
$clientHeaders = @Piwik_Config::getInstance()->General['proxy_client_headers'];
if (!is_array($clientHeaders)) {
@@ -386,7 +386,7 @@ class Piwik_IP
* @param array $proxyHeaders List of proxy headers
* @return string
*/
- static public function getNonProxyIpFromHeader($default, $proxyHeaders)
+ public static function getNonProxyIpFromHeader($default, $proxyHeaders)
{
$proxyIps = @Piwik_Config::getInstance()->General['proxy_ips'];
if (!is_array($proxyIps)) {
@@ -414,7 +414,7 @@ class Piwik_IP
* @param array $excludedIps Optional list of excluded IP addresses (or IP address ranges)
* @return string Last (non-excluded) IP address in the list
*/
- static public function getLastIpFromList($csv, $excludedIps = null)
+ public static function getLastIpFromList($csv, $excludedIps = null)
{
$p = strrpos($csv, ',');
if ($p !== false) {
@@ -432,10 +432,11 @@ class Piwik_IP
/**
* Get hostname for a given IP address
*
+ * @todo Remove in 2.0?
* @param string $ipStr Human-readable IP address
* @return string Hostname or unmodified $ipStr if failure
*/
- static public function getHostByAddr($ipStr)
+ public static function getHostByAddr($ipStr)
{
// PHP's reverse lookup supports ipv4 and ipv6
// except on Windows before PHP 5.3
--
GitLab