Skip to content

Commit d8df0ce

Browse files
tobias-93tobias-93
authored
Merge pull request #82 from symfony2admingenerator/update-uploader-bundle
Update to accommodate Vich uploader bundle without public services keeping BC
2 parents b36547e + 627a083 commit d8df0ce

File tree

3 files changed

+60
-69
lines changed

3 files changed

+60
-69
lines changed

‎DependencyInjection/AdmingeneratorFormExtensionsExtension.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Admingenerator\FormExtensionsBundle\Form\Extension\HelpMessageExtension;
88
use Admingenerator\FormExtensionsBundle\Form\Extension\NoValidateExtension;
99
use Admingenerator\FormExtensionsBundle\Form\Extension\SingleUploadExtension;
10+
use Admingenerator\FormExtensionsBundle\Twig\Extension\ImageAssetsExtension;
1011
use Symfony\Component\Config\FileLocator;
1112
use Symfony\Component\DependencyInjection\ContainerBuilder;
1213
use Symfony\Component\DependencyInjection\Loader;
@@ -43,6 +44,8 @@ public function load(array $configs, ContainerBuilder $container)
4344
$container->setParameter('admingenerator.form.include_blueimp', $config['include_blueimp']);
4445
$container->setParameter('admingenerator.form.include_gmaps', $config['include_gmaps']);
4546

47+
$this->configureAssetsExtension($container, $config['upload_manager'], $config['image_manipulator']);
48+
4649
$this->configureExtensions($config['extensions'], $container);
4750

4851
$this->loadUploadCollectionListener($config['upload_collection'], $container);
@@ -113,4 +116,31 @@ private function registerExtension(ContainerBuilder $container, string $serviceI
113116
]);
114117
$container->setDefinition($serviceId, $extensionDefinition);
115118
}
119+
120+
private function configureAssetsExtension(ContainerBuilder $container, string $uploadManager, string $imageManipulator) {
121+
$uploaderHelperDefinition = null;
122+
$imageExtensionDefinition = null;
123+
if ('vich_uploader' === $uploadManager) {
124+
if ($container->hasDefinition('vich_uploader.templating.helper.uploader_helper') || $container->hasAlias('vich_uploader.templating.helper.uploader_helper')) {
125+
$uploaderHelperDefinition = $container->findDefinition('vich_uploader.templating.helper.uploader_helper');
126+
} else {
127+
$uploaderHelperDefinition = new Reference('Vich\UploaderBundle\Twig\Extension\UploaderExtension');
128+
}
129+
}
130+
if ('liip_imagine' === $imageManipulator) {
131+
if (class_exists('\Liip\ImagineBundle\Templating\ImagineExtension')) {
132+
$imageExtensionDefinition = new Reference('liip_imagine.twig.extension');
133+
} else {
134+
$imageExtensionDefinition = new Reference('liip_imagine.templating.filter_extension');
135+
}
136+
} else if ('avalanche_imagine' === $imageManipulator) {
137+
$imageExtensionDefinition = new Reference('imagine.twig.extension');
138+
}
139+
140+
$assetsExtensionDefinition = new Definition(ImageAssetsExtension::class);
141+
$assetsExtensionDefinition->setArgument('$uploaderExtension', $uploaderHelperDefinition);
142+
$assetsExtensionDefinition->setArgument('$filterExtension', $imageExtensionDefinition);
143+
$assetsExtensionDefinition->addTag('twig.extension');
144+
$container->setDefinition('admingenerator.twig.extension.image_assets', $assetsExtensionDefinition);
145+
}
116146
}

‎Resources/config/services.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@
114114
</service>
115115

116116
<!-- Twig extensions -->
117-
<service id="admingenerator.twig.extension.image_assets" class="Admingenerator\FormExtensionsBundle\Twig\Extension\ImageAssetsExtension">
118-
<tag name="twig.extension" />
119-
<argument type="service" id="service_container" />
120-
</service>
121117

122118
<service id="admingenerator.twig.extension.include_globals" class="Admingenerator\FormExtensionsBundle\Twig\Extension\IncludeGlobalsExtension">
123119
<tag name="twig.extension" />

‎Twig/Extension/ImageAssetsExtension.php‎

Lines changed: 30 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
namespace Admingenerator\FormExtensionsBundle\Twig\Extension;
44

