Permalink
Browse files

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

  • Loading branch information...
2 parents 12c7380 + 8630f4c commit 843f7e3eeff498c96712e575fcabfec1f3c752e5 @lorenzo lorenzo committed Sep 4, 2011
@@ -46,3 +46,5 @@
$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 */
@@ -7124,7 +7124,7 @@ public function testMultibyteStrtolower() {
$string = 'ԀԂԄԆԈԊԌԎԐԒ';
$result = Multibyte::strtolower($string);
- $expected = 'ԁԃԅԇԉԋԍԏԐԒ';
+ $expected = 'ԁԃԅԇԉԋԍԏԑԓ';
$this->assertEqual($expected, $result);
$string = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖև';
@@ -89,9 +89,8 @@ public function testExcerpt() {
$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));

0 comments on commit 843f7e3

Please sign in to comment.