Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Add legacy class to fix old Form compilation pass #456

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions DependencyInjection/Compiler/FormFactoryCompilerPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace Sonata\CoreBundle\DependencyInjection\Compiler;

use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Form\DependencyInjection\FormPass;

class FormFactoryCompilerPass extends FormPass
{
Expand Down Expand Up @@ -42,7 +42,6 @@ public function process(ContainerBuilder $container)
// get factories
$original = $container->getDefinition('form.extension');
parent::process($container);

$factory = $container->getDefinition('sonata.core.form.extension.dependency');
$factory->replaceArgument(1, $original->getArgument(1));
$factory->replaceArgument(2, $original->getArgument(2));
Expand Down
55 changes: 55 additions & 0 deletions DependencyInjection/Compiler/LegacyFormFactoryCompilerPass.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

/*
* This file is part of the Sonata Project package.
*
* (c) Thomas Rabaix <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Sonata\CoreBundle\DependencyInjection\Compiler;

use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class LegacyFormFactoryCompilerPass extends FormPass
{
/**
* {@inheritdoc}
*/
public function process(ContainerBuilder $container)
{
$typeIdx = [];
foreach ($container->findTaggedServiceIds('form.type') as $id => $tags) {
$typeIdx[] = $id;
}

$typeExtensionIdx = [];
foreach ($container->findTaggedServiceIds('form.type_extension') as $id => $tag) {
$typeExtensionIdx[] = $id;
}

$container->setParameter('sonata.core.form.types', $typeIdx);
$container->setParameter('sonata.core.form.type_extensions', $typeExtensionIdx);

// nothing to do
if (!$container->hasDefinition('sonata.core.form.extension.dependency')) {
return;
}

// get factories
$original = $container->getDefinition('form.extension');
parent::process($container);
$factory = $container->getDefinition('sonata.core.form.extension.dependency');
$factory->replaceArgument(1, $original->getArgument(1));
$factory->replaceArgument(2, $original->getArgument(2));
$factory->replaceArgument(3, $original->getArgument(3));

$container->removeDefinition('form.extension');
$container->removeDefinition('sonata.core.form.extension.dependency');

$container->setDefinition('form.extension', $factory);
}
}
9 changes: 7 additions & 2 deletions SonataCoreBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@

namespace Sonata\CoreBundle;

use Sonata\CoreBundle\DependencyInjection\Compiler;
use Sonata\CoreBundle\DependencyInjection\Compiler\AdapterCompilerPass;
use Sonata\CoreBundle\DependencyInjection\Compiler\FormFactoryCompilerPass;
use Sonata\CoreBundle\DependencyInjection\Compiler\StatusRendererCompilerPass;
use Sonata\CoreBundle\Form\FormHelper;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Form\DependencyInjection\FormPass;
use Symfony\Component\HttpKernel\Bundle\Bundle;

class SonataCoreBundle extends Bundle
Expand All @@ -27,7 +28,11 @@ public function build(ContainerBuilder $container)
{
$container->addCompilerPass(new StatusRendererCompilerPass());
$container->addCompilerPass(new AdapterCompilerPass());
$container->addCompilerPass(new FormFactoryCompilerPass());
if (class_exists(FormPass::class)) {
$container->addCompilerPass(new Compiler\FormFactoryCompilerPass());
} else {
$container->addCompilerPass(new Compiler\LegacyFormFactoryCompilerPass());
}

$this->registerFormMapping();
}
Expand Down