Manual merge

[franmomu]

No description provided.

[VincentLanglet]

I'm wondering if ?? is not better than ?: in this case...

[franmomu]

I guess not:

$this->prefix = $prefix ?? $formBuilder->getName(); // will always return $prefix ($prefix is not null)
$this->prefix = $prefix ?: $formBuilder->getName(); // will return $formBuilder->getName(); in case $prefix is false

[VincentLanglet]

$prefix is null or a string.

If someone pass '', shouldn't we use '' as a prefix instead of overriding the prefix to $formBuilder->getName() ?
IMHO we should only override the prefix if null is passed. That's the job of ??

[franmomu]

My comment was based on the phpdoc:

/**
 * @param bool $prefix
 */
public function __construct(FormBuilderInterface $formBuilder, $prefix = false)
{

I haven't check the usages to see if it can be a string, if so, the phpdoc should be updated.

[VincentLanglet]

We moved from https://github.com/sonata-project/SonataAdminBundle/blob/3.x/src/Util/FormBuilderIterator.php#L53
to https://github.com/sonata-project/SonataAdminBundle/blob/master/src/Util/FormBuilderIterator.php#L38

So ?? is better in master

[franmomu]

Looking at the usages, the only place where the $prefix was passed is:

SonataAdminBundle/src/Util/FormBuilderIterator.php

Line 90 in 2731298

return new self($this->formBuilder->get($this->iterator->current()), $this->current());

In master that argument was removed in #6533, I don't know what was the use of this, but looks like it should have been deprecated in 3.x and removed in master.