summaryrefslogtreecommitdiffstats
path: root/src/Components/ArrayObj.php
diff options
context:
space:
mode:
authorDan Ungureanu <udan1107@gmail.com>2015-08-18 02:24:42 +0300
committerDan Ungureanu <udan1107@gmail.com>2015-08-18 02:24:42 +0300
commit14c54da98c3b4f18c78ff44c22fbdd20e8ef6e18 (patch)
treea4604f6b1d1095790e313b71bf226e4291788ca8 /src/Components/ArrayObj.php
parent1568adba1af7bf061354a30afd169e29fa43f133 (diff)
downloadsql-parser-14c54da98c3b4f18c78ff44c22fbdd20e8ef6e18.zip
sql-parser-14c54da98c3b4f18c78ff44c22fbdd20e8ef6e18.tar.gz
sql-parser-14c54da98c3b4f18c78ff44c22fbdd20e8ef6e18.tar.bz2
Replaced explicit calls to Component::build() with implicit calls to Component::__toString().
Fixed bugs that caused field names like '0', '0.0', etc. to be considered invalid. Refactoring.
Diffstat (limited to 'src/Components/ArrayObj.php')
-rw-r--r--src/Components/ArrayObj.php19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php
index 0e0b183..d3017fa 100644
--- a/src/Components/ArrayObj.php
+++ b/src/Components/ArrayObj.php
@@ -136,7 +136,6 @@ class ArrayObj extends Component
break;
}
}
-
}
return $ret;
@@ -150,21 +149,11 @@ class ArrayObj extends Component
public static function build($component)
{
if (is_array($component)) {
- $values = array();
- foreach ($component as $c) {
- $values[] = static::build($c);
- }
- return implode(', ', $values);
+ return implode(', ', $component);
+ } elseif (!empty($component->raw)) {
+ return '(' . implode(', ', $component->raw) . ')';
} else {
- $values = array();
- if (!empty($component->raw)) {
- $values = $component->raw;
- } else {
- foreach ($component->values as $value) {
- $values[] = $value;
- }
- }
- return '(' . implode(', ', $values) . ')';
+ return '(' . implode(', ', $component->values) . ')';
}
}
}