mirror_php/php-toml
1
0
Fork 0
mirror of https://github.com/leonelquinteros/php-toml.git synced 2025-01-17 04:18:17 +01:00
Code Issues Releases Wiki Activity

Merge pull request #17 from JochenHeizmann/fix-nested-inline-tables-inside-array

Browse Source 
FIXED When using inline tables inside arrays an error was thrown
This commit is contained in:
Leonel Quinteros 2019-07-10 18:06:18 -03:00 committed by GitHub
commit 60d6d7cbc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Toml.php
View File

@ -616,6 +616,7 @@ class Toml
$result = array();
$openBrackets = 0;
$openString = false;
$openCurlyBraces = 0;
$openLString = false;
$buffer = '';
@ -659,14 +660,26 @@ class Toml
elseif($val[$i] == "'" && !$openString) {
$openLString = !$openLString;
}
if( $val[$i] == ',' && !$openString && !$openLString && $openBrackets == 1)
elseif($val[$i] == "{" && !$openString && !$openLString) {
$openCurlyBraces++;
}
elseif($val[$i] == "}" && !$openString && !$openLString) {
$openCurlyBraces--;
}
if( ($val[$i] == ',' || $val[$i] == '}') && !$openString && !$openLString && $openBrackets == 1 && $openCurlyBraces == 0)
{
$result[] = self::parseValue( trim($buffer) );
if ($val[$i] == '}') {
$buffer .= $val[$i];
}
if (!self::checkDataType($result))
{
throw new Exception('Data types cannot be mixed in an array: ' . $buffer);
if (!empty(trim($buffer))) {
$result[] = self::parseValue( trim($buffer) );
if (!self::checkDataType($result))
{
throw new Exception('Data types cannot be mixed in an array: ' . $buffer);
}
}
$buffer = '';
}
@ -698,6 +711,7 @@ class Toml
$result = new stdClass();
$openString = false;
$openLString = false;
$openBrackets = 0;
$buffer = '';
$strLen = strlen($val);
@ -711,8 +725,14 @@ class Toml
elseif($val[$i] == "'") {
$openLString = !$openLString;
}
elseif($val[$i] == "[" && !$openString && !$openLString) {
$openBrackets++;
}
elseif($val[$i] == "]" && !$openString && !$openLString) {
$openBrackets--;
}
if( $val[$i] == ',' && !$openString && !$openLString )
if( $val[$i] == ',' && !$openString && !$openLString && $openBrackets == 0)
{
// Parse buffer
$kv = explode('=', $buffer, 2);