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

[Form] Reorganized code into "form extensions"

Browse Source 
The extension classes are now the only constructor argument of the FormFactory class. They replace the existing "type loader" classes.

    new FormFactory(array(
        new CoreExtension($validator, $storage),
        new CsrfExtension($csrfProvider),
        new DoctrineOrmExtension($em),
    ));

Together with a few upcoming commits this mechanism will make

 * extension of the form framework in bundles and
 * usage of the forms outside of Symfony2

much easier.
This commit is contained in:
Bernhard Schussek 2011-04-22 17:41:21 +02:00
parent a97366fbcb
commit 54e66c518f
162 changed files with 997 additions and 815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
View File

@ -14,7 +14,7 @@ namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
use Symfony\Component\Form\Util\PropertyPath;
use Symfony\Component\Form\Exception\FormException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
use Symfony\Component\Form\Extension\Core\ChoiceList\ArrayChoiceList;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\QueryBuilder;
use Doctrine\ORM\NoResultException;

4
src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php
View File

@ -13,8 +13,8 @@ namespace Symfony\Bridge\Doctrine\Form\DataTransformer;
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Form\DataTransformer\TransformationFailedException;
use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\DataTransformerInterface;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection;

4
src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php
View File

@ -12,9 +12,9 @@
namespace Symfony\Bridge\Doctrine\Form\DataTransformer;
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
use Symfony\Component\Form\DataTransformer\TransformationFailedException;
use Symfony\Component\Form\Exception\TransformationFailedException;
class EntityToIdTransformer implements DataTransformerInterface
{

41
src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php Normal file
View File

@ -0,0 +1,41 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Bridge\Doctrine\Form;
use Symfony\Component\Form\AbstractExtension;
use Doctrine\ORM\EntityManager;
class DoctrineOrmExtension extends AbstractExtension
{
/**
* The Doctrine 2 entity manager
* @var Doctrine\ORM\EntityManager
*/
protected $em = null;
public function __construct(EntityManager $em)
{
$this->em = $em;
}
protected function loadTypes()
{
return array(
new Type\EntityType($this->em),
);
}
protected function loadTypeGuesser()
{
return new DoctrineOrmTypeGuesser($this->em);
}
}

26
src/Symfony/Bridge/Doctrine/Form/Type/Guesser/EntityTypeGuesser.php → src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
View File

@ -3,26 +3,21 @@
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Bridge\Doctrine\Form\Type\Guesser;
namespace Symfony\Bridge\Doctrine\Form;
use Symfony\Component\Form\FormTypeGuesserInterface;
use Symfony\Component\Form\Guess\Guess;
use Symfony\Component\Form\Guess\TypeGuess;
use Symfony\Component\Form\Guess\ValueGuess;
use Doctrine\ORM\EntityManager;
use Symfony\Component\Form\Type\Guesser\Guess;
use Symfony\Component\Form\Type\Guesser\TypeGuesserInterface;
use Symfony\Component\Form\Type\Guesser\TypeGuess;
use Symfony\Component\Form\Type\Guesser\ValueGuess;
/**
* Guesses form fields from the metadata of Doctrine 2
*
* @author Bernhard Schussek <bernhard.schussek@symfony.com>
*/
class EntityTypeGuesser implements TypeGuesserInterface
class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
{
/**
* The Doctrine 2 entity manager
@ -30,11 +25,6 @@ class EntityTypeGuesser implements TypeGuesserInterface
*/
protected $em = null;
/**
* Constructor
*
* @param ClassMetadataFactoryInterface $metadataFactory
*/
public function __construct(EntityManager $em)
{
$this->em = $em;
@ -190,4 +180,4 @@ class EntityTypeGuesser implements TypeGuesserInterface
}
}
}
}
}

38
src/Symfony/Bridge/Doctrine/Form/DoctrineTypeLoader.php
View File

@ -1,38 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Bridge\Doctrine\Form;
use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
use Doctrine\ORM\EntityManager;
class DoctrineTypeLoader implements TypeLoaderInterface
{
private $types;
public function __construct(EntityManager $em)
{
$this->types['entity'] = new EntityType($em);
}
public function getType($name)
{
return $this->types[$name];
}
public function hasType($name)
{
return isset($this->types[$name]);
}
}

4
src/Symfony/Bridge/Doctrine/Form/EntityType.php → src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Bridge\Doctrine\Form;
namespace Symfony\Bridge\Doctrine\Form\Type;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormFactoryInterface;
@ -17,7 +17,7 @@ use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityChoiceList;
use Symfony\Bridge\Doctrine\Form\EventListener\MergeCollectionListener;
use Symfony\Bridge\Doctrine\Form\DataTransformer\EntitiesToArrayTransformer;
use Symfony\Bridge\Doctrine\Form\DataTransformer\EntityToIdTransformer;
use Symfony\Component\Form\Type\AbstractType;
use Symfony\Component\Form\AbstractType;
use Doctrine\ORM\EntityManager;
class EntityType extends AbstractType

8
src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
View File

@ -38,7 +38,7 @@
<parameter key="doctrine.orm.proxy_cache_warmer.class">Symfony\Bundle\DoctrineBundle\CacheWarmer\ProxyCacheWarmer</parameter>
<!-- form field factory guesser -->
<parameter key="form.guesser.doctrine.class">Symfony\Bridge\Doctrine\Form\Type\Guesser\EntityTypeGuesser</parameter>
<parameter key="form.type_guesser.doctrine.class">Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser</parameter>
</parameters>
<services>
@ -55,12 +55,12 @@
<argument type="service" id="service_container" />
</service>
<service id="form.guesser.doctrine" class="%form.guesser.doctrine.class%" public="false">
<tag name="form.guesser" />
<service id="form.type_guesser.doctrine" class="%form.type_guesser.doctrine.class%">
<tag name="form.type_guesser" />
<argument type="service" id="doctrine.orm.entity_manager" />
</service>
<service id="form.type.entity" class="Symfony\Bridge\Doctrine\Form\EntityType">
<service id="form.type.entity" class="Symfony\Bridge\Doctrine\Form\Type\EntityType">
<tag name="form.type" alias="entity" />
<argument type="service" id="doctrine.orm.entity_manager" />
</service>

40
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormGuessersPass.php
View File

@ -1,40 +0,0 @@
<?php
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\Reference;
/**
* Adds all services with the tag "form.guesser" as constructor argument of the
* "form.factory" service
*
* @author Bernhard Schussek <bernhard.schussek@symfony.com>
*/
class AddFormGuessersPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition('form.factory')) {
return;
}
$guessers = array();
foreach ($container->findTaggedServiceIds('form.guesser') as $serviceId => $tag) {
$guessers[] = new Reference($serviceId);
}
$container->getDefinition('form.factory')->replaceArgument(1, $guessers);
}
}

