8000 [FrameworkBundle] Fixed form type extensions priority ordering by HeahDude · Pull Request #20993 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[FrameworkBundle] Fixed form type extensions priority ordering #20993

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 1 commit into from
Closed

[FrameworkBundle] Fixed form type extensions priority ordering #20993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[FrameworkBundle] Fixed form type extensions priority ordering
  • Loading branch information
@HeahDude
HeahDude committed Dec 19, 2016
commit 02076e060c9311f73bb4d3c7cea28494ce74dfe6
24 changes: 16 additions & 8 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;

use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
Expand All @@ -24,8 +23,6 @@
*/
class FormPass implements CompilerPassInterface
{
use PriorityTaggedServiceTrait;

public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition('form.extension')) {
Expand All @@ -49,23 +46,34 @@ public function process(ContainerBuilder $container)

$definition->replaceArgument(1, $types);

$typeExtensions = array();
$typeExtensionsToSort = array();

foreach ($this->findAndSortTaggedServices('form.type_extension', $container) as $reference) {
$serviceId = (string) $reference;
foreach ($container->findTaggedServiceIds('form.type_extension') as $serviceId => $tag) {
$serviceDefinition = $container->getDefinition($serviceId);
if (!$serviceDefinition->isPublic()) {
throw new InvalidArgumentException(sprintf('The service "%s" must be public as form type extensions are lazy-loaded.', $serviceId));
}

$tag = $serviceDefinition->getTag('form.type_extension');
if (isset($tag[0]['extended_type'])) {
$extendedType = $tag[0]['extended_type'];
} else {
throw new InvalidArgumentException(sprintf('Tagged form type extension must have the extended type configured using the extended_type/extended-type attribute, none was configured for the "%s" service.', $serviceId));
}

$typeExtensions[$extendedType][] = $serviceId;
$typeExtensionsToSort[isset($tag[0]['priority']) ? $tag[0]['priority'] : 0][] = array(
'service_id' => $serviceId,
'extended_type' => $extendedType,
);
}

$typeExtensions = array();
if ($typeExtensionsToSort) {
krsort($typeExtensionsToSort);
$typeExtensionsSorted = call_user_func_array('array_merge', $typeExtensionsToSort);

foreach ($typeExtensionsSorted as $typeExtension) {
$typeExtensions[$typeExtension['extended_type']][] = $typeExtension['service_id'];
}
}

$definition->replaceArgument(2, $typeExtensions);
Expand Down
0