Author: grobmeier
Date: Mon Jul 6 14:18:59 2009
New Revision: 791488
URL: http://svn.apache.org/viewvc?rev=791488&view=rev
Log:
LOG4PHP-23: make use of access modifiers
Modified:
incubator/log4php/trunk/src/main/php/LoggerAppender.php
incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php
incubator/log4php/trunk/src/main/php/LoggerReflectionUtils.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutXml.php
incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
Modified: incubator/log4php/trunk/src/main/php/LoggerAppender.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerAppender.php?rev=791488&r1=791487&r2=791488&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerAppender.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerAppender.php Mon Jul 6 14:18:59
2009
@@ -358,7 +358,7 @@
*
* Call {...@link finalize()} to properly close the appender.
*/
- function __sleep() {
+ public function __sleep() {
$this->finalize();
return array_keys(get_object_vars($this));
}
@@ -372,7 +372,7 @@
*
* Call {...@link activateOptions()} to properly setup the appender.
*/
- function __wakeup() {
+ public function __wakeup() {
$this->activateOptions();
}
}
Modified: incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php?rev=791488&r1=791487&r2=791488&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php Mon Jul 6
14:18:59 2009
@@ -34,12 +34,12 @@
/**
* @var string Fully Qualified Class Name of the calling category class.
*/
- var $fqcn;
+ private $fqcn;
/**
* @var Logger reference
*/
- var $logger = null;
+ private $logger = null;
/**
* The category (logger) name.
@@ -48,7 +48,7 @@
* Use the {...@link getLoggerName()} method instead.
* @deprecated
*/
- var $categoryName;
+ private $categoryName;
/**
* Level of logging event.
@@ -63,7 +63,7 @@
/**
* @var string The nested diagnostic context (NDC) of logging event.
*/
- var $ndc;
+ private $ndc;
/**
* Have we tried to do an NDC lookup? If we did, there is no need
@@ -72,7 +72,7 @@
* (incorrect) NDC. See also writeObject method.
* @var boolean
*/
- var $ndcLookupRequired = true;
+ private $ndcLookupRequired = true;
/**
* Have we tried to do an MDC lookup? If we did, there is no need
@@ -80,26 +80,26 @@
* serialized. See also the getMDC and getMDCCopy methods.
* @var boolean
*/
- var $mdcCopyLookupRequired = true;
+ private $mdcCopyLookupRequired = true;
/**
* @var mixed The application supplied message of logging event.
*/
- var $message;
+ private $message;
/**
* The application supplied message rendered through the log4php
* objet rendering mechanism. At present renderedMessage == message.
* @var string
*/
- var $renderedMessage = null;
+ private $renderedMessage = null;
/**
* The name of thread in which this logging event was generated.
* log4php saves here the process id via {...@link PHP_MANUAL#getmypid
getmypid()}
* @var mixed
*/
- var $threadName = null;
+ private $threadName = null;
/**
* The number of seconds elapsed from 1/1/1970 until logging event
@@ -111,7 +111,7 @@
/**
* @var LoggerLocationInfo Location information for the caller.
*/
- var $locationInfo = null;
+ private $locationInfo = null;
/**
* Instantiate a LoggingEvent from the supplied parameters.
Modified: incubator/log4php/trunk/src/main/php/LoggerReflectionUtils.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerReflectionUtils.php?rev=791488&r1=791487&r2=791488&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerReflectionUtils.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerReflectionUtils.php Mon Jul 6
14:18:59 2009
@@ -140,7 +140,7 @@
* @param string $name
* @param mixed $value
*/
- function setter(&$object, $name, $value) {
+ public function setter(&$object, $name, $value) {
if (empty($name)) {
return false;
}
@@ -153,5 +153,3 @@
}
}
-
- ?>
\ No newline at end of file
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutXml.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutXml.php?rev=791488&r1=791487&r2=791488&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutXml.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutXml.php Mon Jul 6
14:18:59 2009
@@ -161,14 +161,14 @@
* true, then the file name and line number of the statement at the
* origin of the log statement will be output.
*/
- function setLocationInfo($flag) {
+ public function setLocationInfo($flag) {
$this->locationInfo = LoggerOptionConverter::toBoolean($flag, true);
}
/**
* @param boolean
*/
- function setLog4jNamespace($flag) {
+ public function setLog4jNamespace($flag) {
$this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, true);
}
Modified: incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php?rev=791488&r1=791487&r2=791488&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
(original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php Mon
Jul 6 14:18:59 2009
@@ -33,12 +33,12 @@
/**
* @var array
*/
- var $map;
+ private $map;
/**
* @var LoggerDefaultRenderer
*/
- var $defaultRenderer;
+ private $defaultRenderer;
/**
* Constructor