Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

This commit is contained in:
Jose Lorenzo Rodriguez 2011-09-03 21:08:50 -04:30
commit 843f7e3eef
3 changed files with 5 additions and 4 deletions

View file

@ -46,3 +46,5 @@ $config['0500_052f'][] = array('upper' => 1288, 'status' => 'C', 'lower' => arra
$config['0500_052f'][] = array('upper' => 1290, 'status' => 'C', 'lower' => array(1291)); /* CYRILLIC CAPITAL LETTER KOMI NJE */
$config['0500_052f'][] = array('upper' => 1292, 'status' => 'C', 'lower' => array(1293)); /* CYRILLIC CAPITAL LETTER KOMI SJE */
$config['0500_052f'][] = array('upper' => 1294, 'status' => 'C', 'lower' => array(1295)); /* CYRILLIC CAPITAL LETTER KOMI TJE */
$config['0500_052f'][] = array('upper' => 1296, 'status' => 'C', 'lower' => array(1297)); /* CYRILLIC CAPITAL LETTER ZE */
$config['0500_052f'][] = array('upper' => 1298, 'status' => 'C', 'lower' => array(1299)); /* CYRILLIC CAPITAL LETTER El with hook */

View file

@ -7124,7 +7124,7 @@ mb_strtolower does not work for these strings.
$string = 'ԀԂԄԆԈԊԌԎԐԒ';
$result = Multibyte::strtolower($string);
$expected = 'ԁԃԅԇԉԋԍԏԐԒ';
$expected = 'ԁԃԅԇԉԋԍԏԑԓ';
$this->assertEqual($expected, $result);
$string = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖև';

View file

@ -89,9 +89,8 @@ class DebuggerTest extends CakeTestCase {
$this->assertTrue(is_array($result));
$this->assertEqual(count($result), 4);
$expected = '<code><span style="color: #000000">&lt;?php';
$expected .= '</span></code>';
$this->assertEqual($result[0], $expected);
$pattern = '/<code><span style\="color\: \#\d+">.*?&lt;\?php/';
$this->assertRegExp($pattern, $result[0]);
$return = Debugger::excerpt('[internal]', 2, 2);
$this->assertTrue(empty($return));