Improved coding standards:
* Removed closing tag (?>) from end of file - insures no spaces are output
* Replaced single-letter variable names with more understandable ones.
* Removed unused variables
git-svn-id: https://svn.apache.org/repos/asf/logging/log4php/trunk@1343601 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/php/Logger.php b/src/main/php/Logger.php
index efd6982..151c67e 100644
--- a/src/main/php/Logger.php
+++ b/src/main/php/Logger.php
@@ -569,5 +569,4 @@
private static function isInitialized() {
return self::$initialized;
}
-
}
diff --git a/src/main/php/LoggerAppender.php b/src/main/php/LoggerAppender.php
index 5fa41d6..ea0fa13 100644
--- a/src/main/php/LoggerAppender.php
+++ b/src/main/php/LoggerAppender.php
@@ -148,12 +148,12 @@
return;
}
- $f = $this->getFirstFilter();
- while($f !== null) {
- switch ($f->decide($event)) {
+ $filter = $this->getFirstFilter();
+ while($filter !== null) {
+ switch ($filter->decide($event)) {
case LoggerFilter::DENY: return;
case LoggerFilter::ACCEPT: return $this->append($event);
- case LoggerFilter::NEUTRAL: $f = $f->getNext();
+ case LoggerFilter::NEUTRAL: $filter = $filter->getNext();
}
}
$this->append($event);
diff --git a/src/main/php/LoggerConfigurable.php b/src/main/php/LoggerConfigurable.php
index 7f54e6f..af6ffa5 100644
--- a/src/main/php/LoggerConfigurable.php
+++ b/src/main/php/LoggerConfigurable.php
@@ -113,7 +113,3 @@
trigger_error("log4php: $class: $message", E_USER_WARNING);
}
}
-
-
-
-?>
\ No newline at end of file
diff --git a/src/main/php/appenders/LoggerAppenderConsole.php b/src/main/php/appenders/LoggerAppenderConsole.php
index cb938d6..dd8bfd2 100644
--- a/src/main/php/appenders/LoggerAppenderConsole.php
+++ b/src/main/php/appenders/LoggerAppenderConsole.php
@@ -82,10 +82,10 @@
* @param string $target
*/
public function setTarget($target) {
- $v = trim($target);
- if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
+ $value = trim($target);
+ if ($value == self::STDOUT || strtoupper($value) == 'STDOUT') {
$this->target = self::STDOUT;
- } elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
+ } elseif ($value == self::STDERR || strtoupper($value) == 'STDERR') {
$this->target = self::STDERR;
} else {
$target = var_export($target);
diff --git a/src/main/php/appenders/LoggerAppenderMailEvent.php b/src/main/php/appenders/LoggerAppenderMailEvent.php
index 61df9f6..f50adf8 100644
--- a/src/main/php/appenders/LoggerAppenderMailEvent.php
+++ b/src/main/php/appenders/LoggerAppenderMailEvent.php
@@ -177,7 +177,4 @@
public function setDry($dry) {
$this->setBoolean('dry', $dry);
}
-
-
-
}
diff --git a/src/main/php/appenders/LoggerAppenderMongoDB.php b/src/main/php/appenders/LoggerAppenderMongoDB.php
index c1aa2a6..17a3329 100644
--- a/src/main/php/appenders/LoggerAppenderMongoDB.php
+++ b/src/main/php/appenders/LoggerAppenderMongoDB.php
@@ -314,4 +314,3 @@
return $this->collection;
}
}
-?>
\ No newline at end of file
diff --git a/src/main/php/appenders/LoggerAppenderNull.php b/src/main/php/appenders/LoggerAppenderNull.php
index 415a213..c1c914d 100644
--- a/src/main/php/appenders/LoggerAppenderNull.php
+++ b/src/main/php/appenders/LoggerAppenderNull.php
@@ -42,4 +42,3 @@
public function append(LoggerLoggingEvent $event) {
}
}
-
diff --git a/src/main/php/appenders/LoggerAppenderPDO.php b/src/main/php/appenders/LoggerAppenderPDO.php
index 6905a12..9c9ab06 100644
--- a/src/main/php/appenders/LoggerAppenderPDO.php
+++ b/src/main/php/appenders/LoggerAppenderPDO.php
@@ -283,4 +283,3 @@
return $this->setString('dsn', $dsn);
}
}
-
diff --git a/src/main/php/configurators/LoggerConfigurationAdapter.php b/src/main/php/configurators/LoggerConfigurationAdapter.php
index a9bd8fd..ab87923 100644
--- a/src/main/php/configurators/LoggerConfigurationAdapter.php
+++ b/src/main/php/configurators/LoggerConfigurationAdapter.php
@@ -37,4 +37,3 @@
}
-?>
\ No newline at end of file
diff --git a/src/main/php/configurators/LoggerConfigurationAdapterINI.php b/src/main/php/configurators/LoggerConfigurationAdapterINI.php
index 7f0725c..aaeadf8 100644
--- a/src/main/php/configurators/LoggerConfigurationAdapterINI.php
+++ b/src/main/php/configurators/LoggerConfigurationAdapterINI.php
@@ -297,4 +297,3 @@
}
-?>
\ No newline at end of file
diff --git a/src/main/php/configurators/LoggerConfigurationAdapterPHP.php b/src/main/php/configurators/LoggerConfigurationAdapterPHP.php
index 91f5fc9..3320409 100644
--- a/src/main/php/configurators/LoggerConfigurationAdapterPHP.php
+++ b/src/main/php/configurators/LoggerConfigurationAdapterPHP.php
@@ -82,4 +82,3 @@
}
}
-?>
\ No newline at end of file
diff --git a/src/main/php/configurators/LoggerConfigurationAdapterXML.php b/src/main/php/configurators/LoggerConfigurationAdapterXML.php
index 980692c..a6a90a0 100644
--- a/src/main/php/configurators/LoggerConfigurationAdapterXML.php
+++ b/src/main/php/configurators/LoggerConfigurationAdapterXML.php
Binary files differ
diff --git a/src/main/php/configurators/LoggerConfiguratorDefault.php b/src/main/php/configurators/LoggerConfiguratorDefault.php
index 495b356..cea88a8 100644
--- a/src/main/php/configurators/LoggerConfiguratorDefault.php
+++ b/src/main/php/configurators/LoggerConfiguratorDefault.php
@@ -435,7 +435,6 @@
if (isset($level)) {
$logger->setLevel($level);
} else {
- $default = $logger->getLevel();
$this->warn("Invalid level value [{$config['level']}] specified for logger [$loggerName]. Ignoring level definition.");
}
}
@@ -501,4 +500,4 @@
private function warn($message) {
trigger_error("log4php: $message", E_USER_WARNING);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/php/helpers/LoggerOptionConverter.php b/src/main/php/helpers/LoggerOptionConverter.php
index ddd90dd..00279e5 100644
--- a/src/main/php/helpers/LoggerOptionConverter.php
+++ b/src/main/php/helpers/LoggerOptionConverter.php
@@ -248,20 +248,20 @@
return $default;
}
- $s = strtoupper(trim($value));
+ $string = strtoupper(trim($value));
$multiplier = (float)1;
- if(($index = strpos($s, 'KB')) !== false) {
+ if(($index = strpos($string, 'KB')) !== false) {
$multiplier = 1024;
- $s = substr($s, 0, $index);
- } else if(($index = strpos($s, 'MB')) !== false) {
+ $string = substr($string, 0, $index);
+ } else if(($index = strpos($string, 'MB')) !== false) {
$multiplier = 1024 * 1024;
- $s = substr($s, 0, $index);
- } else if(($index = strpos($s, 'GB')) !== false) {
+ $string = substr($string, 0, $index);
+ } else if(($index = strpos($string, 'GB')) !== false) {
$multiplier = 1024 * 1024 * 1024;
- $s = substr($s, 0, $index);
+ $string = substr($string, 0, $index);
}
- if(is_numeric($s)) {
- return (float)$s * $multiplier;
+ if(is_numeric($string)) {
+ return (float)$string * $multiplier;
}
return $default;
}
diff --git a/src/main/php/renderers/LoggerRenderer.php b/src/main/php/renderers/LoggerRenderer.php
index fd16eb2..816d1f8 100644
--- a/src/main/php/renderers/LoggerRenderer.php
+++ b/src/main/php/renderers/LoggerRenderer.php
@@ -39,8 +39,8 @@
interface LoggerRenderer {
/**
* Render the entity passed as parameter as a String.
- * @param mixed $o entity to render
+ * @param mixed $input entity to render
* @return string
*/
- public function render($o);
+ public function render($input);
}
diff --git a/src/main/php/renderers/LoggerRendererDefault.php b/src/main/php/renderers/LoggerRendererDefault.php
index 1982cd1..b5f409a 100644
--- a/src/main/php/renderers/LoggerRendererDefault.php
+++ b/src/main/php/renderers/LoggerRendererDefault.php
@@ -42,10 +42,10 @@
/**
* Render objects by type casting
*
- * @param mixed $o the object to render
+ * @param mixed $input the object to render
* @return string
*/
- public function render($o) {
- return var_export($o, true);
+ public function render($input) {
+ return var_export($input, true);
}
}
diff --git a/src/main/php/renderers/LoggerRendererException.php b/src/main/php/renderers/LoggerRendererException.php
index 147e8cd..4040035 100644
--- a/src/main/php/renderers/LoggerRendererException.php
+++ b/src/main/php/renderers/LoggerRendererException.php
@@ -27,15 +27,14 @@
*/
class LoggerRendererException implements LoggerRenderer {
- public function render($o) {
- $strRep = 'Throwable('.get_class($o).'): '.$o->getMessage().' in '.$o->getFile().' on line '.$o->getLine();
- $strRep .= PHP_EOL.$o->getTraceAsString();
+ public function render($input) {
+ $strRep = 'Throwable('.get_class($input).'): '.$input->getMessage().' in '.$input->getFile().' on line '.$input->getLine();
+ $strRep .= PHP_EOL.$input->getTraceAsString();
- if (method_exists($o, 'getPrevious') && $o->getPrevious() !== null) {
- $strRep .= PHP_EOL.'Caused by: '.$this->render($o->getPrevious());
+ if (method_exists($input, 'getPrevious') && $input->getPrevious() !== null) {
+ $strRep .= PHP_EOL.'Caused by: '.$this->render($input->getPrevious());
}
return $strRep;
}
}
-?>
\ No newline at end of file
diff --git a/src/main/php/renderers/LoggerRendererMap.php b/src/main/php/renderers/LoggerRendererMap.php
index 8fff083..d02eed2 100644
--- a/src/main/php/renderers/LoggerRendererMap.php
+++ b/src/main/php/renderers/LoggerRendererMap.php
@@ -47,7 +47,6 @@
private $defaultRenderer;
/**
- *
* @var LoggerRendererObject
*/
private $defaultObjectRenderer;
@@ -88,23 +87,23 @@
* Once a renderer is found, it is applied on the object <var>o</var> and
* the result is returned as a string.
*
- * @param mixed $o
+ * @param mixed $input
* @return string
*/
- public function findAndRender($o) {
- if($o == null) {
+ public function findAndRender($input) {
+ if($input == null) {
return null;
} else {
- if(is_object($o)) {
- $renderer = $this->getByObject($o);
+ if(is_object($input)) {
+ $renderer = $this->getByObject($input);
if($renderer !== null) {
- return $renderer->render($o);
+ return $renderer->render($input);
}
- return $this->defaultObjectRenderer->render($o);
+ return $this->defaultObjectRenderer->render($input);
} else {
$renderer = $this->defaultRenderer;
- return $renderer->render($o);
+ return $renderer->render($input);
}
}
}
@@ -113,11 +112,11 @@
* Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
* class of the object parameter.
*
- * @param mixed $o
+ * @param mixed $object
* @return string
*/
- public function getByObject($o) {
- return ($o == null) ? null : $this->getByClassName(get_class($o));
+ public function getByObject($object) {
+ return ($object == null) ? null : $this->getByClassName(get_class($object));
}
@@ -131,10 +130,10 @@
* @return LoggerRendererObject
*/
public function getByClassName($class) {
- for($c = $class; !empty($c); $c = get_parent_class($c)) {
- $c = strtolower($c);
- if(isset($this->map[$c])) {
- return $this->map[$c];
+ for(; !empty($class); $class = get_parent_class($class)) {
+ $class = strtolower($class);
+ if(isset($this->map[$class])) {
+ return $this->map[$class];
}
}
return null;
@@ -145,12 +144,12 @@
}
/**
- * Register a {@link LoggerRendererObject} for <var>clazz</var>.
- * @param string $class
- * @param LoggerRendererObject $or
+ * Register a {@link LoggerRendererObject}.
+ * @param string $class Class which to render.
+ * @param LoggerRendererObject $renderer
*/
- private function put($class, $or) {
- $this->map[strtolower($class)] = $or;
+ private function put($class, $renderer) {
+ $this->map[strtolower($class)] = $renderer;
}
public function setDefaultObjectRenderer($renderer) {
diff --git a/src/main/php/renderers/LoggerRendererObject.php b/src/main/php/renderers/LoggerRendererObject.php
index 08dbc6a..0ad21d3 100644
--- a/src/main/php/renderers/LoggerRendererObject.php
+++ b/src/main/php/renderers/LoggerRendererObject.php
@@ -33,5 +33,3 @@
return print_r($o, true);
}
}
-
-?>
\ No newline at end of file
