Author: kurdalen
Date: Mon May 4 20:44:29 2009
New Revision: 771436
URL: http://svn.apache.org/viewvc?rev=771436&view=rev
Log:
more fixes to #LOG4PHP-39
Modified:
incubator/log4php/trunk/CHANGELOG
incubator/log4php/trunk/src/main/php/Logger.php
incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
Modified: incubator/log4php/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/CHANGELOG?rev=771436&r1=771435&r2=771436&view=diff
==============================================================================
--- incubator/log4php/trunk/CHANGELOG (original)
+++ incubator/log4php/trunk/CHANGELOG Mon May 4 20:44:29 2009
@@ -28,6 +28,7 @@
- Enh #34: Remove all internal debugging (Christian Grobmeier)
- Enh #35: Replace LOG4PHP_LINE_SEP with PHP_EOL (Knut Urdalen)
- Enh #38: Replace is_a() with instanceof (Knut Urdalen)
+- Enh #39: Remove deprecated methods (Knut Urdalen)
- Enh: Initial port to PHP 5 (Knut Urdalen)
- Enh: Established new unit test suite (Knut Urdalen)
- Enh: Added a range of examples (Knut Urdalen)
Modified: incubator/log4php/trunk/src/main/php/Logger.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/Logger.php?rev=771436&r1=771435&r2=771436&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/Logger.php (original)
+++ incubator/log4php/trunk/src/main/php/Logger.php Mon May 4 20:44:29 2009
@@ -149,17 +149,6 @@
}
/**
- * Deprecated. Please use LoggerManager::exists() instead.
- *
- * @param string $name
- * @see LoggerManager::exists()
- * @deprecated
- */
- public function exists($name) {
- return LoggerManager::exists($name);
- }
-
- /**
* Log a message object with the FATAL level including the caller.
*
* @param mixed $message message
@@ -215,39 +204,7 @@
public function getAppender($name) {
return $this->aai[$name];
}
-
- /**
- * Please use the {...@link getEffectiveLevel()} method instead.
- * @deprecated
- */
- public function getChainedPriority() {
- return $this->getEffectiveLevel();
- }
-
- /**
- * Please use {...@link LoggerManager::getCurrentLoggers()} instead.
- * @deprecated
- */
- public function getCurrentCategories() {
- return LoggerManager::getCurrentLoggers();
- }
-
- /**
- * Please use {...@link LoggerManager::getLoggerRepository()} instead.
- * @deprecated
- */
- public function getDefaultHierarchy() {
- return LoggerManager::getLoggerRepository();
- }
-
- /**
- * @deprecated Use {...@link getLoggerRepository()}
- * @return LoggerHierarchy
- */
- public function getHierarchy() {
- return $this->getLoggerRepository();
- }
-
+
/**
* Starting from this category, search the category hierarchy for a
non-null level and return it.
* @see LoggerLevel
@@ -312,14 +269,6 @@
public function getParent() {
return $this->parent;
}
-
- /**
- * Please use getLevel() instead.
- * @deprecated
- */
- public function getPriority() {
- return $this->getLevel();
- }
/**
* Return the inherited ResourceBundle for this category.
@@ -503,15 +452,7 @@
*/
public function setResourceBundle($bundle) {
return;
- }
-
- /**
- * @deprecated use {...@link LoggerManager::shutdown()} instead.
- * @see LoggerManager::shutdown()
- */
- public function shutdown() {
- LoggerManager::shutdown();
- }
+ }
/**
* Log a message with the WARN level.
Modified: incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerHierarchy.php?rev=771436&r1=771435&r2=771436&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerHierarchy.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerHierarchy.php Mon May 4
20:44:29 2009
@@ -148,14 +148,7 @@
public function fireAddAppenderEvent($logger, $appender) {
return;
}
-
- /**
- * @deprecated Please use {...@link getCurrentLoggers()} instead.
- */
- public function getCurrentCategories() {
- return $this->getCurrentLoggers();
- }
-
+
/**
* Returns all the currently defined categories in this hierarchy as an
array.
* @return array
@@ -245,13 +238,6 @@
}
/**
- * @deprecated Deprecated with no replacement.
- */
- public function overrideAsNeeded($override) {
- return;
- }
-
- /**
* Reset all values contained in this hierarchy instance to their
* default.
*
@@ -282,13 +268,6 @@
}
$this->rendererMap->clear();
}
-
- /**
- * @deprecated Deprecated with no replacement.
- */
- public function setDisableOverride($override) {
- return;
- }
/**
* Used by subclasses to add a renderer to the hierarchy passed as
parameter.
