From 47b88cbac66a46970ca1ad008614ee61c4468703 Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Thu, 8 Nov 2012 21:40:37 +0200 Subject: [PATCH 1/9] added $options field and get() set() methods for it --- Resources/skeleton/FormType.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index 5fdc0b4..cfb268b 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -8,6 +8,20 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface; class ##CLASS## extends AbstractType { + private $options = array( + 'data_class' => '##FQCN##', + ); + + public function set($name, $value) + { + $this->options[$name] = $value; + } + + public function get($name) + { + return $this->options[$name]; + } + /** * {@inheritdoc} */ @@ -20,9 +34,7 @@ class ##CLASS## extends AbstractType */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $resolver->setDefaults(array( - 'data_class' => '##FQCN##', - )); + $resolver->setDefaults($this->options); } /** From 6969a5812a99c0b00f5e047a42102bf8a12afdf7 Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Thu, 8 Nov 2012 22:08:21 +0200 Subject: [PATCH 2/9] changed options methods to getOption() setOption() added getOptions() --- Resources/skeleton/FormType.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index cfb268b..d8bcb59 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -12,16 +12,21 @@ class ##CLASS## extends AbstractType 'data_class' => '##FQCN##', ); - public function set($name, $value) + public function setOption($name, $value) { $this->options[$name] = $value; } - public function get($name) + public function getOption($name) { return $this->options[$name]; } + public function getOptions() + { + return $this->options; + } + /** * {@inheritdoc} */ From 6ce5c3a29e888a54635078a9e17ec7b22a99a24b Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Fri, 9 Nov 2012 13:19:47 +0200 Subject: [PATCH 3/9] added option "name" and rewrited getName() method to return this option --- Resources/skeleton/FormType.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index d8bcb59..71c3c29 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -10,6 +10,7 @@ class ##CLASS## extends AbstractType { private $options = array( 'data_class' => '##FQCN##', + 'name' => '##TYPE_NAME##', ); public function setOption($name, $value) @@ -47,6 +48,6 @@ class ##CLASS## extends AbstractType */ public function getName() { - return '##TYPE_NAME##'; + return $this->getOption('name'); } } From a7af5d92d9c5f99c6f9e1224e1388de6dd66d3cb Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Fri, 9 Nov 2012 15:29:08 +0200 Subject: [PATCH 4/9] class Propel\PropelBundle\Model\Form\BaseAbstractType --- Model/Form/BaseAbstractType.php | 61 +++++++++++++++++++++++++++++++++ Resources/skeleton/FormType.php | 34 +----------------- 2 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 Model/Form/BaseAbstractType.php diff --git a/Model/Form/BaseAbstractType.php b/Model/Form/BaseAbstractType.php new file mode 100644 index 0000000..bacc405 --- /dev/null +++ b/Model/Form/BaseAbstractType.php @@ -0,0 +1,61 @@ + '', + ); + + function __construct($mergeOptions = null) + { + if ($mergeOptions) { + $this->mergeOptions($mergeOptions); + } + } + + public function setOption($name, $value) + { + $this->options[$name] = $value; + } + + public function getOption($name) + { + return $this->options[$name]; + } + + public function setOptions($options) + { + $this->options = $options; + } + + public function getOptions() + { + return $this->options; + } + + public function mergeOptions($options) + { + $this->options = array_merge($this->options, $options); + } + + /** + * {@inheritdoc} + */ + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $resolver->setDefaults($this->options); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return $this->getOption('name'); + } +} diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index 71c3c29..9cf57b9 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -2,9 +2,8 @@ namespace ##NAMESPACE##; -use Symfony\Component\Form\AbstractType; +use Propel\PropelBundle\Model\Form\BaseAbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; class ##CLASS## extends AbstractType { @@ -13,41 +12,10 @@ class ##CLASS## extends AbstractType 'name' => '##TYPE_NAME##', ); - public function setOption($name, $value) - { - $this->options[$name] = $value; - } - - public function getOption($name) - { - return $this->options[$name]; - } - - public function getOptions() - { - return $this->options; - } - /** * {@inheritdoc} */ public function buildForm(FormBuilderInterface $builder, array $options) {##BUILD_CODE## } - - /** - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $resolver->setDefaults($this->options); - } - - /** - * {@inheritdoc} - */ - public function getName() - { - return $this->getOption('name'); - } } From 77b359146a7e51040839ef654ee995564ef17401 Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Fri, 9 Nov 2012 15:30:28 +0200 Subject: [PATCH 5/9] extends BaseAbstractType --- Resources/skeleton/FormType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index 9cf57b9..e00dedc 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -5,7 +5,7 @@ namespace ##NAMESPACE##; use Propel\PropelBundle\Model\Form\BaseAbstractType; use Symfony\Component\Form\FormBuilderInterface; -class ##CLASS## extends AbstractType +class ##CLASS## extends BaseAbstractType { private $options = array( 'data_class' => '##FQCN##', From 1a95142461f3c93c5f9ef12a01dac35bdf2988c8 Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Fri, 9 Nov 2012 15:55:29 +0200 Subject: [PATCH 6/9] $options should be protected --- Model/Form/BaseAbstractType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Form/BaseAbstractType.php b/Model/Form/BaseAbstractType.php index bacc405..8a9b559 100644 --- a/Model/Form/BaseAbstractType.php +++ b/Model/Form/BaseAbstractType.php @@ -7,7 +7,7 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface; abstract class BaseAbstractType extends AbstractType { - private $options = array( + protected $options = array( 'name' => '', ); From 1bae813484082107e6bb034133ddab30da7b074d Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Fri, 9 Nov 2012 15:57:19 +0200 Subject: [PATCH 7/9] $options should be protected --- Resources/skeleton/FormType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index e00dedc..4375482 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -7,7 +7,7 @@ use Symfony\Component\Form\FormBuilderInterface; class ##CLASS## extends BaseAbstractType { - private $options = array( + protected $options = array( 'data_class' => '##FQCN##', 'name' => '##TYPE_NAME##', ); From accb888e8aed8e6aa8ca4828a59b78b41e2e48de Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Sat, 10 Nov 2012 13:02:32 +0200 Subject: [PATCH 8/9] moved BaseAbstractType Model\Form to Form --- Form/BaseAbstractType.php | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 Form/BaseAbstractType.php diff --git a/Form/BaseAbstractType.php b/Form/BaseAbstractType.php new file mode 100644 index 0000000..26fd39b --- /dev/null +++ b/Form/BaseAbstractType.php @@ -0,0 +1,61 @@ + '', + ); + + function __construct($mergeOptions = null) + { + if ($mergeOptions) { + $this->mergeOptions($mergeOptions); + } + } + + public function setOption($name, $value) + { + $this->options[$name] = $value; + } + + public function getOption($name) + { + return $this->options[$name]; + } + + public function setOptions($options) + { + $this->options = $options; + } + + public function getOptions() + { + return $this->options; + } + + public function mergeOptions($options) + { + $this->options = array_merge($this->options, $options); + } + + /** + * {@inheritdoc} + */ + public function setDefaultOptions(OptionsResolverInterface $resolver) + { + $resolver->setDefaults($this->options); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return $this->getOption('name'); + } +} From 6bac31199836fa033497b57377e3817339d2b988 Mon Sep 17 00:00:00 2001 From: Sergii Kliuchnyk Date: Sat, 10 Nov 2012 13:06:21 +0200 Subject: [PATCH 9/9] moved BaseAbstractType from Model\Form to Form --- Model/Form/BaseAbstractType.php | 61 --------------------------------- Resources/skeleton/FormType.php | 2 +- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 Model/Form/BaseAbstractType.php diff --git a/Model/Form/BaseAbstractType.php b/Model/Form/BaseAbstractType.php deleted file mode 100644 index 8a9b559..0000000 --- a/Model/Form/BaseAbstractType.php +++ /dev/null @@ -1,61 +0,0 @@ - '', - ); - - function __construct($mergeOptions = null) - { - if ($mergeOptions) { - $this->mergeOptions($mergeOptions); - } - } - - public function setOption($name, $value) - { - $this->options[$name] = $value; - } - - public function getOption($name) - { - return $this->options[$name]; - } - - public function setOptions($options) - { - $this->options = $options; - } - - public function getOptions() - { - return $this->options; - } - - public function mergeOptions($options) - { - $this->options = array_merge($this->options, $options); - } - - /** - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $resolver->setDefaults($this->options); - } - - /** - * {@inheritdoc} - */ - public function getName() - { - return $this->getOption('name'); - } -} diff --git a/Resources/skeleton/FormType.php b/Resources/skeleton/FormType.php index 4375482..2afd3ea 100644 --- a/Resources/skeleton/FormType.php +++ b/Resources/skeleton/FormType.php @@ -2,7 +2,7 @@ namespace ##NAMESPACE##; -use Propel\PropelBundle\Model\Form\BaseAbstractType; +use Propel\PropelBundle\Form\BaseAbstractType; use Symfony\Component\Form\FormBuilderInterface; class ##CLASS## extends BaseAbstractType