Skip to content

[ExpressionLanguage] Move the ::dump method to the Node classe to ease its usage #19722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2016
Merged

[ExpressionLanguage] Move the ::dump method to the Node classe to ease its usage #19722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Symfony/Component/ExpressionLanguage/Node/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@ public function toArray()
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\"\\"));
Expand Down
16 changes: 0 additions & 16 deletions src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,4 @@ public function getNodes()
{
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;
}
}
4 changes: 1 addition & 3 deletions src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -43,8 +42,7 @@ abstract public function getCompileData();
*/
public function testDump($expected, $node)
{
$expr = new ParsedExpression($expected, $node);
$this->assertSame($expected, $expr->dump());
$this->assertSame($expected, $node->dump());
}

abstract public function getDumpData();
Expand Down