Skip to content

Commit 4f752c0

Browse files
committed
Merge pull request #25 from matejvelikonja/patch-1
SF 2.7 deprecation fix
2 parents a6e8cf7 + ce1d41d commit 4f752c0

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

DependencyInjection/InfiniteFormExtension.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Symfony\Component\Config\FileLocator;
1313
use Symfony\Component\DependencyInjection\ContainerBuilder;
1414
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
15+
use Symfony\Component\DependencyInjection\Reference;
1516
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1617

1718
/**
@@ -47,5 +48,14 @@ public function load(array $configs, ContainerBuilder $container)
4748
if ($configs['twig']) {
4849
$loader->load('twig.xml');
4950
}
51+
52+
$attachmentDefinition = $container->getDefinition('infinite_form.attachment.form_type');
53+
54+
if (method_exists($attachmentDefinition, 'setFactory')) {
55+
$attachmentDefinition->setFactory(array(new Reference('doctrine'), 'getManager'));
56+
} else {
57+
$attachmentDefinition->setFactoryService('doctrine');
58+
$attachmentDefinition->setFactoryMethod('getManager');
59+
}
5060
}
5161
}

Resources/config/attachment.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
<service id="infinite_form.attachment.form_type" class="%infinite_form.attachment.attachment_type.class%">
4343
<argument>%infinite_form.attachment.default_secret%</argument>
4444
<argument type="service">
45-
<service class="Doctrine\Common\Persistence\ObjectManager" factory-service="doctrine" factory-method="getManager" public="false">
45+
<service class="Doctrine\Common\Persistence\ObjectManager" public="false">
46+
<!-- Added in extension class -->
47+
<!--<factory service="doctrine" method="getManager"/>-->
4648
<argument>%infinite_form.attachment.entity_manager%</argument>
4749
</service>
4850
</argument>

0 commit comments

Comments
 (0)