Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Napoli <matthieu@mnapoli.fr>2015-04-22 08:49:12 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2015-04-22 08:50:17 +0300
commit523eacf8cf7ab0bd00c2b966de8d6a60c58e505a (patch)
tree7c9b144b54224f1dc722f7d54ce7d60dbf922e96 /core/Common.php
parentf65932e51d3a264db21563a21d8f4941ed26aa9b (diff)
PhpDoc and warning fixes
Diffstat (limited to 'core/Common.php')
-rw-r--r--core/Common.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/core/Common.php b/core/Common.php
index 1400704599..22f8cac2f1 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -111,12 +111,12 @@ class Common
*/
public static function isGoalPluginEnabled()
{
- return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('Goals');
+ return Plugin\Manager::getInstance()->isPluginActivated('Goals');
}
public static function isActionsPluginEnabled()
{
- return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('Actions');
+ return Plugin\Manager::getInstance()->isPluginActivated('Actions');
}
/**
@@ -535,7 +535,7 @@ class Common
}
/**
- * Configureable hash() algorithm (defaults to md5)
+ * Configurable hash() algorithm (defaults to md5)
*
* @param string $str String to be hashed
* @param bool $raw_output
@@ -717,14 +717,14 @@ class Common
/**
* Returns the list of parent classes for the given class.
*
- * @param string $klass A class name.
+ * @param string $class A class name.
* @return string[] The list of parent classes in order from highest ancestor to the descended class.
*/
- public static function getClassLineage($klass)
+ public static function getClassLineage($class)
{
- $klasses = array_merge(array($klass), array_values(class_parents($klass, $autoload = false)));
+ $classes = array_merge(array($class), array_values(class_parents($class, $autoload = false)));
- return array_reverse($klasses);
+ return array_reverse($classes);
}
/*
@@ -1081,7 +1081,7 @@ class Common
/**
* Returns the continent of a given country
*
- * @param string $country 2 letters isocode
+ * @param string $country 2 letters iso code
*
* @return string Continent (3 letters code : afr, asi, eur, amn, ams, oce)
*/
@@ -1245,7 +1245,7 @@ class Common
* Marks an orphaned object for garbage collection.
*
* For more information: {@link https://github.com/piwik/piwik/issues/374}
- * @param $var The object to destroy.
+ * @param mixed $var The object to destroy.
* @api
*/
public static function destroy(&$var)