diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php index bf5a4b1792..5e8902713f 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php @@ -81,6 +81,17 @@ class Node throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', get_class($this))); } + public function dump() + { + $dump = ''; + + foreach ($this->toArray() as $v) { + $dump .= is_scalar($v) ? $v : $v->dump(); + } + + return $dump; + } + protected function dumpString($value) { return sprintf('"%s"', addcslashes($value, "\0\t\"\\")); diff --git a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php index c244e8a4a6..61bf5807c4 100644 --- a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php +++ b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php @@ -39,20 +39,4 @@ class ParsedExpression extends Expression { return $this->nodes; } - - public function dump() - { - return $this->dumpNode($this->nodes); - } - - private function dumpNode(Node $node) - { - $dump = ''; - - foreach ($node->toArray() as $v) { - $dump .= is_scalar($v) ? $v : $this->dumpNode($v); - } - - return $dump; - } } diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php index 68de73dc36..4ddd10a159 100644 --- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php +++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\ExpressionLanguage\Tests\Node; use Symfony\Component\ExpressionLanguage\Compiler; -use Symfony\Component\ExpressionLanguage\ParsedExpression; abstract class AbstractNodeTest extends \PHPUnit_Framework_TestCase { @@ -43,8 +42,7 @@ abstract class AbstractNodeTest extends \PHPUnit_Framework_TestCase */ public function testDump($expected, $node) { - $expr = new ParsedExpression($expected, $node); - $this->assertSame($expected, $expr->dump()); + $this->assertSame($expected, $node->dump()); } abstract public function getDumpData();