22
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormTypesPass.php → src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
View File

@ -15,32 +15,36 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
/**
* Adds all services with the tag "form.type" as argument
* to the "form.type.loader" service
* Adds all services with the tags "form.type" and "form.type_guesser" as
* arguments of the "form.extension" service
*
* @author Bernhard Schussek <bernhard.schussek@symfony-project.com>
*/
class AddFormTypesPass implements CompilerPassInterface
class FormPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition('form.type.loader')) {
if (!$container->hasDefinition('form.extension')) {
return;
}
// Builds an array with service IDs as keys and tag aliases as values
$types = array();
$tags = $container->findTaggedServiceIds('form.type');
foreach ($tags as $serviceId => $arguments) {
$alias = isset($arguments[0]['alias'])
? $arguments[0]['alias']
foreach ($container->findTaggedServiceIds('form.type') as $serviceId => $tag) {
$alias = isset($tag[0]['alias'])
? $tag[0]['alias']
: $serviceId;
// Flip, because we want tag aliases (= type identifiers) as keys
$types[$alias] = $serviceId;
}
$container->getDefinition('form.type.loader')->replaceArgument(1, $types);
$container->getDefinition('form.extension')->replaceArgument(1, $types);
// Find all services annotated with "form.type_guesser"
$guessers = array_keys($container->findTaggedServiceIds('form.type_guesser'));
$container->getDefinition('form.extension')->replaceArgument(2, $guessers);
}
}

25
src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareTypeLoader.php
View File

@ -11,32 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\Form;
use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class ContainerAwareTypeLoader implements TypeLoaderInterface
{
private $container;
private $serviceIds;
public function __construct(ContainerInterface $container, array $serviceIds)
{
$this->container = $container;
$this->serviceIds = $serviceIds;
}
public function getType($identifier)
{
if (!isset($this->serviceIds[$identifier])) {
throw new \InvalidArgumentException(sprintf('The field type "%s" is not registered with the service container.', $identifier));
}
return $this->container->get($this->serviceIds[$identifier]);
}
public function hasType($identifier)
{
return isset($this->serviceIds[$identifier]);
}
}

6
src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
View File

@ -12,8 +12,7 @@
namespace Symfony\Bundle\FrameworkBundle;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddFormTypesPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddFormGuessersPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingResolverPass;
@ -78,8 +77,7 @@ class FrameworkBundle extends Bundle
$container->addCompilerPass(new RegisterKernelListenersPass());
$container->addCompilerPass(new TemplatingPass());
$container->addCompilerPass(new AddConstraintValidatorsPass());
$container->addCompilerPass(new AddFormTypesPass());
$container->addCompilerPass(new AddFormGuessersPass());
$container->addCompilerPass(new FormPass());
$container->addCompilerPass(new AddClassesToCachePass());
$container->addCompilerPass(new AddClassesToAutoloadMapPass());
$container->addCompilerPass(new TranslatorPass());

101
src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
View File

