10000 More intuitive matching of bundle directory lookups for Doctrine extensions by jmikola · Pull Request #36 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

More intuitive matching of bundle directory lookups for Doctrine extensions #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

More intuitive matching of bundle directory lookups for Doctrine extensions #36

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6534442
[Form] make CollectionField and FieldGroup work nicely together
avalanche123 Sep 2, 2010
b8cb3f7
Merge branch 'master' of http://github.com/fabpot/symfony
avalanche123 Sep 9, 2010
ee130d4
Merge branch 'master' of github.com:opensky/symfony
Sep 13, 2010
17382c3
Merge branch 'master' of github.com:opensky/symfony
avalanche123 Sep 23, 2010
4cbcb35
Merge branch 'master' of http://github.com/fabpot/symfony
avalanche123 Sep 23, 2010
54b4a3a
Fix UniversalClassLoader issues with leading slashes.
bobthecow Oct 19, 2010
75a53cf
Allow ValidValidator to walk \Traversable in addition to array
cranberyxl Nov 9, 2010
5f5fe4b
[DoctrineMongoDBBundle] fixed profiler menu text
kriswallsmith Oct 30, 2010
aa6dcec
[DoctrineBundle][DoctrineMongoDBBundle] Allow mappings to be loaded f…
jmikola Dec 22, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions src/Symfony/Component/Form/CollectionField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
*/
class CollectionField extends FieldGroup
{
CONST PLACEHOLDER_KEY = '$$key$$';

/**
* The prototype for the inner fields
* @var FieldInterface
Expand All @@ -42,6 +40,13 @@ public function __construct(FieldInterface $innerField, array $options = array()
protected function configure()
{
$this->addOption('modifiable', false);

if ($this->getOption('modifiable')) {
$field = $this->newField('$$key$$', null);
// TESTME
$field->setRequired(false);
$this->add($field);
}
}

public function setData($collection)
Expand All @@ -50,13 +55,13 @@ public function setData($collection)
throw new UnexpectedTypeException('The data must be an array');
}

foreach ($this as $name => $field)
{
$this->remove($name);
foreach ($this as $name => $field) {
if (!$this->getOption('modifiable') || $name != '$$key$$') {
$this->remove($name);
}
}

foreach ($collection as $name => $value)
{
foreach ($collection as $name => $value) {
$this->add($this->newField($name, $name));
}

Expand All @@ -69,25 +74,15 @@ public function bind($taintedData)
$taintedData = array();
}

if ($this->getOption('modifiable'))
{
unset($taintedData[self::PLACEHOLDER_KEY]);
parent::setData(null);

foreach ($this as $name => $field)
{
if (!isset($taintedData[$name]))
{
$this->remove($name);
}
foreach ($this as $name => $field) {
if (!isset($taintedData[$name]) && $this->getOption('modifiable') && $name != '$$key$$') {
$this->remove($name);
}
}

foreach ($taintedData as $name => $value)
{
if (!isset($this[$name]))
{
$this->add($this->newField($name, $name));
}
foreach ($taintedData as $name => $value) {
if (!isset($this[$name]) && $this->getOption('modifiable')) {
$this->add($this->newField($name, $name));
}
}

Expand All @@ -101,11 +96,4 @@ protected function newField($key, $propertyPath)
$field->setPropertyPath($propertyPath === null ? null : '['.$propertyPath.']');
return $field;
}

public function getPlaceholderField()
{
$field = $this->newField(self::PLACEHOLDER_KEY, null);
$field->setParent($this);
return $field;
}
}
0