You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by gr...@apache.org on 2009/05/22 16:12:46 UTC

svn commit: r777535 - in /incubator/log4php/trunk/src: main/php/configurators/LoggerConfiguratorXml.php main/php/renderers/LoggerRendererMap.php main/php/renderers/LoggerRendererObject.php test/php/renderers/LoggerRendererObjectTest.php

Author: grobmeier
Date: Fri May 22 14:12:46 2009
New Revision: 777535

URL: http://svn.apache.org/viewvc?rev=777535&view=rev
Log:
moved factory call to ReflectionUtils

Modified:
    incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
    incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
    incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php
    incubator/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php

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=777535&r1=777534&r2=777535&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php (original)
+++ incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php Fri May 22 14:12:46 2009
@@ -396,7 +396,7 @@
                 $renderingClass  = $this->subst(@$attribs['RENDERINGCLASS']);
         
                 if (!empty($renderedClass) and !empty($renderingClass)) {
-                    $renderer = LoggerRendererObject::factory($renderingClass);
+                    $renderer = LoggerReflectionUtils::createObject($renderingClass);
                     if ($renderer === null) {
                         // LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'
                     } else { 

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=777535&r1=777534&r2=777535&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php (original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php Fri May 22 14:12:46 2009
@@ -58,7 +58,7 @@
 	 * @static
 	 */
 	public static function addRenderer($repository, $renderedClassName, $renderingClassName) {
-		$renderer = LoggerRendererObject::factory($renderingClassName);
+		$renderer = LoggerReflectionUtils::createObject($renderingClassName);
 		if($renderer == null) {
 			return;
 		} else {

Modified: incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php?rev=777535&r1=777534&r2=777535&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php (original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php Fri May 22 14:12:46 2009
@@ -30,19 +30,6 @@
  * @since 0.3
  */
 abstract class LoggerRendererObject {
-
-	/**
-	 * @param string $class classname
-	 * @return LoggerRendererObject create LoggerRendererObject instances
-	 */
-	public static function factory($class) {
-		if(!empty($class)) {
-			$class = basename($class);
-			return new $class();
-		}
-		return null;
-	}
-
 	/**
 	 * Render the entity passed as parameter as a String.
 	 * @param mixed $o entity to render

Modified: incubator/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php?rev=777535&r1=777534&r2=777535&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php (original)
+++ incubator/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php Fri May 22 14:12:46 2009
@@ -26,7 +26,7 @@
 class LoggerRendererObjectTest extends PHPUnit_Framework_TestCase {
 
 	public function testFactory() {
-		$renderer = LoggerRendererObject::factory('LoggerRendererDefault');
+		$renderer = LoggerReflectionUtils::createObject('LoggerRendererDefault');
 		self::assertType('LoggerRendererDefault', $renderer);
 	}