8000 [Form] Alternate syntax for form_theme by vicb · Pull Request #3576 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] Alternate syntax for form_theme #3576

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
Mar 15, 2012
Merged

[Form] Alternate syntax for form_theme #3576

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
8 changes: 4 additions & 4 deletions src/Symfony/Bridge/Twig/Extension/FormExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ public function initRuntime(\Twig_Environment $environment)
/**
* Sets a theme for a given view.
*
* @param FormView $view A FormView instance
* @param array $resources An array of resources
* @param FormView $view A FormView instance
* @param array|string $resources An array of resource names|a resource name
*/
public function setTheme(FormView $view, array $resources)
public function setTheme(FormView $view, $resources)
{
$this->themes->attach($view, $resources);
$this->themes->attach($view, (array) $resources);
$this->blocks = new \SplObjectStorage();
}

Expand Down
13 changes: 3 additions & 10 deletions src/Symfony/Bridge/Twig/Node/FormThemeNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@ public function compile(\Twig_Compiler $compiler)
->addDebugInfo($this)
->write('echo $this->env->getExtension(\'form\')->setTheme(')
->subcompile($this->getNode('form'))
->raw(', array(')
->raw(', ')
->subcompile($this->getNode('resources'))
->raw(");\n");
;

foreach ($this->getNode('resources') as $resource) {
$compiler
->subcompile($resource)
->raw(', ')
;
}

$compiler->raw("));\n");
}
}
16 changes: 11 additions & 5 deletions src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,20 @@ public function parse(\Twig_Token $token)
$stream = $this->parser->getStream();

$form = $this->parser->getExpressionParser()->parseExpression();
$resources = array();
do {
$resources[] = $this->parser->getExpressionParser()->parseExpression();
} while (!$stream->test(\Twig_Token::BLOCK_END_TYPE));

if ($this->parser->getStream()->test(\Twig_Token::NAME_TYPE, 'with')) {
$this->parser->getStream()->next();
$resources = $this->parser->getExpressionParser()->parseExpression();
} else {
$resources = new \Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
do {
$resources->addElement($this->parser->getExpressionParser()->parseExpression());
} while (!$stream->test(\Twig_Token::BLOCK_END_TYPE));
}

$stream->expect(\Twig_Token::BLOCK_END_TYPE);

return new FormThemeNode($form, new \Twig_Node($resources), $lineno, $this->getTag());
return new FormThemeNode($form, $resources, $lineno, $this->getTag());
}

/**
Expand Down
20 changes: 17 additions & 3 deletions tests/Symfony/Tests/Bridge/Twig/Node/FormThemeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,32 @@ public function testConstructor()
public function testCompile()
{
$form = new \Twig_Node_Expression_Name('form', 0);
$resources = new \Twig_Node(array(
$resources = new \Twig_Node_Expression_Array(array(
new \Twig_Node_Expression_Constant(0, 0),
new \Twig_Node_Expression_Constant('tpl1', 0),
new \Twig_Node_Expression_Constant(1, 0),
new \Twig_Node_Expression_Constant('tpl2', 0)
));
), 0);

$node = new FormThemeNode($form, $resources, 0);

$compiler = new \Twig_Compiler(new \Twig_Environment());

$this->assertEquals(
sprintf(
'echo $this->env->getExtension(\'form\')->setTheme(%s, array("tpl1", "tpl2", ));',
'echo $this->env->getExtension(\'form\')->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"));',
$this->getVariableGetter('form')
),
trim($compiler->compile($node)->getSource())
);

$resources = new \Twig_Node_Expression_Constant('tpl1', 0);

$node = new FormThemeNode($form, $resources, 0);

$this->assertEquals(
sprintf(
'echo $this->env->getExtension(\'form\')->setTheme(%s, "tpl1");',
$this->getVariableGetter('form')
),
trim($compiler->compile($node)->getSource())
Expand Down
46 changes: 42 additions & 4 deletions tests/Symfony/Tests/Bridge/Twig/TokenParser/FormThemeTokenParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ public function getTestsForFormTheme()
'{% form_theme form "tpl1" %}',
new FormThemeNode(
new \Twig_Node_Expression_Name('form', 1),
new \Twig_Node(array(
new \Twig_Node_Expression_Array(array(
new \Twig_Node_Expression_Constant(0, 1),
new \Twig_Node_Expression_Constant('tpl1', 1),
)),
), 1),
1,
'form_theme'
)
Expand All @@ -57,10 +58,47 @@ public function getTestsForFormTheme()
'{% form_theme form "tpl1" "tpl2" %}',
new FormThemeNode(
new \Twig_Node_Expression_Name('form', 1),
new \Twig_Node(array(
new \Twig_Node_Expression_Array(array(
new \Twig_Node_Expression_Constant(0, 1),
new \Twig_Node_Expression_Constant('tpl1', 1),
new \Twig_Node_Expression_Constant(1, 1),
new \Twig_Node_Expression_Constant('tpl2', 1)
)),
), 1),
1,
'form_theme'
)
),
array(
'{% form_theme form with "tpl1" %}',
new FormThemeNode(
new \Twig_Node_Expression_Name('form', 1),
new \Twig_Node_Expression_Constant('tpl1', 1),
1,
'form_theme'
)
),
array(
'{% form_theme form with ["tpl1"] %}',
new FormThemeNode(
new \Twig_Node_Expression_Name('form', 1),
new \Twig_Node_Expression_Array(array(
new \Twig_Node_Expression_Constant(0, 1),
new \Twig_Node_Expression_Constant('tpl1', 1),
), 1),
1,
'form_theme'
)
),
array(
'{% form_theme form with ["tpl1", "tpl2"] %}',
new FormThemeNode(
new \Twig_Node_Expression_Name('form', 1),
new \Twig_Node_Expression_Array(array(
new \Twig_Node_Expression_Constant(0, 1),
new \Twig_Node_Expression_Constant('tpl1', 1),
new \Twig_Node_Expression_Constant(1, 1),
new \Twig_Node_Expression_Constant('tpl2', 1)
), 1),
1,
'form_theme'
)
Expand Down
0