diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch eriksencosta/cs-fixes (PR #3816)

Browse Source 
Commits
-------

abd59c3 Merge branch 'master' into cs-fixes
f5f0506 [TwigBundle] fixed CS

Discussion
----------

CS fixes
This commit is contained in:
Fabien Potencier 2012-04-07 09:04:09 +02:00
commit 0a585b7130
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -216,9 +216,9 @@ class FormExtension extends \Twig_Extension
protected function render(FormView $view, $section, array $variables = array())
{
$mainTemplate = in_array($section, array('widget', 'row'));
if ($mainTemplate && $view->isRendered()) {
return '';
if ($mainTemplate && $view->isRendered()) {
return '';
}
if (null === $this->template) {
@ -240,7 +240,7 @@ class FormExtension extends \Twig_Extension
$types = $view->get('types');
$types[] = $custom;
$typeIndex = count($types) - 1;
$this->varStack[$rendering] = array (
$this->varStack[$rendering] = array(
'variables' => array_replace_recursive($view->all(), $variables),
'types' => $types,
);
@ -250,7 +250,6 @@ class FormExtension extends \Twig_Extension
$types[$typeIndex] .= '_'.$section;
if (isset($blocks[$types[$typeIndex]])) {
$this->varStack[$rendering]['typeIndex'] = $typeIndex;
// we do not call renderBlock here to avoid too many nested level calls (XDebug limits the level to 100 by default)
@ -331,7 +330,6 @@ class FormExtension extends \Twig_Extension
protected function getBlocks(FormView $view)
{
if (!$this->blocks->contains($view)) {
$rootView = !$view->hasParent();
$templates = $rootView ? $this->resources : array();
@ -346,6 +344,7 @@ class FormExtension extends \Twig_Extension
if (!$template instanceof \Twig_Template) {
$template = $this->environment->loadTemplate($template);
}
$templateBlocks = array();
do {
$templateBlocks = array_merge($template->getBlocks(), $templateBlocks);