5-
use Symfony\Component\DependencyInjection\ContainerInterface;
6-
use Symfony\Component\DependencyInjection\Container;
7-
85
/**
9-
* This extension adds common twig function for various upload manager
10-
* bundles and common twig filter image manipulation bundles.
11-
*
12-
* Depending on %admingenerator.form.upload_manager% setting a diffrent
6+
* This extension adds common twig function for various upload manager
7+
* bundles and common twig filter image manipulation bundles.
8+
*
9+
* Depending on %admingenerator.form.upload_manager% setting a diffrent
1310
* upload manager bundle is used.
14-
*
15-
* Depending on %admingenerator.form.image_manipulator% setting a diffrent
11+
*
12+
* Depending on %admingenerator.form.image_manipulator% setting a diffrent
1613
* image manipulation bundle is used.
17-
*
14+
*
1815
* @author Piotr Gołębiewski <[email protected]>
1916
*/
2017
class ImageAssetsExtension extends \Twig_Extension
2118
{
22-
protected $container;
19+
protected $uploaderExtension;
20+
21+
protected $filterExtension;
2322

24-
public function __construct(ContainerInterface $container)
23+
public function __construct($uploaderExtension, $filterExtension)
2524
{
26-
$this->container = $container;
25+
$this->uploaderExtension = $uploaderExtension;
26+
$this->filterExtension = $filterExtension;
2727
}
2828

2929
/**
@@ -45,7 +45,7 @@ public function getFilters()
4545
'image_filter' => new \Twig_SimpleFilter('image_filter', array($this, 'filter')),
4646
);
4747
}
48-
48+
4949
/**
5050
* Gets the browser path for the image and filter to apply.
5151
*
@@ -54,20 +54,16 @@ public function getFilters()
5454
public function asset($object, $field)
5555
{
5656
$params = func_get_args();
57-
58-
if ('vich_uploader' === $this->getUploadManager()) {
59-
// Note: requires v0.13.0 or higher
60-
$ext = new \Vich\UploaderBundle\Twig\Extension\UploaderExtension(
61-
$this->container->get('vich_uploader.templating.helper.uploader_helper')
62-
);
63-
64-
return call_user_func_array(array($ext, "asset"), $params);
57+
58+
if ($this->uploaderExtension instanceof \Vich\UploaderBundle\Templating\Helper\UploaderHelper
59+
|| $this->uploaderExtension instanceof \Vich\UploaderBundle\Twig\Extension\UploaderExtension) {
60+
return call_user_func_array(array($this->uploaderExtension, "asset"), $params);
6561
}
66-
62+
6763
// In case no upload manager is used we expect object to have
6864
// a special method returning file's path
6965
$getter = "get".Container::Camelize($field)."WebPath";
70-
66+
7167
return $object->$getter();
7268
}
7369

@@ -80,54 +76,23 @@ public function filter()
8076
{
8177
$params = func_get_args();
8278
$path = $params[0];
83-
84-
if ('liip_imagine' === $this->getImageManipulator()) {
85-
if(class_exists('\Liip\ImagineBundle\Templating\ImagineExtension')) {
86-
$ext = new \Liip\ImagineBundle\Templating\ImagineExtension(
87-
$this->container->get('liip_imagine.cache.manager')
88-
);
89-
} else {
90-
$ext = new \Liip\ImagineBundle\Templating\FilterExtension(
91-
$this->container->get('liip_imagine.cache.manager')
92-
);
93-
}
94-
95-
return call_user_func_array(array($ext, "filter"), $params);
79+
80+
if (($this->filterExtension instanceof \Liip\ImagineBundle\Templating\ImagineExtension)
81+
|| ($this->filterExtension instanceof \Liip\ImagineBundle\Templating\FilterExtension)) {
82+
83+
return call_user_func_array(array($this->filterExtension, "filter"), $params);
9684
}
97-
98-
if ('avalanche_imagine' === $this->getImageManipulator()) {
99-
$ext = new \Avalanche\Bundle\ImagineBundle\Templating\ImagineExtension(
100-
$this->container->get('imagine.cache.path.resolver')
101-
);
102-
103-
return call_user_func_array(array($ext, "applyFilter"), $params);
85+
86+
if ($this->filterExtension instanceof \Avalanche\Bundle\ImagineBundle\Templating\ImagineExtension) {
87+
88+
return call_user_func_array(array($this->filterExtension, "applyFilter"), $params);
10489
}
105-
90+
10691
// In case no image manipulator is used we
10792
// return the unmodified path
10893
return $path;
10994
}
11095

111-
/**
112-
* Get upload manager name
113-
*
114-
* @return string|null Parameter value
115-
*/
116-
public function getUploadManager()
117-
{
118-
return $this->container->getParameter('admingenerator.form.upload_manager');
119-
}
120-
121-
/**
122-
* Get image manipulator name
123-
*
124-
* @return string|null Parameter value
125-
*/
126-
public function getImageManipulator()
127-
{
128-
return $this->container->getParameter('admingenerator.form.image_manipulator');
129-
}
130-
13196
/**
13297
* Returns the name of the extension.
13398
*

0 commit comments

Comments
 (0)