cvs: pear /PHPUnit2 package.xml /PHPUnit2/Framework Assert.php

sebastian Tue Oct 5 08:02:15 2004 EDT Modified files: /pear/PHPUnit2 package.xml /pear/PHPUnit2/Framework Assert.php Log: Fix bug #2460. http://cvs.php.net/diff.php/pear/PHPUnit2/package.xml?r1=1.59&r2=1.60&ty=u Index: pear/PHPUnit2/package.xml diff -u pear/PHPUnit2/package.xml:1.59 pear/PHPUnit2/package.xml:1.60 --- pear/PHPUnit2/package.xml:1.59 Sat Oct 2 14:33:50 2004 +++ pear/PHPUnit2/package.xml Tue Oct 5 08:02:13 2004 @@ -173,6 +173,16 @@ </release> <changelog> <release> + <version>2.1.2</version> + <state>stable</state> + <date>2004-10-DD</date> + <notes> +<![CDATA[ +* Fixed bug #2460 (assertContains should return message on line 2). +]]> + </notes> + </release> + <release> <version>2.1.1</version> <state>stable</state> <date>2004-09-30</date> http://cvs.php.net/diff.php/pear/PHPUnit2/Framework/Assert.php?r1=1.15&r2=1.16&ty=u Index: pear/PHPUnit2/Framework/Assert.php diff -u pear/PHPUnit2/Framework/Assert.php:1.15 pear/PHPUnit2/Framework/Assert.php:1.16 --- pear/PHPUnit2/Framework/Assert.php:1.15 Fri Oct 1 02:11:28 2004 +++ pear/PHPUnit2/Framework/Assert.php Tue Oct 5 08:02:15 2004 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: Assert.php,v 1.15 2004/10/01 06:11:28 sebastian Exp $ +// $Id: Assert.php,v 1.16 2004/10/05 12:02:15 sebastian Exp $ // require_once 'PHPUnit2/Framework/AssertionFailedError.php'; @@ -64,7 +64,7 @@ */ public static function assertContains($needle, $haystack, $message = '') { if (is_string($needle) && is_string($haystack)) { - self::assertTrue(strpos($haystack, $needle) !== FALSE ? TRUE : FALSE); + self::assertTrue(strpos($haystack, $needle) !== FALSE ? TRUE : FALSE, $message); } else if (is_array($haystack)) {