@ -5,10 +5,10 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="form.extension.class">Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension</parameter>
<parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
<parameter key="form.type.loader.class">Symfony\Bundle\FrameworkBundle\Form\ContainerAwareTypeLoader</parameter>
<parameter key="form.guesser.validator.class">Symfony\Component\Form\Type\Guesser\ValidatorTypeGuesser</parameter>
<parameter key="form.csrf_provider.class">Symfony\Component\Form\CsrfProvider\SessionCsrfProvider</parameter>
<parameter key="form.type_guesser.validator.class">Symfony\Component\Form\Extension\Core\CoreTypeGuesser</parameter>
<parameter key="form.csrf_provider.class">Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider</parameter>
<parameter key="form.csrf_protection.enabled">true</parameter>
<parameter key="form.csrf_protection.field_name">_token</parameter>
<parameter key="form.csrf_protection.secret">secret</parameter>
@ -23,17 +23,34 @@
<!-- FormFactory -->
<service id="form.factory" class="%form.factory.class%">
<argument type="service" id="form.type.loader" />
<argument type="collection">
<!--
We don't need to be able to add more extensions.
* more types can be registered with the form.type tag
* more type_guessers can be registered with the form.type.type_guesser tag
-->
<argument type="service" id="form.extension" />
</argument>
</service>
<!-- DependencyInjectionExtension -->
<service id="form.extension" class="%form.extension.class%" public="false">
<argument type="service" id="service_container" />
<!--
All services with tag "form.guesser" are inserted here by
AddFormGuessersPass
All services with tag "form.type" are inserted here by
InitFormsPass
-->
<argument type="collection" />
<!--
All services with tag "form.type_guesser" are inserted here by
InitFormsPass
-->
<argument type="collection" />
</service>
<!-- ValidatorTypeGuesser -->
<service id="form.guesser.validator" class="%form.guesser.validator.class%" public="false">
<tag name="form.guesser" />
<service id="form.type_guesser.validator" class="%form.type_guesser.validator.class%">
<tag name="form.type_guesser" />
<argument type="service" id="validator.mapping.class_metadata_factory" />
</service>
@ -50,100 +67,90 @@
<argument>%file.temporary_storage.nesting_levels%</argument>
<argument>%file.temporary_storage.directory%</argument>
</service>
<!-- ContainerAwareTypeLoader -->
<service id="form.type.loader" class="%form.type.loader.class%">
<argument type="service" id="service_container" />
<!--
All services with tag "form.type" are inserted here by
AddFormTypesPass
-->
<argument type="collection" />
</service>
<!-- FieldTypes -->
<service id="form.type.field" class="Symfony\Component\Form\Type\FieldType">
<service id="form.type.field" class="Symfony\Component\Form\Extension\Core\Type\FieldType">
<tag name="form.type" alias="field" />
<argument type="service" id="validator" />
</service>
<service id="form.type.form" class="Symfony\Component\Form\Type\FormType">
<service id="form.type.form" class="Symfony\Component\Form\Extension\Core\Type\FormType">
<tag name="form.type" alias="form" />
</service>
<service id="form.type.birthday" class="Symfony\Component\Form\Type\BirthdayType">
<service id="form.type.birthday" class="Symfony\Component\Form\Extension\Core\Type\BirthdayType">
<tag name="form.type" alias="birthday" />
</service>
<service id="form.type.checkbox" class="Symfony\Component\Form\Type\CheckboxType">
<service id="form.type.checkbox" class="Symfony\Component\Form\Extension\Core\Type\CheckboxType">
<tag name="form.type" alias="checkbox" />
</service>
<service id="form.type.choice" class="Symfony\Component\Form\Type\ChoiceType">
<service id="form.type.choice" class="Symfony\Component\Form\Extension\Core\Type\ChoiceType">
<tag name="form.type" alias="choice" />
</service>
<service id="form.type.collection" class="Symfony\Component\Form\Type\CollectionType">
<service id="form.type.collection" class="Symfony\Component\Form\Extension\Core\Type\CollectionType">
<tag name="form.type" alias="collection" />
</service>
<service id="form.type.country" class="Symfony\Component\Form\Type\CountryType">
<service id="form.type.country" class="Symfony\Component\Form\Extension\Core\Type\CountryType">
<tag name="form.type" alias="country" />
</service>
<service id="form.type.csrf" class="Symfony\Component\Form\Type\CsrfType">
<service id="form.type.csrf" class="Symfony\Component\Form\Extension\Csrf\Type\CsrfType">
<tag name="form.type" alias="csrf" />
<argument type="service" id="form.csrf_provider" />
</service>
<service id="form.type.date" class="Symfony\Component\Form\Type\DateType">
<service id="form.type.date" class="Symfony\Component\Form\Extension\Core\Type\DateType">
<tag name="form.type" alias="date" />
</service>
<service id="form.type.datetime" class="Symfony\Component\Form\Type\DateTimeType">
<service id="form.type.datetime" class="Symfony\Component\Form\Extension\Core\Type\DateTimeType">
<tag name="form.type" alias="datetime" />
</service>
<service id="form.type.email" class="Symfony\Component\Form\Type\EmailType">
<service id="form.type.email" class="Symfony\Component\Form\Extension\Core\Type\EmailType">
<tag name="form.type" alias="email" />
</service>
<service id="form.type.file" class="Symfony\Component\Form\Type\FileType">
<service id="form.type.file" class="Symfony\Component\Form\Extension\Core\Type\FileType">
<tag name="form.type" alias="file" />
<argument type="service" id="file.temporary_storage" />
</service>
<service id="form.type.hidden" class="Symfony\Component\Form\Type\HiddenType">
<service id="form.type.hidden" class="Symfony\Component\Form\Extension\Core\Type\HiddenType">
<tag name="form.type" alias="hidden" />
</service>
<service id="form.type.integer" class="Symfony\Component\Form\Type\IntegerType">
<service id="form.type.integer" class="Symfony\Component\Form\Extension\Core\Type\IntegerType">
<tag name="form.type" alias="integer" />
</service>
<service id="form.type.language" class="Symfony\Component\Form\Type\LanguageType">
<service id="form.type.language" class="Symfony\Component\Form\Extension\Core\Type\LanguageType">
<tag name="form.type" alias="language" />
</service>
<service id="form.type.locale" class="Symfony\Component\Form\Type\LocaleType">
<service id="form.type.locale" class="Symfony\Component\Form\Extension\Core\Type\LocaleType">
<tag name="form.type" alias="locale" />
</service>
<service id="form.type.money" class="Symfony\Component\Form\Type\MoneyType">
<service id="form.type.money" class="Symfony\Component\Form\Extension\Core\Type\MoneyType">
<tag name="form.type" alias="money" />
</service>
<service id="form.type.number" class="Symfony\Component\Form\Type\NumberType">
<service id="form.type.number" class="Symfony\Component\Form\Extension\Core\Type\NumberType">
<tag name="form.type" alias="number" />
</service>
<service id="form.type.password" class="Symfony\Component\Form\Type\PasswordType">
<service id="form.type.password" class="Symfony\Component\Form\Extension\Core\Type\PasswordType">
<tag name="form.type" alias="password" />
</service>
<service id="form.type.percent" class="Symfony\Component\Form\Type\PercentType">
<service id="form.type.percent" class="Symfony\Component\Form\Extension\Core\Type\PercentType">
<tag name="form.type" alias="percent" />
</service>
<service id="form.type.radio" class="Symfony\Component\Form\Type\RadioType">
<service id="form.type.radio" class="Symfony\Component\Form\Extension\Core\Type\RadioType">
<tag name="form.type" alias="radio" />
</service>
<service id="form.type.repeated" class="Symfony\Component\Form\Type\RepeatedType">
<service id="form.type.repeated" class="Symfony\Component\Form\Extension\Core\Type\RepeatedType">
<tag name="form.type" alias="repeated" />
</service>
<service id="form.type.textarea" class="Symfony\Component\Form\Type\TextareaType">
<service id="form.type.textarea" class="Symfony\Component\Form\Extension\Core\Type\TextareaType">
<tag name="form.type" alias="textarea" />
</service>
<service id="form.type.text" class="Symfony\Component\Form\Type\TextType">
<service id="form.type.text" class="Symfony\Component\Form\Extension\Core\Type\TextType">
<tag name="form.type" alias="text" />
</service>
<service id="form.type.time" class="Symfony\Component\Form\Type\TimeType">
<service id="form.type.time" class="Symfony\Component\Form\Extension\Core\Type\TimeType">
<tag name="form.type" alias="time" />
</service>
<service id="form.type.timezone" class="Symfony\Component\Form\Type\TimezoneType">
<service id="form.type.timezone" class="Symfony\Component\Form\Extension\Core\Type\TimezoneType">
<tag name="form.type" alias="timezone" />
</service>
<service id="form.type.url" class="Symfony\Component\Form\Type\UrlType">
<service id="form.type.url" class="Symfony\Component\Form\Extension\Core\Type\UrlType">
<tag name="form.type" alias="url" />
</service>

107
src/Symfony/Component/Form/AbstractExtension.php Normal file
View File

@ -0,0 +1,107 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form;
use Symfony\Component\Form\Exception\FormException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**
* @author Bernhard Schussek <bernhard.schussek@symfony.com>
*/
abstract class AbstractExtension implements FormExtensionInterface
{
/**
* @var array
*/
private $types;
/**
* @var Boolean
*/
private $typesLoaded = false;
/**
* @var FormTypeGuesserInterface
*/
private $typeGuesser;
/**
* @var Boolean
*/
private $typeGuesserLoaded = false;
abstract protected function loadTypes();
abstract protected function loadTypeGuesser();
private function initTypes()
{
$this->typesLoaded = true;
$types = $this->loadTypes();
$typesByName = array();
foreach ($types as $type) {
if (!$type instanceof FormTypeInterface) {
throw new UnexpectedTypeException($type, 'Symfony\Component\Form\FormTypeInterface');
}
$typesByName[$type->getName()] = $type;
}
$this->types = $typesByName;
}
private function initTypeGuesser()
{
$this->typeGuesserLoaded = true;
$guesser = $this->loadTypeGuesser();
if (!$guesser instanceof FormTypeGuesserInterface) {
throw new UnexpectedTypeException($type, 'Symfony\Component\Form\FormTypeGuesserInterface');
}
$this->guesser = $guesser;
}
public function getType($name)
{
if (!$this->typesLoaded) {
$this->initTypes();
}
if (!isset($this->types[$name])) {
throw new FormException(sprintf('The type "%s" can not be typesLoaded by this extension', $name));
}
return $this->types[$name];
}
public function hasType($name)
{
if (!$this->typesLoaded) {
$this->initTypes();
}
return isset($this->types[$name]);
}
public function getTypeGuesser()
{
if (!$this->typeGuesserLoaded) {
$this->initTypeGuesser();
}
return $this->typeGuesser;
}
}

