adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 10:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed another String::tokenize bug, closes #4627

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6852 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
the_undefined 2008-05-13 21:22:10 +00:00
parent 2334a27f51
commit 3db8b860d1
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cake/libs/string.php
View file

@ -138,6 +138,7 @@ class String extends Object {
$buffer = ''; $buffer = '';
$results = array(); $results = array();
$length = strlen($data); $length = strlen($data);
$open = false;
while ($offset <= $length) { while ($offset <= $length) {
$tmpOffset = -1; $tmpOffset = -1;
@ -155,10 +156,23 @@ class String extends Object {
} else { } else {
$buffer .= $data{$tmpOffset}; $buffer .= $data{$tmpOffset};
} }
if ($data{$tmpOffset} == $leftBound) { if ($leftBound != $rightBound) {
$depth++; if ($data{$tmpOffset} == $leftBound) {
} elseif ($data{$tmpOffset} == $rightBound) { $depth++;
$depth--; }
if ($data{$tmpOffset} == $rightBound) {
$depth--;
}
} else {
if ($data{$tmpOffset} == $leftBound) {
if (!$open) {
$depth++;
$open = true;
} else {
$depth--;
$open = false;
}
}
} }
$offset = ++$tmpOffset; $offset = ++$tmpOffset;
} else { } else {

4
cake/tests/cases/libs/string.test.php
View file

@ -133,6 +133,10 @@ class StringTest extends UnitTestCase {
$result = String::tokenize('"single tag"', ' ', '"', '"'); $result = String::tokenize('"single tag"', ' ', '"', '"');
$expected = array('"single tag"'); $expected = array('"single tag"');
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = String::tokenize('tagA "single tag" tagB', ' ', '"', '"');
$expected = array('tagA', '"single tag"', 'tagB');
$this->assertEqual($expected, $result);
} }
} }
?> ?>