Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D698D9FED for ; Sun, 23 Oct 2011 14:06:32 +0000 (UTC) Received: (qmail 10353 invoked by uid 500); 23 Oct 2011 14:06:32 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 10329 invoked by uid 500); 23 Oct 2011 14:06:32 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 10322 invoked by uid 99); 23 Oct 2011 14:06:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Oct 2011 14:06:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Oct 2011 14:06:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 987E523888EA; Sun, 23 Oct 2011 14:06:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1187885 - in /logging/log4php/trunk/src: main/php/helpers/LoggerOptionConverter.php test/php/helpers/LoggerOptionConverterTest.php Date: Sun, 23 Oct 2011 14:06:10 -0000 To: commits@logging.apache.org From: ihabunek@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111023140610.987E523888EA@eris.apache.org> Author: ihabunek Date: Sun Oct 23 14:06:10 2011 New Revision: 1187885 URL: http://svn.apache.org/viewvc?rev=1187885&view=rev Log: Improved the new conversion methods, fixed typo, more tests. Modified: logging/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php Modified: logging/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php?rev=1187885&r1=1187884&r2=1187885&view=diff ============================================================================== --- logging/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php (original) +++ logging/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php Sun Oct 23 14:06:10 2011 @@ -98,6 +98,9 @@ class LoggerOptionConverter { /** Converts $value to boolean, or throws an exception if not possible. */ public static function toBooleanEx($value) { if (isset($value)) { + if (is_bool($value)) { + return $value; + } $value = strtolower(trim($value)); if (in_array($value, self::$trueValues)) { return true; @@ -107,7 +110,7 @@ class LoggerOptionConverter { } } - throw new LoggerException("Givan value [" . var_export($value, true) . "] cannot be converted to boolean."); + throw new LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to boolean."); } /** @@ -127,13 +130,14 @@ class LoggerOptionConverter { /** Converts $value to integer, or throws an exception if not possible. */ public static function toIntegerEx($value) { - if (!empty($value)) { - if (is_numeric($value)) { - return (integer) $value; - } + if (is_integer($value)) { + return $value; + } + if (is_numeric($value)) { + return (integer) $value; } - throw new LoggerException("Givan value [" . var_export($value, true) . "] cannot be converted to integer."); + throw new LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to integer."); } /** Modified: logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php?rev=1187885&r1=1187884&r2=1187885&view=diff ============================================================================== --- logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php (original) +++ logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php Sun Oct 23 14:06:10 2011 @@ -52,12 +52,16 @@ class LoggerOptionConverterTest extends self::assertFalse(LoggerOptionConverter::toBoolean("off")); self::assertFalse(LoggerOptionConverter::toBoolean("no")); + self::assertTrue(LoggerOptionConverter::toBooleanEx(1)); self::assertTrue(LoggerOptionConverter::toBooleanEx("1")); + self::assertTrue(LoggerOptionConverter::toBooleanEx(true)); self::assertTrue(LoggerOptionConverter::toBooleanEx("true")); self::assertTrue(LoggerOptionConverter::toBooleanEx("on")); self::assertTrue(LoggerOptionConverter::toBooleanEx("yes")); + self::assertFalse(LoggerOptionConverter::toBooleanEx(0)); self::assertFalse(LoggerOptionConverter::toBooleanEx("0")); + self::assertFalse(LoggerOptionConverter::toBooleanEx(false)); self::assertFalse(LoggerOptionConverter::toBooleanEx("false")); self::assertFalse(LoggerOptionConverter::toBooleanEx("off")); self::assertFalse(LoggerOptionConverter::toBooleanEx("no")); @@ -66,7 +70,7 @@ class LoggerOptionConverterTest extends /** * Test fail on NULL. * @expectedException LoggerException - * @expectedExceptionMessage Givan value [NULL] cannot be converted to boolean. + * @expectedExceptionMessage Given value [NULL] cannot be converted to boolean. */ public function testToBooleanFailure1() { LoggerOptionConverter::toBooleanEx(null); @@ -75,7 +79,7 @@ class LoggerOptionConverterTest extends /** * Test fail on empty string. * @expectedException LoggerException - * @expectedExceptionMessage Givan value [''] cannot be converted to boolean. + * @expectedExceptionMessage Given value [''] cannot be converted to boolean. */ public function testToBooleanFailure2() { LoggerOptionConverter::toBooleanEx(''); @@ -84,7 +88,7 @@ class LoggerOptionConverterTest extends /** * Test fail on invalid string. * @expectedException LoggerException - * @expectedExceptionMessage Givan value ['foo'] cannot be converted to boolean. + * @expectedExceptionMessage Given value ['foo'] cannot be converted to boolean. */ public function testToBooleanFailure3() { LoggerOptionConverter::toBooleanEx('foo'); @@ -98,12 +102,17 @@ class LoggerOptionConverterTest extends self::assertSame(-10, LoggerOptionConverter::toInt('foo', -10)); self::assertSame(1, LoggerOptionConverter::toIntegerEx('1')); + self::assertSame(1, LoggerOptionConverter::toIntegerEx(1)); + self::assertSame(0, LoggerOptionConverter::toIntegerEx('0')); + self::assertSame(0, LoggerOptionConverter::toIntegerEx(0)); + self::assertSame(-1, LoggerOptionConverter::toIntegerEx('-1')); + self::assertSame(-1, LoggerOptionConverter::toIntegerEx(-1)); } /** * Test fail on NULL. * @expectedException LoggerException - * @expectedExceptionMessage Givan value [NULL] cannot be converted to integer. + * @expectedExceptionMessage Given value [NULL] cannot be converted to integer. */ public function testToIntegerFailure1() { LoggerOptionConverter::toIntegerEx(null); @@ -112,7 +121,7 @@ class LoggerOptionConverterTest extends /** * Test fail on empty string. * @expectedException LoggerException - * @expectedExceptionMessage Givan value [''] cannot be converted to integer. + * @expectedExceptionMessage Given value [''] cannot be converted to integer. */ public function testToIntegerFailure2() { LoggerOptionConverter::toIntegerEx(''); @@ -121,12 +130,30 @@ class LoggerOptionConverterTest extends /** * Test fail on invalid string. * @expectedException LoggerException - * @expectedExceptionMessage Givan value ['foo'] cannot be converted to integer. + * @expectedExceptionMessage Given value ['foo'] cannot be converted to integer. */ public function testToIntegerFailure3() { LoggerOptionConverter::toIntegerEx('foo'); } + /** + * Test fail on boolean. + * @expectedException LoggerException + * @expectedExceptionMessage Given value [true] cannot be converted to integer. + */ + public function testToIntegerFailure4() { + LoggerOptionConverter::toIntegerEx(true); + } + + /** + * Test fail on boolean. + * @expectedException LoggerException + * @expectedExceptionMessage Given value [false] cannot be converted to integer. + */ + public function testToIntegerFailure5() { + LoggerOptionConverter::toIntegerEx(false); + } + public function testSubstituteVars() { $props['OTHER_CONSTANT'] = "OTHER"; $props['MY_CONSTANT'] = "TEST";