Skip to content
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

Jump to bottom

Fix the configurability of CoreExtension deps in standalone usage #30979

Merged
merged 1 commit into from Apr 7, 2019
Merged

Fix the configurability of CoreExtension deps in standalone usage #30979

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Form/Extension/Core/CoreExtension.php
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ protected function loadTypes()
new Type\TimeType(),
new Type\TimezoneType(),
new Type\UrlType(),
new Type\FileType(),
new Type\FileType($this->translator),
new Type\ButtonType(),
new Type\SubmitType(),
new Type\ResetType(),
Expand Down
27 changes: 27 additions & 0 deletions src/Symfony/Component/Form/FormFactoryBuilder.php
View file
Open in desktop
Expand Up @@ -11,13 +11,17 @@

namespace Symfony\Component\Form;

use Symfony\Component\Form\Extension\Core\CoreExtension;

/**
* The default implementation of FormFactoryBuilderInterface.
*
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class FormFactoryBuilder implements FormFactoryBuilderInterface
{
private $forceCoreExtension;

/**
* @var ResolvedFormTypeFactoryInterface
*/
Expand All @@ -43,6 +47,14 @@ class FormFactoryBuilder implements FormFactoryBuilderInterface
*/
private $typeGuessers = [];

/**
* @param bool $forceCoreExtension
*/
public function __construct($forceCoreExtension = false)
Copy link
Member

@chalasr chalasr Apr 7, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

phpdoc should be replaced by a typehint when merging up to master

{
$this->forceCoreExtension = $forceCoreExtension;
}

/**
* {@inheritdoc}
*/
Expand Down Expand Up @@ -144,6 +156,21 @@ public function getFormFactory()
{
$extensions = $this->extensions;

if ($this->forceCoreExtension) {
$hasCoreExtension = false;

foreach ($extensions as $extension) {
if ($extension instanceof CoreExtension) {
xabbuh marked this conversation as resolved.
Show resolved Hide resolved
$hasCoreExtension = true;
break;
}
}

if (!$hasCoreExtension) {
array_unshift($extensions, new CoreExtension());
}
}

if (\count($this->types) > 0 || \count($this->typeExtensions) > 0 || \count($this->typeGuessers) > 0) {
if (\count($this->typeGuessers) > 1) {
$typeGuesser = new FormTypeGuesserChain($this->typeGuessers);
Expand Down
7 changes: 1 addition & 6 deletions src/Symfony/Component/Form/Forms.php
View file
Open in desktop
Expand Up @@ -11,8 +11,6 @@

namespace Symfony\Component\Form;

use Symfony\Component\Form\Extension\Core\CoreExtension;

/**
* Entry point of the Form component.
*
Expand Down Expand Up @@ -105,10 +103,7 @@ public static function createFormFactory()
*/
public static function createFormFactoryBuilder()
{
$builder = new FormFactoryBuilder();
$builder->addExtension(new CoreExtension());

return $builder;
return new FormFactoryBuilder(true);
}

/**
Expand Down