7
src/Symfony/Component/Form/Type/AbstractType.php → src/Symfony/Component/Form/AbstractType.php
View File

@ -9,12 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormView;
namespace Symfony\Component\Form;
abstract class AbstractType implements FormTypeInterface
{

2
src/Symfony/Component/Form/DataTransformer/CallbackTransformer.php → src/Symfony/Component/Form/CallbackTransformer.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form;
class CallbackTransformer implements DataTransformerInterface
{

4
src/Symfony/Component/Form/Validator/CallbackValidator.php → src/Symfony/Component/Form/CallbackValidator.php
View File

@ -9,9 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Validator;
use Symfony\Component\Form\FormInterface;
namespace Symfony\Component\Form;
class CallbackValidator implements FormValidatorInterface
{

4
src/Symfony/Component/Form/DataMapper/DataMapperInterface.php → src/Symfony/Component/Form/DataMapperInterface.php
View File

@ -9,9 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataMapper;
use Symfony\Component\Form\FormInterface;
namespace Symfony\Component\Form;
interface DataMapperInterface
{

2
src/Symfony/Component/Form/DataTransformer/DataTransformerInterface.php → src/Symfony/Component/Form/DataTransformerInterface.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form;
/**
* Transforms a value between different representations.

2
src/Symfony/Component/Form/DataTransformer/TransformationFailedException.php → src/Symfony/Component/Form/Exception/TransformationFailedException.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Exception;
/**
* Indicates a value transformation error.

4
src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php → src/Symfony/Component/Form/Extension/Core/ChoiceList/ArrayChoiceList.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\ChoiceList;
namespace Symfony\Component\Form\Extension\Core\ChoiceList;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
@ -38,7 +38,7 @@ class ArrayChoiceList implements ChoiceListInterface
}
/**
* @see Symfony\Component\Form\ChoiceList\ChoiceListInterface::getChoices
* @see Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface::getChoices
*/
protected function load()
{

2
src/Symfony/Component/Form/ChoiceList/ChoiceListInterface.php → src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\ChoiceList;
namespace Symfony\Component\Form\Extension\Core\ChoiceList;
interface ChoiceListInterface
{

2
src/Symfony/Component/Form/ChoiceList/MonthChoiceList.php → src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\ChoiceList;
namespace Symfony\Component\Form\Extension\Core\ChoiceList;
class MonthChoiceList extends PaddedChoiceList
{

2
src/Symfony/Component/Form/ChoiceList/PaddedChoiceList.php → src/Symfony/Component/Form/Extension/Core/ChoiceList/PaddedChoiceList.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\ChoiceList;
namespace Symfony\Component\Form\Extension\Core\ChoiceList;
class PaddedChoiceList extends ArrayChoiceList
{

2
src/Symfony/Component/Form/ChoiceList/TimezoneChoiceList.php → src/Symfony/Component/Form/Extension/Core/ChoiceList/TimezoneChoiceList.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\ChoiceList;
namespace Symfony\Component\Form\Extension\Core\ChoiceList;
/**
* Represents a choice list where each timezone is broken down by continent.

43
src/Symfony/Component/Form/Type/Loader/DefaultTypeLoader.php → src/Symfony/Component/Form/Extension/Core/CoreExtension.php
View File

@ -9,21 +9,31 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Loader;
namespace Symfony\Component\Form\Extension\Core;
use Symfony\Component\Form\Type;
use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractExtension;
use Symfony\Component\Validator\ValidatorInterface;
use Symfony\Component\HttpFoundation\File\TemporaryStorage;
class DefaultTypeLoader extends ArrayTypeLoader
class CoreExtension extends AbstractExtension
{
public function __construct(
ValidatorInterface $validator = null,
CsrfProviderInterface $csrfProvider = null, TemporaryStorage $storage = null)
private $validator;
private $storage;
private $typeGuesser;
public function __construct(ValidatorInterface $validator, TemporaryStorage $storage)
{
$types = array(
new Type\FieldType($validator),
$this->validator = $validator;
$this->storage = $storage;
}
protected function loadTypes()
{
return array(
new Type\FieldType($this->validator),
new Type\FormType(),
new Type\BirthdayType(),
new Type\CheckboxType(),
@ -48,17 +58,12 @@ class DefaultTypeLoader extends ArrayTypeLoader
new Type\TimeType(),
new Type\TimezoneType(),
new Type\UrlType(),
new Type\FileType($this->storage),
);
}
if ($csrfProvider) {
// TODO Move to a Symfony\Bridge\FormSecurity
$types[] = new Type\CsrfType($csrfProvider);
}
if ($storage) {
$types[] = new Type\FileType($storage);
}
parent::__construct($types);
public function loadTypeGuesser()
{
return new CoreTypeGuesser($this->validator->getMetadataFactory());
}
}

25
src/Symfony/Component/Form/Type/Guesser/ValidatorTypeGuesser.php → src/Symfony/Component/Form/Extension/Core/CoreTypeGuesser.php
View File

@ -3,29 +3,24 @@
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Guesser;
namespace Symfony\Component\Form\Extension\Core;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Form\FormTypeGuesserInterface;
use Symfony\Component\Form\Guess\Guess;
use Symfony\Component\Form\Guess\TypeGuess;
use Symfony\Component\Form\Guess\ValueGuess;
use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;
/**
* Guesses form fields from the metadata of the a Validator class
*
* @author Bernhard Schussek <bernhard.schussek@symfony.com>
*/
class ValidatorTypeGuesser implements TypeGuesserInterface
class CoreTypeGuesser implements FormTypeGuesserInterface
{
/**
* Constructor
*
* @param ClassMetadataFactoryInterface $metadataFactory
*/
private $metadataFactory;
public function __construct(ClassMetadataFactoryInterface $metadataFactory)
{
$this->metadataFactory = $metadataFactory;
@ -301,4 +296,4 @@ class ValidatorTypeGuesser implements TypeGuesserInterface
);
}
}
}
}

3
src/Symfony/Component/Form/DataMapper/PropertyPathMapper.php → src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
View File

@ -9,9 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataMapper;
namespace Symfony\Component\Form\Extension\Core\DataMapper;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\DataMapperInterface;
use Symfony\Component\Form\Util\VirtualFormAwareIterator;
use Symfony\Component\Form\Exception\FormException;

6
src/Symfony/Component/Form/DataTransformer/ArrayToBooleanChoicesTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToBooleanChoicesTransformer.php
View File

@ -9,9 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
class ArrayToBooleanChoicesTransformer implements DataTransformerInterface

4
src/Symfony/Component/Form/DataTransformer/ArrayToChoicesTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToChoicesTransformer.php
View File

@ -9,9 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Util\FormUtil;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
class ArrayToChoicesTransformer implements DataTransformerInterface

4
src/Symfony/Component/Form/DataTransformer/ArrayToPartsTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToPartsTransformer.php
View File

@ -9,8 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

4
src/Symfony/Component/Form/DataTransformer/BaseDateTimeTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
View File

@ -9,7 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
abstract class BaseDateTimeTransformer implements DataTransformerInterface
{

4
src/Symfony/Component/Form/DataTransformer/BooleanToStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php
View File

@ -9,8 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

4
src/Symfony/Component/Form/DataTransformer/DataTransformerChain.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
View File

@ -9,7 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
/**
* Passes a value through multiple value transformers

3
src/Symfony/Component/Form/DataTransformer/DateTimeToArrayTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

3
src/Symfony/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

3
src/Symfony/Component/Form/DataTransformer/DateTimeToStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

3
src/Symfony/Component/Form/DataTransformer/DateTimeToTimestampTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

5
src/Symfony/Component/Form/DataTransformer/FileToArrayTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/FileToArrayTransformer.php
View File

@ -9,9 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformer\TransformationFailedException;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\HttpFoundation\File\File;

5
src/Symfony/Component/Form/DataTransformer/FileToStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/FileToStringTransformer.php
View File

@ -9,9 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformer\TransformationFailedException;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\HttpFoundation\File\File;

4
src/Symfony/Component/Form/DataTransformer/IntegerToLocalizedStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
View File

@ -9,9 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
/**
* Transforms between an integer and a localized number with grouping

2
src/Symfony/Component/Form/DataTransformer/MoneyToLocalizedStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\UnexpectedTypeException;

4
src/Symfony/Component/Form/DataTransformer/NumberToLocalizedStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
View File

@ -9,8 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

4
src/Symfony/Component/Form/DataTransformer/PercentToLocalizedStringTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
View File

@ -9,8 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

6
src/Symfony/Component/Form/DataTransformer/ScalarToBooleanChoicesTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/ScalarToBooleanChoicesTransformer.php
View File

@ -9,9 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
class ScalarToBooleanChoicesTransformer implements DataTransformerInterface

3
src/Symfony/Component/Form/DataTransformer/ScalarToChoiceTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/ScalarToChoiceTransformer.php
View File

@ -9,9 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Util\FormUtil;
use Symfony\Component\Form\DataTransformerInterface;
class ScalarToChoiceTransformer implements DataTransformerInterface
{

4
src/Symfony/Component/Form/DataTransformer/ValueToDuplicatesTransformer.php → src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
View File

@ -9,8 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**

2
src/Symfony/Component/Form/EventListener/FixFileUploadListener.php → src/Symfony/Component/Form/Extension/Core/EventListener/FixFileUploadListener.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\EventListener;
namespace Symfony\Component\Form\Extension\Core\EventListener;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Events;

2
src/Symfony/Component/Form/EventListener/FixRadioInputListener.php → src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\EventListener;
namespace Symfony\Component\Form\Extension\Core\EventListener;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Events;

2
src/Symfony/Component/Form/EventListener/FixUrlProtocolListener.php → src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\EventListener;
namespace Symfony\Component\Form\Extension\Core\EventListener;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Events;

2
src/Symfony/Component/Form/EventListener/ResizeFormListener.php → src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\EventListener;
namespace Symfony\Component\Form\Extension\Core\EventListener;
use Symfony\Component\Form\Events;
use Symfony\Component\Form\Event\DataEvent;

2
src/Symfony/Component/Form/EventListener/TrimListener.php → src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\EventListener;
namespace Symfony\Component\Form\Extension\Core\EventListener;
use Symfony\Component\Form\Events;
use Symfony\Component\Form\Event\FilterDataEvent;

3
src/Symfony/Component/Form/Type/BirthdayType.php → src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
class BirthdayType extends AbstractType

5
src/Symfony/Component/Form/Type/CheckboxType.php → src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
View File

@ -9,11 +9,12 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer;
use Symfony\Component\Form\FormView;
class CheckboxType extends AbstractType

19
src/Symfony/Component/Form/Type/ChoiceType.php → src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
View File

@ -9,19 +9,20 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Exception\FormException;
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\EventListener\FixRadioInputListener;
use Symfony\Component\Form\Extension\Core\ChoiceList\ArrayChoiceList;
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\Extension\Core\EventListener\FixRadioInputListener;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\DataTransformer\ScalarToChoiceTransformer;
use Symfony\Component\Form\DataTransformer\ScalarToBooleanChoicesTransformer;
use Symfony\Component\Form\DataTransformer\ArrayToChoicesTransformer;
use Symfony\Component\Form\DataTransformer\ArrayToBooleanChoicesTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ScalarToChoiceTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ScalarToBooleanChoicesTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToChoicesTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToBooleanChoicesTransformer;
class ChoiceType extends AbstractType
{
@ -32,7 +33,7 @@ class ChoiceType extends AbstractType
}
if ($options['choice_list'] && !$options['choice_list'] instanceof ChoiceListInterface) {
throw new FormException('The "choice_list" must be an instance of "Symfony\Component\Form\ChoiceList\ChoiceListInterface".');
throw new FormException('The "choice_list" must be an instance of "Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface".');
}
if (!$options['choice_list']) {

5
src/Symfony/Component/Form/Type/CollectionType.php → src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\EventListener\ResizeFormListener;
use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener;
class CollectionType extends AbstractType
{

3
src/Symfony/Component/Form/Type/CountryType.php → src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Locale\Locale;

15
src/Symfony/Component/Form/Type/DateTimeType.php → src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View File

@ -9,15 +9,16 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\ReversedTransformer;
use Symfony\Component\Form\DataTransformer\DataTransformerChain;
use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\DataTransformer\ArrayToPartsTransformer;
use Symfony\Component\Form\ReversedTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DataTransformerChain;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;
class DateTimeType extends AbstractType
{

17
src/Symfony/Component/Form/Type/DateType.php → src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View File

@ -9,18 +9,19 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\ChoiceList\PaddedChoiceList;
use Symfony\Component\Form\ChoiceList\MonthChoiceList;
use Symfony\Component\Form\Extension\Core\ChoiceList\PaddedChoiceList;
use Symfony\Component\Form\Extension\Core\ChoiceList\MonthChoiceList;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\DataTransformer\DateTimeToLocalizedStringTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\DataTransformer\ReversedTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\ReversedTransformer;
class DateType extends AbstractType
{

3
src/Symfony/Component/Form/Type/EmailType.php → src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;

9
src/Symfony/Component/Form/Type/FieldType.php → src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
View File

@ -9,16 +9,17 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Util\PropertyPath;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\EventListener\TrimListener;
use Symfony\Component\Form\Validator\DefaultValidator;
use Symfony\Component\Form\Validator\DelegatingValidator;
use Symfony\Component\Form\Extension\Core\EventListener\TrimListener;
use Symfony\Component\Form\Extension\Core\Validator\DefaultValidator;
use Symfony\Component\Form\Extension\Core\Validator\DelegatingValidator;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Validator\ValidatorInterface;

13
src/Symfony/Component/Form/Type/FileType.php → src/Symfony/Component/Form/Extension/Core/Type/FileType.php
View File

@ -9,16 +9,17 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\EventListener\FixFileUploadListener;
use Symfony\Component\Form\DataTransformer\DataTransformerChain;
use Symfony\Component\Form\DataTransformer\ReversedTransformer;
use Symfony\Component\Form\DataTransformer\FileToStringTransformer;
use Symfony\Component\Form\DataTransformer\FileToArrayTransformer;
use Symfony\Component\Form\Extension\Core\EventListener\FixFileUploadListener;
use Symfony\Component\Form\Extension\Core\DataTransformer\DataTransformerChain;
use Symfony\Component\Form\ReversedTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\FileToStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\FileToArrayTransformer;
use Symfony\Component\Form\FormView;
use Symfony\Component\HttpFoundation\File\TemporaryStorage;

7
src/Symfony/Component/Form/Type/FormType.php → src/Symfony/Component/Form/Extension/Core/Type/FormType.php
View File

@ -9,13 +9,14 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\DataMapper\PropertyPathMapper;
use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
use Symfony\Component\EventDispatcher\EventDispatcher;
class FormType extends AbstractType

3
src/Symfony/Component/Form/Type/HiddenType.php → src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
class HiddenType extends AbstractType

5
src/Symfony/Component/Form/Type/IntegerType.php → src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\IntegerToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
class IntegerType extends AbstractType
{

3
src/Symfony/Component/Form/Type/LanguageType.php → src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Locale\Locale;
class LanguageType extends AbstractType

3
src/Symfony/Component/Form/Type/LocaleType.php → src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Locale\Locale;
class LocaleType extends AbstractType

5
src/Symfony/Component/Form/Type/MoneyType.php → src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
View File

@ -9,11 +9,12 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\MoneyToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
use Symfony\Component\Form\FormView;
class MoneyType extends AbstractType

5
src/Symfony/Component/Form/Type/NumberType.php → src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\NumberToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
class NumberType extends AbstractType
{

3
src/Symfony/Component/Form/Type/PasswordType.php → src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormView;

5
src/Symfony/Component/Form/Type/PercentType.php → src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\PercentToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
class PercentType extends AbstractType
{

5
src/Symfony/Component/Form/Type/RadioType.php → src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
View File

@ -9,11 +9,12 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\BooleanToStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer;
use Symfony\Component\Form\FormView;
class RadioType extends AbstractType

5
src/Symfony/Component/Form/Type/RepeatedType.php → src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\DataTransformer\ValueToDuplicatesTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\ValueToDuplicatesTransformer;
class RepeatedType extends AbstractType
{

3
src/Symfony/Component/Form/Type/TextType.php → src/Symfony/Component/Form/Extension/Core/Type/TextType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;

3
src/Symfony/Component/Form/Type/TextareaType.php → src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
View File

@ -9,8 +9,9 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
class TextareaType extends AbstractType

13
src/Symfony/Component/Form/Type/TimeType.php → src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View File

@ -9,15 +9,16 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\ChoiceList\PaddedChoiceList;
use Symfony\Component\Form\DataTransformer\ReversedTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\Extension\Core\ChoiceList\PaddedChoiceList;
use Symfony\Component\Form\ReversedTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\FormView;
class TimeType extends AbstractType

5
src/Symfony/Component/Form/Type/TimezoneType.php → src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\ChoiceList\TimezoneChoiceList;
use Symfony\Component\Form\Extension\Core\ChoiceList\TimezoneChoiceList;
class TimezoneType extends AbstractType
{

5
src/Symfony/Component/Form/Type/UrlType.php → src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
View File

@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\EventListener\FixUrlProtocolListener;
use Symfony\Component\Form\Extension\Core\EventListener\FixUrlProtocolListener;
class UrlType extends AbstractType
{

3
src/Symfony/Component/Form/Validator/DefaultValidator.php → src/Symfony/Component/Form/Extension/Core/Validator/DefaultValidator.php
View File

@ -9,9 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Validator;
namespace Symfony\Component\Form\Extension\Core\Validator;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormValidatorInterface;
use Symfony\Component\Form\FormError;
class DefaultValidator implements FormValidatorInterface

3
src/Symfony/Component/Form/Validator/DelegatingValidator.php → src/Symfony/Component/Form/Extension/Core/Validator/DelegatingValidator.php
View File

@ -9,9 +9,10 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Validator;
namespace Symfony\Component\Form\Extension\Core\Validator;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormValidatorInterface;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\Util\VirtualFormAwareIterator;
use Symfony\Component\Form\Exception\FormException;

37
src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Extension\Csrf;
use Symfony\Component\Form\Extension\Csrf\Type;
use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\AbstractExtension;
class CsrfExtension extends AbstractExtension
{
private $csrfProvider;
public function __construct(CsrfProviderInterface $csrfProvider)
{
$this->csrfProvider = $csrfProvider;
}
protected function loadTypes()
{
return array(
new Type\CsrfType($this->csrfProvider),
);
}
protected function loadTypeGuesser()
{
}
}

2
src/Symfony/Component/Form/CsrfProvider/CsrfProviderInterface.php → src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderInterface.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\CsrfProvider;
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
/**
* Marks classes able to provide CSRF protection

2
src/Symfony/Component/Form/CsrfProvider/DefaultCsrfProvider.php → src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\CsrfProvider;
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
/**
* Default implementation of CsrfProviderInterface

2
src/Symfony/Component/Form/CsrfProvider/SessionCsrfProvider.php → src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\CsrfProvider;
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
use Symfony\Component\HttpFoundation\Session;

27
src/Symfony/Component/Form/Type/CsrfType.php → src/Symfony/Component/Form/Extension/Csrf/Type/CsrfType.php
View File

@ -9,13 +9,14 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
namespace Symfony\Component\Form\Extension\Csrf\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\Validator\CallbackValidator;
use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\CallbackValidator;
class CsrfType extends AbstractType
{
@ -32,16 +33,16 @@ class CsrfType extends AbstractType
$pageId = $options['page_id'];
$builder
->setData($csrfProvider->generateCsrfToken($pageId))
->addValidator(new CallbackValidator(
function (FormInterface $form) use ($csrfProvider, $pageId) {
if ((!$form->hasParent() || $form->getParent()->isRoot())
&& !$csrfProvider->isCsrfTokenValid($pageId, $form->getData())) {
$form->addError(new FormError('The CSRF token is invalid. Please try to resubmit the form'));
$form->setData($csrfProvider->generateCsrfToken($pageId));
}
}
));
->setData($csrfProvider->generateCsrfToken($pageId))
->addValidator(new CallbackValidator(
function (FormInterface $form) use ($csrfProvider, $pageId) {
if ((!$form->hasParent() || $form->getParent()->isRoot())
&& !$csrfProvider->isCsrfTokenValid($pageId, $form->getData())) {
$form->addError(new FormError('The CSRF token is invalid. Please try to resubmit the form'));
$form->setData($csrfProvider->generateCsrfToken($pageId));
}
}
));
}
public function getDefaultOptions(array $options)

69
src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php Normal file
View File

@ -0,0 +1,69 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Extension\DependencyInjection;
use Symfony\Component\Form\FormExtensionInterface;
use Symfony\Component\Form\FormTypeGuesserChain;
use Symfony\Component\DependencyInjection\ContainerInterface;
class DependencyInjectionExtension implements FormExtensionInterface
{
private $container;
private $typeServiceIds;
private $guesserServiceIds;
private $guesser;
private $guesserLoaded = false;
public function __construct(ContainerInterface $container,
array $typeServiceIds, array $guesserServiceIds)
{
$this->container = $container;
$this->typeServiceIds = $typeServiceIds;
$this->guesserServiceIds = $guesserServiceIds;
}
public function getType($identifier)
{
if (!isset($this->typeServiceIds[$identifier])) {
throw new \InvalidArgumentException(sprintf('The field type "%s" is not registered with the service container.', $identifier));
}
return $this->container->get($this->typeServiceIds[$identifier]);
}
public function hasType($identifier)
{
return isset($this->typeServiceIds[$identifier]);
}
public function getTypeGuesser()
{
if (!$this->guesserLoaded) {
$this->guesserLoaded = true;
$guessers = array();
foreach ($this->guesserServiceIds as $serviceId) {
$guessers[] = $this->container->get($serviceId);
}
if (count($guessers) > 0) {
$this->guesser = new FormTypeGuesserChain($guessers);
}
}
return $this->guesser;
}
}

17
src/Symfony/Component/Form/Form.php
View File

@ -11,8 +11,6 @@
namespace Symfony\Component\Form;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\FileBag;
use Symfony\Component\Form\Event\DataEvent;
use Symfony\Component\Form\Event\FilterDataEvent;
use Symfony\Component\Form\Exception\FormException;
@ -21,12 +19,9 @@ use Symfony\Component\Form\Exception\AlreadyBoundException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Form\Exception\DanglingFieldException;
use Symfony\Component\Form\Exception\FieldDefinitionException;
use Symfony\Component\Form\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
use Symfony\Component\Form\DataTransformer\TransformationFailedException;
use Symfony\Component\Form\DataMapper\DataMapperInterface;
use Symfony\Component\Form\Validator\FormValidatorInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\FileBag;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@ -213,19 +208,19 @@ class Form implements \IteratorAggregate, FormInterface
{
foreach ($clientTransformers as $transformer) {
if (!$transformer instanceof DataTransformerInterface) {
throw new UnexpectedTypeException($transformer, 'Symfony\Component\Form\DataTransformer\DataTransformerInterface');
throw new UnexpectedTypeException($transformer, 'Symfony\Component\Form\DataTransformerInterface');
}
}
foreach ($normTransformers as $transformer) {
if (!$transformer instanceof DataTransformerInterface) {
throw new UnexpectedTypeException($transformer, 'Symfony\Component\Form\DataTransformer\DataTransformerInterface');
throw new UnexpectedTypeException($transformer, 'Symfony\Component\Form\DataTransformerInterface');
}
}
foreach ($validators as $validator) {
if (!$validator instanceof FormValidatorInterface) {
throw new UnexpectedTypeException($validator, 'Symfony\Component\Form\Validator\FormValidatorInterface');
throw new UnexpectedTypeException($validator, 'Symfony\Component\Form\FormValidatorInterface');
}
}

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

@ -11,12 +11,8 @@
namespace Symfony\Component\Form;
use Symfony\Component\Form\DataMapper\DataMapperInterface;
use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
use Symfony\Component\Form\Validator\FormValidatorInterface;
use Symfony\Component\Form\Exception\FormException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Form\Type\FormTypeInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@ -350,7 +346,7 @@ class FormBuilder
}
if (null !== $type && !is_string($type) && !$type instanceof FormTypeInterface) {
throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\Type\FormTypeInterface');
throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\FormTypeInterface');
}
$this->children[$name] = array(

10
src/Symfony/Component/Form/Type/Loader/TypeLoaderInterface.php → src/Symfony/Component/Form/FormExtensionInterface.php
View File

@ -3,17 +3,19 @@
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Loader;
namespace Symfony\Component\Form;
interface TypeLoaderInterface
interface FormExtensionInterface
{
function getType($name);
function hasType($name);
}
function getTypeGuesser();
}

91
src/Symfony/Component/Form/FormFactory.php
View File

@ -11,28 +11,41 @@
namespace Symfony\Component\Form;
use Symfony\Component\Form\Type\FormTypeInterface;
use Symfony\Component\Form\Type\Loader\TypeLoaderInterface;
use Symfony\Component\Form\Type\Guesser\TypeGuesserInterface;
use Symfony\Component\Form\Type\Guesser\Guess;
use Symfony\Component\Form\Guess\TypeGuesserInterface;
use Symfony\Component\Form\Guess\Guess;
use Symfony\Component\Form\Exception\FormException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
class FormFactory implements FormFactoryInterface
{
private $typeLoader;
private $extensions = array();
private $guessers = array();
private $guesser;
public function __construct(TypeLoaderInterface $typeLoader, array $guessers = array())
public function __construct(array $extensions)
{
foreach ($guessers as $guesser) {
if (!$guesser instanceof TypeGuesserInterface) {
throw new UnexpectedTypeException($guesser, 'Symfony\Component\Form\Type\Guesser\TypeGuesserInterface');
foreach ($extensions as $extension) {
if (!$extension instanceof FormExtensionInterface) {
throw new UnexpectedTypeException($extension, 'Symfony\Component\Form\FormExtensionInterface');
}
}
$this->typeLoader = $typeLoader;
$this->guessers = $guessers;
$this->extensions = $extensions;
}
private function loadGuesser()
{
$guessers = array();
foreach ($this->extensions as $extension) {
$guesser = $extension->getTypeGuesser();
if ($guesser) {
$guessers[] = $guesser;
}
}
$this->guesser = new FormTypeGuesserChain($guessers);
}
public function create($type, $data = null, array $options = array())
@ -68,9 +81,17 @@ class FormFactory implements FormFactoryInterface
$passedOptions = array_keys($options);
while (null !== $type) {
// TODO check if type exists
if (!$type instanceof FormTypeInterface) {
$type = $this->typeLoader->getType($type);
foreach ($this->extensions as $extension) {
if ($extension->hasType($type)) {
$type = $extension->getType($type);
break;
}
}
if (!$type) {
throw new FormException(sprintf('Could not load type "%s"', $type));
}
}
array_unshift($types, $type);
@ -107,22 +128,14 @@ class FormFactory implements FormFactoryInterface
public function createBuilderForProperty($class, $property, $data = null, array $options = array())
{
// guess field class and options
$typeGuess = $this->guess(function ($guesser) use ($class, $property) {
return $guesser->guessType($class, $property);
});
if (!$this->guesser) {
$this->loadGuesser();
}
// guess maximum length
$maxLengthGuess = $this->guess(function ($guesser) use ($class, $property) {
return $guesser->guessMaxLength($class, $property);
});
$typeGuess = $this->guesser->guessType($class, $property);
$maxLengthGuess = $this->guesser->guessMaxLength($class, $property);
$requiredGuess = $this->guesser->guessRequired($class, $property);
// guess whether field is required
$requiredGuess = $this->guess(function ($guesser) use ($class, $property) {
return $guesser->guessRequired($class, $property);
});
// construct field
$type = $typeGuess ? $typeGuess->getType() : 'text';
if ($maxLengthGuess) {
@ -140,26 +153,4 @@ class FormFactory implements FormFactoryInterface
return $this->createNamedBuilder($type, $property, $data, $options);
}
/**
* Executes a closure for each guesser and returns the best guess from the
* return values
*
* @param \Closure $closure The closure to execute. Accepts a guesser as
* argument and should return a FieldFactoryGuess
* instance
* @return FieldFactoryGuess The guess with the highest confidence
*/
protected function guess(\Closure $closure)
{
$guesses = array();
foreach ($this->guessers as $guesser) {
if ($guess = $closure($guesser)) {
$guesses[] = $guess;
}
}
return Guess::getBestGuess($guesses);
}
}

76
src/Symfony/Component/Form/FormTypeGuesserChain.php Normal file
View File

@ -0,0 +1,76 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form;
use Symfony\Component\Form\Guess\Guess;
class FormTypeGuesserChain implements FormTypeGuesserInterface
{
private $guessers = array();
public function __construct(array $guessers)
{
foreach ($guessers as $guesser) {
if (!$guesser instanceof FormTypeGuesserInterface) {
throw new UnexpectedTypeException($guesser, 'Symfony\Component\Form\FormTypeGuesserInterface');
}
if ($guesser instanceof self) {
$this->guessers = array_merge($this->guessers, $guesser->guessers);
} else {
$this->guessers[] = $guesser;
}
}
}
public function guessType($class, $property)
{
return $this->guess(function ($guesser) use ($class, $property) {
return $guesser->guessType($class, $property);
});
}
public function guessRequired($class, $property)
{
return $this->guess(function ($guesser) use ($class, $property) {
return $guesser->guessRequired($class, $property);
});
}
public function guessMaxLength($class, $property)
{
return $this->guess(function ($guesser) use ($class, $property) {
return $guesser->guessMaxLength($class, $property);
});
}
/**
* Executes a closure for each guesser and returns the best guess from the
* return values
*
* @param \Closure $closure The closure to execute. Accepts a guesser
* as argument and should return a Guess instance
* @return FieldFactoryGuess The guess with the highest confidence
*/
private function guess(\Closure $closure)
{
$guesses = array();
foreach ($this->guessers as $guesser) {
if ($guess = $closure($guesser)) {
$guesses[] = $guess;
}
}
return Guess::getBestGuess($guesses);
}
}

13
src/Symfony/Component/Form/Type/Guesser/TypeGuesserInterface.php → src/Symfony/Component/Form/FormTypeGuesserInterface.php
View File

@ -3,20 +3,15 @@
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Guesser;
namespace Symfony\Component\Form;
/**
* Guesses field classes and options for the properties of a class
*
* @author Bernhard Schussek <bernhard.schussek@symfony.com>
*/
interface TypeGuesserInterface
interface FormTypeGuesserInterface
{
/**
* Returns a field guess for a property name of a class
@ -44,4 +39,4 @@ interface TypeGuesserInterface
* @return Guess A guess for the field's maximum length
*/
function guessMaxLength($class, $property);
}
}

7
src/Symfony/Component/Form/Type/FormTypeInterface.php → src/Symfony/Component/Form/FormTypeInterface.php
View File

@ -9,12 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormView;
namespace Symfony\Component\Form;
interface FormTypeInterface
{

4
src/Symfony/Component/Form/Validator/FormValidatorInterface.php → src/Symfony/Component/Form/FormValidatorInterface.php
View File

@ -9,9 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Validator;
use Symfony\Component\Form\FormInterface;
namespace Symfony\Component\Form;
interface FormValidatorInterface
{

1
src/Symfony/Component/Form/FormView.php
View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Form;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Util\FormUtil;
class FormView implements \ArrayAccess, \IteratorAggregate, \Countable

2
src/Symfony/Component/Form/Type/Guesser/Guess.php → src/Symfony/Component/Form/Guess/Guess.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Guesser;
namespace Symfony\Component\Form\Guess;
/**
* Base class for guesses made by TypeGuesserInterface implementation

2
src/Symfony/Component/Form/Type/Guesser/TypeGuess.php → src/Symfony/Component/Form/Guess/TypeGuess.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Guesser;
namespace Symfony\Component\Form\Guess;
/**
* Contains a guessed class name and a list of options for creating an instance

2
src/Symfony/Component/Form/Type/Guesser/ValueGuess.php → src/Symfony/Component/Form/Guess/ValueGuess.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Type\Guesser;
namespace Symfony\Component\Form\Guess;
/**
* Contains a guessed value

2
src/Symfony/Component/Form/Resources/config/validation.xml
View File

@ -7,7 +7,7 @@
<class name="Symfony\Component\Form\Form">
<constraint name="Callback">
<value>
<value>Symfony\Component\Form\Validator\DelegatingValidator</value>
<value>Symfony\Component\Form\Extension\Core\Validator\DelegatingValidator</value>
<value>validateFormData</value>
</value>
</constraint>

2
src/Symfony/Component/Form/DataTransformer/ReversedTransformer.php → src/Symfony/Component/Form/ReversedTransformer.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\DataTransformer;
namespace Symfony\Component\Form;
/**
* Reverses a transformer

Some files were not shown because too many files have changed in this diff Show More