Skip to content
Merged
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
12 changes: 5 additions & 7 deletions src/DependencyInjection/ExerciseHTMLPurifierExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
use Exercise\HTMLPurifierBundle\HTMLPurifiersRegistryInterface;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Symfony\Component\DependencyInjection\Reference;

class ExerciseHTMLPurifierExtension extends Extension
{
public function load(array $configs, ContainerBuilder $container): void
{
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

$loader->load('html_purifier.xml');
$loader->load('services.php');

$configs = $this->processConfiguration(new Configuration(), $configs);

Expand All @@ -30,8 +30,6 @@ public function load(array $configs, ContainerBuilder $container): void
}

$serializerPaths = [];
// Drop when require Symfony > 3.4
$registerAlias = method_exists($container, 'registerAliasForArgument');

foreach ($configs['html_profiles'] as $name => $definition) {
$configId = "exercise_html_purifier.config.$name";
Expand Down Expand Up @@ -71,7 +69,7 @@ public function load(array $configs, ContainerBuilder $container): void
$serializerPaths[] = $definition['config']['Cache.SerializerPath'];
}

if ($registerAlias && $default) {
if ($default) {
$container->registerAliasForArgument($id, \HTMLPurifier::class, "$name.purifier");
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/HTMLPurifierConfigFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static function create(
array $parents = [],
array $attributes = [],
array $elements = [],
array $blankElements = []
array $blankElements = [],
): \HTMLPurifier_Config {
if ($defaultConfig) {
$config = \HTMLPurifier_Config::inherit($defaultConfig);
Expand Down
28 changes: 0 additions & 28 deletions src/Resources/config/html_purifier.xml

This file was deleted.

40 changes: 40 additions & 0 deletions src/Resources/config/services.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

declare(strict_types=1);

namespace Symfony\Component\DependencyInjection\Loader\Configurator;


use Exercise\HTMLPurifierBundle\CacheWarmer\SerializerCacheWarmer;
use Exercise\HTMLPurifierBundle\Form\TypeExtension\HTMLPurifierTextTypeExtension;
use Exercise\HTMLPurifierBundle\HTMLPurifiersRegistryInterface;
use Exercise\HTMLPurifierBundle\Twig\HTMLPurifierExtension;
use Exercise\HTMLPurifierBundle\Twig\HTMLPurifierRuntime;
use Symfony\Component\Form\Extension\Core\Type\TextType;

return function (ContainerConfigurator $container): void {
$container->services()
->set('exercise_html_purifier.cache_warmer.serializer', SerializerCacheWarmer::class)
->tag('kernel.cache_warmer')
->args([
abstract_arg('cache paths'),
abstract_arg('profiles'),
service(HTMLPurifiersRegistryInterface::class),
service('filesystem'),
])

->set('exercise_html_purifier.form.text_type_extension', HTMLPurifierTextTypeExtension::class)
->tag('form.type_extension', ['extended_type' => TextType::class])
->args([
service(HTMLPurifiersRegistryInterface::class),
])

->set('exercise_html_purifier.twig.extension', HTMLPurifierExtension::class)
->tag('twig.extension')

->set('exercise_html_purifier.twig.runtime', HTMLPurifierRuntime::class)
->tag('twig.runtime')
->args([
service(HTMLPurifiersRegistryInterface::class),
]);
};
2 changes: 1 addition & 1 deletion tests/HTMLPurifierConfigFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static function buildHTMLDefinition(
\HTMLPurifier_HTMLDefinition $def,
array $attributes,
array $elements,
array $blankElements
array $blankElements,
): void {
++self::$calledBuild;
parent::buildHTMLDefinition($def, $attributes, $elements, $blankElements);
Expand Down