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

[Form] Add useDefaultThemes flag to the interfaces

Browse Source
This commit is contained in:
Edi Modrić 2017-10-19 17:12:11 +02:00
parent b935b93c7a
commit c22d783696
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UPGRADE-4.0.md
View File

@ -326,6 +326,8 @@ Form
}
```
* `FormRendererInterface::setTheme` and `FormRendererEngineInterface::setTheme` have a new optional argument `$useDefaultThemes` with a default value set to `true`.
FrameworkBundle
---------------

6
src/Symfony/Component/Form/AbstractRendererEngine.php
View File

@ -62,15 +62,13 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
/**
* {@inheritdoc}
*/
public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */)
public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
{
$cacheKey = $view->vars[self::CACHE_KEY_VAR];
// Do not cast, as casting turns objects into arrays of properties
$this->themes[$cacheKey] = is_array($themes) ? $themes : array($themes);
$args = func_get_args();
$this->useDefaultThemes[$cacheKey] = isset($args[2]) ? (bool) $args[2] : true;
$this->useDefaultThemes[$cacheKey] = (bool) $useDefaultThemes;
// Unset instead of resetting to an empty array, in order to allow
// implementations (like TwigRendererEngine) to check whether $cacheKey

5
src/Symfony/Component/Form/FormRenderer.php
View File

@ -70,10 +70,9 @@ class FormRenderer implements FormRendererInterface
/**
* {@inheritdoc}
*/
public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */)
public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
{
$args = func_get_args();
$this->engine->setTheme($view, $themes, isset($args[2]) ? (bool) $args[2] : true);
$this->engine->setTheme($view, $themes, $useDefaultThemes);
}
/**

4
src/Symfony/Component/Form/FormRendererEngineInterface.php
View File

@ -25,9 +25,9 @@ interface FormRendererEngineInterface
* @param mixed $themes The theme(s). The type of these themes
* is open to the implementation.
* @param bool $useDefaultThemes If true, will use default themes specified
* in the engine, will be added to the interface in 4.0
* in the engine
*/
public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */);
public function setTheme(FormView $view, $themes, $useDefaultThemes = true);
/**
* Returns the resource for a block name.

4
src/Symfony/Component/Form/FormRendererInterface.php
View File

@ -32,9 +32,9 @@ interface FormRendererInterface
* @param mixed $themes The theme(s). The type of these themes
* is open to the implementation.
* @param bool $useDefaultThemes If true, will use default themes specified
* in the renderer, will be added to the interface in 4.0
* in the renderer
*/
public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */);
public function setTheme(FormView $view, $themes, $useDefaultThemes = true);
/**
* Renders a named block of the form theme.