Author: grobmeier
Date: Sun Jul 5 17:47:35 2009
New Revision: 791281
URL: http://svn.apache.org/viewvc?rev=791281&view=rev
Log:
removed PHP4 references, used PHP5 symbol referencing
Modified:
incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Modified: incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerHierarchy.php?rev=791281&r1=791280&r2=791281&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerHierarchy.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerHierarchy.php Sun Jul 5
17:47:35 2009
@@ -131,7 +131,7 @@
* @param LoggerFactory $factory a {...@link LoggerFactory} instance or
null
* @return Logger
*/
- public function &getLogger($name, $factory = null) {
+ public function getLogger($name, $factory = null) {
if($factory === null) {
$factory = $this->defaultFactory;
}
Modified:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php?rev=791281&r1=791280&r2=791281&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Sun Jul 5 17:47:35 2009
@@ -212,16 +212,6 @@
)
);
}
- /*
- * TODO: Remove due to LOG4PHP-34
- if (isset($attribs['DEBUG'])) {
- $debug =
LoggerOptionConverter::toBoolean($this->subst($attribs['DEBUG']),
LoggerLog::internalDebugging());
- $this->repository->debug = $debug;
- LoggerLog::internalDebugging($debug);
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen()
LOG4PHP:CONFIGURATION. Internal Debug turned ".($debug ? 'on':'off'));
-
- }
- */
break;
case 'APPENDER' :
@@ -286,7 +276,7 @@
if (!empty($loggerName)) {
$class = $this->subst(@$attribs['CLASS']);
if (empty($class)) {
- $this->logger =&
$this->repository->getLogger($loggerName);
+ $this->logger =
$this->repository->getLogger($loggerName);
} else {
$className = basename($class);
if (!class_exists($className)) {
@@ -298,7 +288,7 @@
} else {
if (in_array('getlogger',
get_class_methods($className))) {
- $this->logger =&
call_user_func(array($className, 'getlogger'), $loggerName);
+ $this->logger =
call_user_func(array($className, 'getlogger'), $loggerName);
} else {
// TODO throw exception?
/*
