fixes #821 - rename the log() method in subclasses of Piwik_Log because

PHP (by design) isn't intended to support overloading to the extent of other
OOP languages (i.e., "multiple methods with the same name but different
quantities and types of arguments")

ref: http://ca.php.net/manual/en/language.oop5.overloading.php

this change arises because PHP 5.2.10 escalated the log message
priority for incompatible method declarations


git-svn-id: http://dev.piwik.org/svn/trunk@1249 59fd770c-687e-43c8-a1e3-f5a4ff64c105

4 files changed, 8 insertions, 37 deletions

diff --git a/core/Log/APICall.php b/core/Log/APICall.php
index c39abd1f91..6f3cb8499e 100644
--- a/core/Log/APICall.php
+++ b/core/Log/APICall.php
@@ -37,18 +37,8 @@ class Piwik_Log_APICall extends Piwik_Log
 		$this->setEventItem('caller_ip', Piwik_Common::getIp() );
 	}
 
-	function log($className, $methodName)
+	public function log_api_call($className, $methodName, $parameterNames, $parameterValues, $executionTime, $returnedValue)
 	{
-		// sanity checks
-		if(func_num_args() != 6) {
-			return;
-		}
-
-		$parameterNames = func_get_arg(2);
-		$parameterValues = func_get_arg(3);
-		$executionTime = func_get_arg(4);
-		$returnedValue = func_get_arg(5);
-
 		$event = array();
 		$event['class_name'] = $className;
 		$event['method_name'] = $methodName;
@@ -57,7 +47,7 @@ class Piwik_Log_APICall extends Piwik_Log
 		$event['execution_time'] = $executionTime;
 		$event['returned_value'] = is_array($returnedValue) ? serialize($returnedValue) : $returnedValue;
 		
-		parent::log($event);
+		parent::log($event, Piwik_Log::INFO);
 	}
 }
 
diff --git a/core/Log/Error.php b/core/Log/Error.php
index 6201afd2a3..81f24c39a4 100644
--- a/core/Log/Error.php
+++ b/core/Log/Error.php
@@ -42,17 +42,8 @@ class Piwik_Log_Error extends Piwik_Log
 		$this->addWriter($writerScreen);
 	}
 	
-	public function log($errno, $errstr)
+	public function log_error($errno, $errstr, $errfile, $errline, $backtrace)
 	{
-		// sanity checks
-		if(func_num_args() != 5) {
-			return;
-		}
-
-		$errfile = func_get_arg(2);
-		$errline = func_get_arg(3);
-		$backtrace = func_get_arg(4);
-
 		$event = array();
 		$event['errno'] = $errno;
 		$event['message'] = $errstr;
@@ -60,7 +51,7 @@ class Piwik_Log_Error extends Piwik_Log
 		$event['errline'] = $errline;
 		$event['backtrace'] = $backtrace;
 		
-		parent::log($event);
+		parent::log($event, Piwik_Log::ERR);
 	}
 }
 
diff --git a/core/Log/Exception.php b/core/Log/Exception.php
index 07d9e239ba..484726121d 100644
--- a/core/Log/Exception.php
+++ b/core/Log/Exception.php
@@ -44,13 +44,8 @@ class Piwik_Log_Exception extends Piwik_Log
 		$this->addWriter($writerScreen);
 	}
 
-	public function log($exception, $unused = null)
+	public function log_exception($exception)
 	{
-		// sanity checks
-		if(func_num_args() != 1) {
-			return;
-		}
-
 		$event = array();
 		$event['errno'] 	= $exception->getCode();
 		$event['message'] 	= $exception->getMessage();
@@ -58,7 +53,7 @@ class Piwik_Log_Exception extends Piwik_Log
 		$event['errline'] 	= $exception->getLine();
 		$event['backtrace'] = $exception->getTraceAsString();
 
-		parent::log($event);
+		parent::log($event, Piwik_Log::CRIT);
 	}
 }
 
diff --git a/core/Log/Message.php b/core/Log/Message.php
index dcd48d5237..3213e98f64 100644
--- a/core/Log/Message.php
+++ b/core/Log/Message.php
@@ -34,16 +34,11 @@ class Piwik_Log_Message extends Piwik_Log
 							$logToDatabaseColumnMapping );
 	}
 	
-	public function log($message, $unused = null)
+	public function log_message($message)
 	{
-		// sanity checks
-		if(func_num_args() != 1) {
-			return;
-		}
-
 		$event = array();
 		$event['message'] = $message;
-		parent::log($event);
+		parent::log($event, Piwik_Log::INFO);
 	}
 }